1385 files changed, 40899 insertions, 42834 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index f971f97..93c6e5f 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -5,6 +5,7 @@ project(viewer)
 include(00-Common)
 include(Boost)
 include(BuildVersion)
+include(DBusGlib)
 include(DirectX)
 include(ELFIO)
 include(FMOD)
@@ -124,6 +125,7 @@ set(viewer_SOURCE_FILES
     llfloateravatarinfo.cpp
     llfloateravatarpicker.cpp
     llfloateravatartextures.cpp
+    llfloaterbeacons.cpp
     llfloaterbuildoptions.cpp
     llfloaterbulkpermission.cpp
     llfloaterbump.cpp
@@ -199,6 +201,7 @@ set(viewer_SOURCE_FILES
     llglsandbox.cpp
     llgroupmgr.cpp
     llgroupnotify.cpp
+    llhomelocationresponder.cpp
     llhoverview.cpp
     llhudeffectbeam.cpp
     llhudeffect.cpp
@@ -517,6 +520,7 @@ set(viewer_HEADER_FILES
     llfloateravatarinfo.h
     llfloateravatarpicker.h
     llfloateravatartextures.h
+    llfloaterbeacons.h
     llfloaterbuildoptions.h
     llfloaterbulkpermission.h
     llfloaterbump.h
@@ -591,6 +595,7 @@ set(viewer_HEADER_FILES
     llgivemoney.h
     llgroupmgr.h
     llgroupnotify.h
+    llhomelocationresponder.h
     llhoverview.h
     llhudeffect.h
     llhudeffectbeam.h
@@ -873,6 +878,7 @@ endif (DARWIN)
 
 if (LINUX)
     LIST(APPEND viewer_SOURCE_FILES llappviewerlinux.cpp)
+    LIST(APPEND viewer_SOURCE_FILES llappviewerlinux_api_dbus.cpp)
     LIST(APPEND CMAKE_EXE_LINKER_FLAGS -Wl,--as-needed)
 
     set(viewer_LIBRARIES
@@ -1022,6 +1028,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_audio_volume.xml
     skins/default/xui/en-us/floater_avatar_picker.xml
     skins/default/xui/en-us/floater_avatar_textures.xml
+    skins/default/xui/en-us/floater_beacons.xml
     skins/default/xui/en-us/floater_build_options.xml
     skins/default/xui/en-us/floater_bulk_perms.xml
     skins/default/xui/en-us/floater_bumps.xml
@@ -1241,6 +1248,16 @@ set_source_files_properties(${viewer_CHARACTER_FILES}
 
 list(APPEND viewer_SOURCE_FILES ${viewer_CHARACTER_FILES})
 
+if (WINDOWS)
+  file(GLOB viewer_INSTALLER_FILES installers/windows/*.nsi)
+
+  source_group("Installer Files" FILES ${viewer_INSTALLER_FILES})
+
+  set_source_files_properties(${viewer_INSTALLER_FILES}
+                              PROPERTIES HEADER_FILE_ONLY TRUE)
+
+  list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
+endif (WINDOWS)
 
 if (OPENAL)
   set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_OPENAL")
@@ -1260,6 +1277,7 @@ if (FMOD)
         PROPERTIES
         BUILD_WITH_INSTALL_RPATH 1
         INSTALL_NAME_DIR "@executable_path/../Resources"
+        LINK_FLAGS "-unexported_symbols_list ../newview/fmod_hidden_symbols.exp"
         )
     endif (DARWIN)
     set(FMODWRAPPER_LIBRARY fmodwrapper)
@@ -1274,24 +1292,24 @@ list(APPEND viewer_SOURCE_FILES ${viewer_HEADER_FILES})
 set_source_files_properties(${viewer_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
-add_executable(imprudence-bin
+add_executable(${VIEWER_BINARY_NAME}
     WIN32
     MACOSX_BUNDLE
     ${viewer_SOURCE_FILES}
     )
-check_message_template(imprudence-bin)
+check_message_template(${VIEWER_BINARY_NAME})
 
 set(PACKAGE OFF CACHE BOOL
     "Add a package target that builds an installer package.")
 
 if (WINDOWS)
     if(MSVC71)
-        set(release_flags "/MAP:Release/imprudence-bin.map /MAPINFO:LINES")
+        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map /MAPINFO:LINES")
     else(MSVC71)
-        set(release_flags "/MAP:Release/imprudence-bin.map")
+        set(release_flags "/MAP:Release/${VIEWER_BINARY_NAME}.map")
     endif(MSVC71)
     
-    set_target_properties(imprudence-bin
+    set_target_properties(${VIEWER_BINARY_NAME}
         PROPERTIES
         LINK_FLAGS "/debug /NODEFAULTLIB:MSVCRT /SUBSYSTEM:WINDOWS"
         LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:MSVCRTD"
@@ -1301,20 +1319,20 @@ if (WINDOWS)
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
         add_custom_command(
-            TARGET imprudence-bin PRE_BUILD
+            TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
             COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
             ARGS
               --solution 
               ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
               --workingdir
-              imprudence-bin
+              ${VIEWER_BINARY_NAME}
               ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMENT "Setting the imprudence-bin working directory for debugging."
+            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
             )
     endif (NOT UNATTENDED)
 
     add_custom_command(
-        TARGET imprudence-bin PRE_BUILD
+        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
           -E
@@ -1325,7 +1343,7 @@ if (WINDOWS)
         )
 
     add_custom_command(
-        TARGET imprudence-bin PRE_BUILD
+        TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS
           -E
@@ -1335,10 +1353,10 @@ if (WINDOWS)
         COMMENT "Copying message.xml to the runtime folder."
         )
        
-    add_dependencies(imprudence-bin copy_win_libs)
+    add_dependencies(${VIEWER_BINARY_NAME} copy_win_libs)
 
     if (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
-      add_dependencies(imprudence-bin copy_win_scripts)
+      add_dependencies(${VIEWER_BINARY_NAME} copy_win_scripts)
     endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
         
     add_custom_command(
@@ -1348,14 +1366,14 @@ if (WINDOWS)
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
           --configuration=${CMAKE_CFG_INTDIR}
           --channel=${VIEWER_CHANNEL}
-          --login_channel=${VIEWER_CHANNEL}
+          --login_channel=${VIEWER_LOGIN_CHANNEL}
           --grid=${GRID}
           --source=${CMAKE_CURRENT_SOURCE_DIR}
               --artwork=${ARTWORK_DIR}
               --build=${CMAKE_CURRENT_BINARY_DIR}
               --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
               --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
-        DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+        DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
     if (PACKAGE)
       add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
@@ -1363,7 +1381,7 @@ if (WINDOWS)
     endif (PACKAGE)
 endif (WINDOWS)
 
-target_link_libraries(imprudence-bin
+target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
@@ -1385,6 +1403,7 @@ target_link_libraries(imprudence-bin
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${BOOST_SIGNALS_LIBRARY}
+    ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY}
     ${OPENGL_LIBRARIES}
@@ -1395,7 +1414,6 @@ target_link_libraries(imprudence-bin
     ${NDOF_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
-    ${ZLIB_LIBRARIES}
     ${ELFIO_LIBRARIES}
     )
 
@@ -1409,7 +1427,7 @@ if (LINUX)
   add_custom_command(
       OUTPUT imprudence-stripped
       COMMAND strip
-      ARGS --strip-debug -o imprudence-stripped imprudence-bin
+      ARGS --strip-debug -o imprudence-stripped ${VIEWER_BINARY_NAME}
       DEPENDS imprudence-bin
       )
 
@@ -1422,7 +1440,7 @@ if (LINUX)
         ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         --grid=${GRID}
         --channel=${VIEWER_CHANNEL}
-        --login_channel=${VIEWER_CHANNEL}
+        --login_channel=${VIEWER_LOGIN_CHANNEL}
         --installer_name=${product}
         --arch=${ARCH}
         --source=${CMAKE_CURRENT_SOURCE_DIR}
@@ -1442,7 +1460,7 @@ endif (LINUX)
 if (DARWIN)
   set(product "Imprudence")
   set_target_properties(
-    imprudence-bin
+    ${VIEWER_BINARY_NAME}
     PROPERTIES
     OUTPUT_NAME "${product}"
     MACOSX_BUNDLE_INFO_STRING "info string - localize me"
@@ -1456,7 +1474,7 @@ if (DARWIN)
     )
 
   add_custom_command(
-    TARGET imprudence-bin POST_BUILD
+    TARGET ${VIEWER_BINARY_NAME} POST_BUILD
     COMMAND ${PYTHON_EXECUTABLE}
     ARGS
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@@ -1467,11 +1485,11 @@ if (DARWIN)
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
-    DEPENDS imprudence-bin ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
   if (PACKAGE)
-      add_custom_target(package ALL DEPENDS imprudence-bin) 
+      add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) 
       add_dependencies(package mac-updater mac-crash-logger)
 
       add_custom_command(
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 784a1b7..246ac98 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,6 +1,5 @@
-/* Localized versions of Info.plist keys */

-

-CFBundleName = "Imprudence";

-CFBundleShortVersionString = "Imprudence version 1.0.0";

-CFBundleGetInfoString = "Imprudence version 1.0.0, Copyright 2004-2008 Linden Research, Inc.";

-

+/* Localized versions of Info.plist keys */
+
+CFBundleName = "Imprudence";
+CFBundleShortVersionString = "Imprudence version 1.0.0";
+CFBundleGetInfoString = "Imprudence version 1.0.0, Copyright 2004-2008 Linden Research, Inc.";
diff --git a/linden/indra/newview/VertexCache.h b/linden/indra/newview/VertexCache.h
index d402e28..98a445e 100644
--- a/linden/indra/newview/VertexCache.h
+++ b/linden/indra/newview/VertexCache.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/VorbisFramework.h b/linden/indra/newview/VorbisFramework.h
index 146302c..0b2c81f 100644
--- a/linden/indra/newview/VorbisFramework.h
+++ b/linden/indra/newview/VorbisFramework.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 56acf4c..5118e67 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -332,11 +332,11 @@ REMOTE_DATA_REQUEST	Value of event_type in remote_event if XML-RPC request is re
 REMOTE_DATA_REPLY       Value of event_type in remote_event if XML-RPC reply is received
 
 
-PRIM_TYPE                       Followed by PRIM_TYPE_BOX, PRIM_TYPE_CYLINDER, PRIM_TYPE_PRISM, PRIM_TYPE_SPHERE,:PRIM_TYPE_TORUS, or PRIM_TYPE_TUBE and their arguments
-PRIM_MATERIAL           Sets material to PRIM_MATERIAL_STONE, PRIM_MATERIAL_METAL, PRIM_MATERIAL_GLASS,:PRIM_MATERIAL_WOOD, PRIM_MATERIAL_FLESH, PRIM_MATERIAL_PLASTIC,:PRIM_MATERIAL_RUBBER, or PRIM_MATERIAL_LIGHT
+PRIM_TYPE                       Followed by PRIM_TYPE_BOX, PRIM_TYPE_CYLINDER, PRIM_TYPE_PRISM, PRIM_TYPE_SPHERE, PRIM_TYPE_TORUS, PRIM_TYPE_TUBE, or PRIM_TYPE_SCULPT and their arguments
+PRIM_MATERIAL           Followed by PRIM_MATERIAL_STONE, PRIM_MATERIAL_METAL, PRIM_MATERIAL_GLASS, PRIM_MATERIAL_WOOD, PRIM_MATERIAL_FLESH, PRIM_MATERIAL_PLASTIC, or PRIM_MATERIAL_RUBBER
 PRIM_PHYSICS            Sets physics to TRUE or FALSE
-PRIM_FLEXIBLE           Sets primitive flexibility to TRUE or FALSE
-PRIM_POINT_LIGHT        Sets light emission to TRUE or FALSE
+PRIM_FLEXIBLE           Followed by TRUE or FALSE, integer softness, float gravity, float friction, float wind, float tension, and vector force
+PRIM_POINT_LIGHT        Followed by TRUE or FALSE, vector color, float intensity, float radius, float falloff
 PRIM_TEMP_ON_REZ        Sets temporay on rez to TRUE or FALSE
 PRIM_PHANTOM            Sets phantom to TRUE or FALSE
 PRIM_CAST_SHADOWS       DEPRECATED. Takes 1 parameter, an integer, but has no effect when set and always returns 0 if used in llGetPrimitiveParams.
@@ -357,7 +357,7 @@ PRIM_TYPE_SPHERE	Followed by integer hole shape, vector cut, float hollow, vecto
 PRIM_TYPE_TORUS         Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew
 PRIM_TYPE_TUBE          Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew
 PRIM_TYPE_RING          Followed by integer hole shape, vector cut, float hollow, vector twist,:vector hole size, vector top shear, vector advanced cut, vector taper,:float revolutions, float radius offset, and float skew
-PRIM_TYPE_SCULPT        Followed by a key or string texture uuid.
+PRIM_TYPE_SCULPT        Followed by a key/string texture uuid, and one of PRIM_SCULPT_TYPE_SPHERE, PRIM_SCULPT_TYPE_TORUS, PRIM_SCULPT_TYPE_PLANE, or PRIM_SCULPT_TYPE_CYLINDER
 
 PRIM_HOLE_DEFAULT       Sets hole type to match the prim type.
 PRIM_HOLE_SQUARE        Sets hole type to square.
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 55ff208..9a6749b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -33,10 +33,10 @@
             <string>Color4</string>
         <key>Value</key>
             <array>
-                <real>0.0196078431372</real>
-                <real>0.6862745098039</real>
-                <real>0.9803921568627</real>
-                <real>1</real>
+                <real>1.0</real>
+                <real>1.0</real>
+                <real>1.0</real>
+                <real>1.0</real>
             </array>
         </map>
     <key>AgentChatColor</key>
@@ -165,17 +165,6 @@
       <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>
@@ -2599,7 +2588,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>FloaterActiveSpeakersSortColumn</key>
     <map>
@@ -2660,6 +2649,22 @@
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterBeaconsRect</key>
+    <map>
+        <key>Comment</key>
+        <string>Rectangle for beacon and highlight controls</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Rect</string>
+        <key>Value</key>
+        <array>
+            <integer>200</integer>
+            <integer>250</integer>
+            <integer>250</integer>
+            <integer>200</integer>
+    </array>
+  </map>
     <key>FloaterBuildOptionsRect</key>
     <map>
       <key>Comment</key>
@@ -3579,6 +3584,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ForceMandatoryUpdate</key>
+    <map>
+      <key>Comment</key>
+      <string>For QA: On next startup, forces the auto-updater to run</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>
@@ -3950,7 +3966,18 @@
       <key>Value</key>
       <real>0.0</real>
     </map>
-    <key>InventoryAutoOpenDelay</key>
+        <key>InstallLanguage</key>
+        <map>
+                <key>Comment</key>
+                <string>Language passed from installer (for UI)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>String</string>
+                <key>Value</key>
+                <string>default</string>
+        </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>
@@ -4173,7 +4200,7 @@
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>https://wiki.secondlife.com/wiki/[LSL_STRING]</string>
+      <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
     </map>
     <key>LagMeterShrunk</key>
     <map>
@@ -4200,7 +4227,7 @@
     <key>Language</key>
     <map>
       <key>Comment</key>
-      <string>Language specifier (for XUI)</string>
+      <string>Language specifier (for UI)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -4274,10 +4301,11 @@
       <key>Value</key>
       <string>0.0.0</string>
     </map>
-    <key>LastSnapshotHeight</key>
+  
+    <key>LastSnapshotToEmailHeight</key>
     <map>
       <key>Comment</key>
-      <string>The height of the last snapshot, in px</string>
+      <string>The height of the last email snapshot, in px</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -4285,21 +4313,32 @@
       <key>Value</key>
       <integer>768</integer>
     </map>
-    <key>LastSnapshotType</key>
+    <key>LastSnapshotToEmailWidth</key>
     <map>
       <key>Comment</key>
-      <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string>
+      <string>The width of the last email snapshot, in px</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1024</integer>
+    </map>
+    <key>LastSnapshotToDiskHeight</key>
+    <map>
+      <key>Comment</key>
+      <string>The height of the last disk snapshot, in px</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>768</integer>
     </map>
-    <key>LastSnapshotWidth</key>
+    <key>LastSnapshotToDiskWidth</key>
     <map>
       <key>Comment</key>
-      <string>The width of the last snapshot, in px</string>
+      <string>The width of the last disk snapshot, in px</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -4307,6 +4346,39 @@
       <key>Value</key>
       <integer>1024</integer>
     </map>
+    <key>LastSnapshotToInventoryHeight</key>
+    <map>
+      <key>Comment</key>
+      <string>The height of the last texture snapshot, in px</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>512</integer>
+    </map>
+    <key>LastSnapshotToInventoryWidth</key>
+    <map>
+      <key>Comment</key>
+      <string>The width of the last texture snapshot, in px</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>512</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>LeftClickShowMenu</key>
     <map>
       <key>Comment</key>
@@ -4483,17 +4555,6 @@
       <key>Value</key>
       <real>20.0</real>
     </map>
-    <key>MainloopTimeoutDefault</key>
-        <map>
-        <key>Comment</key>
-            <string>Timeout duration for mainloop lock detection, in seconds.</string>
-        <key>Persist</key>
-            <integer>1</integer>
-        <key>Type</key>
-            <string>F32</string>
-        <key>Value</key>
-            <real>10.0</real>
-        </map>
     <key>MapOverlayIndex</key>
     <map>
       <key>Comment</key>
@@ -6094,6 +6155,17 @@
       <key>Value</key>
       <real>1.3</real>
     </map>
+    <key>RenderGround</key>
+    <map>
+      <key>Comment</key>
+          <string>Determines whether we can render the ground pool or not</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>RenderHUDInSnapshot</key>
     <map>
       <key>Comment</key>
@@ -7648,7 +7720,7 @@
     <key>SystemLanguage</key>
     <map>
       <key>Comment</key>
-      <string>Language indicated by system settings (for XUI)</string>
+      <string>Language indicated by system settings (for UI)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9596,16 +9668,27 @@
       <key>Value</key>
       <string>-1</string>
     </map>
-    <key>VivoxDebugServerName</key>
+    <key>VivoxDebugSIPURIHostName</key>
+    <map>
+      <key>Comment</key>
+      <string>Hostname portion of vivox SIP URIs (empty string for the default).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string></string>
+    </map>
+    <key>VivoxDebugVoiceAccountServerURI</key>
     <map>
       <key>Comment</key>
-      <string>Hostname of the vivox account server to use for voice when not connected to Agni.</string>
+      <string>URI to the vivox account management server (empty string for the default).</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>bhd.vivox.com</string>
+      <string></string>
     </map>
     <key>VoiceCallsFriendsOnly</key>
     <map>
@@ -9748,7 +9831,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>44124</integer>
+      <integer>44125</integer>
     </map>
     <key>WLSkyDetail</key>
     <map>
diff --git a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
index 0df89c8..78b96b3 100644
--- a/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl
@@ -11,7 +11,7 @@ void calcAtmospherics(vec3 inPositionEye);
 void main()
 {
         //transform vertex
-        gl_Position = ftransform(); //gl_ModelViewProjectionMatrix * gl_Vertex;
+        gl_Position = ftransform();
         gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
         
         vec4 pos = (gl_ModelViewMatrix * gl_Vertex);
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index b227043..c02ba86 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -1,4 +1,4 @@
-version 17
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -33,6 +33,7 @@ RenderFlexTimeFactor		1	1.0
 RenderFogRatio                          1       4.0
 RenderGamma                                     1       0
 RenderGlowResolutionPow         1       9
+RenderGround                            1       1
 RenderLightingDetail            1       1
 RenderMaxPartCount                      1       8192
 RenderNightBrightness           1       1.0
@@ -347,21 +348,7 @@ RenderVBOEnable				0	0
 list ATI_All-in-Wonder_7500
 RenderVBOEnable                         0       0
 
-
-list ATI_Mobility_Radeon_9800
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
-list ATI_Mobility_Radeon_9700
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
 list ATI_Mobility_Radeon_9600
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
 Disregard96DefaultDrawDistance  1       0
 
 
@@ -380,28 +367,40 @@ Disregard96DefaultDrawDistance	1	0
 
 list ATI_Radeon_X300 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X400 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X500 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X600 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X700 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X1300 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 UseStartScreen                                  0       0
 list ATI_Radeon_X1400 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X1500 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 UseStartScreen                                  0       0
 list ATI_Radeon_X1600 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Radeon_X1700 
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
 list ATI_Mobility_Radeon_X1xxx
 Disregard128DefaultDrawDistance 1       0
+RenderVBOEnable                         1       0
+
 list ATI_Radeon_HD_2300
 Disregard128DefaultDrawDistance 1       0
 list ATI_Radeon_HD_2400
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index 3eaa781..09105b8 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -1,4 +1,4 @@
-version 17
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -33,6 +33,7 @@ RenderFlexTimeFactor		1	1.0
 RenderFogRatio                          1       4.0
 RenderGamma                                     1       0
 RenderGlowResolutionPow         1       9
+RenderGround                            1       1
 RenderLightingDetail            1       1
 RenderMaxPartCount                      1       8192
 RenderNightBrightness           1       1.0
@@ -343,21 +344,7 @@ RenderVBOEnable				0	0
 list ATI_All-in-Wonder_7500
 RenderVBOEnable                         0       0
 
-
-list ATI_Mobility_Radeon_9800
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
-list ATI_Mobility_Radeon_9700
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
 list ATI_Mobility_Radeon_9600
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
 Disregard96DefaultDrawDistance  1       0
 
 
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index fab8ea9..fd2496d 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 16
+version 19
 
 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences
 // Should be combined into one table
@@ -33,6 +33,7 @@ RenderFlexTimeFactor			1	1.0
 RenderFogRatio                                  1       4.0
 RenderGamma                                             1       0
 RenderGlowResolutionPow                 1       9
+RenderGround                                    1       1
 RenderLightingDetail                    1       1
 RenderMaxPartCount                              1       8192
 RenderNightBrightness                   1       1.0
@@ -291,6 +292,7 @@ RenderVBOEnable				1	0
 list Intel_950
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
+RenderGround                            1       0
 
 list Intel_965
 RenderTerrainDetail                     1       0
@@ -324,20 +326,7 @@ list Intel_Springdale
 RenderTerrainDetail                     1       0
 RenderVBOEnable                         1       0
 
-list ATI_Mobility_Radeon_9800
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
-list ATI_Mobility_Radeon_9700
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
-
 list ATI_Mobility_Radeon_9600
-RenderAvatarCloth                       0       0
-VertexShaderEnable                      0       0
-WindLightUseAtmosShaders        0       0
 Disregard96DefaultDrawDistance  1       0
 
 list NVIDIA_GeForce_8600
diff --git a/linden/indra/newview/fmodwrapper.cpp b/linden/indra/newview/fmodwrapper.cpp
index 4d8cf22..4768e36 100644
--- a/linden/indra/newview/fmodwrapper.cpp
+++ b/linden/indra/newview/fmodwrapper.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 48af543..7484005 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -26,6 +26,7 @@ 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 HD                    .*ATI.*All-in-Wonder HD.*                       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
@@ -35,7 +36,9 @@ 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
+ATI ASUS AH34xx                                 .*ATI.*ASUS.*AH34.*                                     1               1
 ATI ASUS AH36xx                                 .*ATI.*ASUS.*AH36.*                                     3               1
+ATI ASUS AH46xx                                 .*ATI.*ASUS.*AH46.*                                     3               1
 ATI ASUS AX3xx                                  .*ATI.*ASUS.*AX3.*                                      1               1
 ATI ASUS AX5xx                                  .*ATI.*ASUS.*AX5.*                                      1               1
 ATI ASUS AX8xx                                  .*ATI.*ASUS.*AX8.*                                      2               1
@@ -45,12 +48,13 @@ ATI ASUS EAH34xx				.*ATI.*ASUS.*EAH34.*				1		1
 ATI ASUS EAH36xx                                .*ATI.*ASUS.*EAH36.*                            3               1
 ATI ASUS EAH38xx                                .*ATI.*ASUS.*EAH38.*                            3               1
 ATI ASUS EAH48xx                                .*ATI.*ASUS.*EAH48.*                            3               1
-ATI ASUS X1xxx                                  .*ATI.*ASUS.*X1.*                                       2               1
-ATI ASUS X7xx                                   .*ATI.*ASUS.*X7.*                                       1               1
-ATI Diamond X550                                .*ATI.*Diamond X550.*                           1               1
-ATI Diamond X13xx                               .*ATI.*Diamond X13.*                            1               1
-ATI Diamond X16xx                               .*ATI.*Diamond X16.*                            1               1
-ATI Diamond X19xx                               .*ATI.*Diamond X19.*                            1               1
+ATI Radeon X1xxx                                .*ATI.*ASUS.*X1.*                                       2               1
+ATI Radeon X7xx                                 .*ATI.*ASUS.*X7.*                                       1               1
+ATI Radeon X500                                 .*ATI.*Diamond X5.*                                     1               1
+ATI Radeon X13xx                                .*ATI.*Diamond X13.*                            1               1
+ATI Radeon X16xx                                .*ATI.*Diamond X16.*                            1               1
+ATI Radeon X19xx                                .*ATI.*Diamond X19.*                            1               1
+ATI Display Adapter                             .*ATI.*display adapter.*                        0               1
 ATI FireGL 5200                                 .*ATI.*FireGL V52.*                                     0               1
 ATI FireGL 5xxx                                 .*ATI.*FireGL V5.*                                      1               1
 ATI FireGL                                              .*ATI.*Fire.*GL.*                                       0               1
@@ -61,6 +65,8 @@ ATI IGP 340M					.*ATI.*IGP.*340M.*					0		0
 ATI M52                                                 .*ATI.*M52.*                                            1               1
 ATI M54                                                 .*ATI.*M54.*                                            1               1
 ATI M56                                                 .*ATI.*M56.*                                            1               1
+ATI M71                                                 .*ATI.*M71.*                                            1               1
+ATI M72                                                 .*ATI.*M72.*                                            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
@@ -84,9 +90,13 @@ ATI Radeon HD 2300				.*ATI.*Radeon HD 23.*				0		1
 ATI Radeon HD 2400                              .*ATI.*Radeon HD.*24.*                          1               1
 ATI Radeon HD 2600                              .*ATI.*Radeon HD 26.*                           2               1
 ATI Radeon HD 2900                              .*ATI.*Radeon HD 29.*                           3               1
+ATI Radeon HD 3200                              .*ATI.*Radeon HD.*32.*                          1               1
+ATI Radeon HD 3300                              .*ATI.*Radeon HD.*33.*                          1               1
 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 HD 4300                              .*ATI.*Radeon HD 43.*                           1               1
+ATI Radeon HD 4600                              .*ATI.*Radeon HD 46.*                           3               1
 ATI Radeon HD 4800                              .*ATI.*Radeon HD.*48.*                          3               1
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                          0               0
 ATI Radeon 2100                                 .*ATI.*Radeon 21.*                                      0               1
@@ -104,13 +114,14 @@ ATI Radeon RV250				.*ATI.*RV250.*						0		1
 ATI Radeon RV600                                .*ATI.*RV6.*                                            1               1
 ATI Radeon RX700                                .*ATI.*RX70.*                                           1               1
 ATI Radeon RX800                                .*ATI.*Radeon *RX80.*                           2               1
+ATI Radeon RX9550                               .*ATI.*RX9550.*                                         1               1
 ATI Radeon VE                                   .*ATI.*Radeon.*VE.*                                     0               0
 ATI Radeon X1000                                .*ATI.*Radeon *X10.*                            0               1
 ATI Radeon X1200                                .*ATI.*Radeon *X12.*                            0               1
 ATI Radeon X1300                                .*ATI.*Radeon *X13.*                            1               1
 ATI Radeon X1400                                .*ATI.*Radeon X14.*                                     1               1
 ATI Radeon X1500                                .*ATI.*Radeon X15.*                                     1               1
-ATI Radeon X1600                                .*ATI.*Radeon X16.*                                     1               1
+ATI Radeon X1600                                .*ATI.*Radeon *X16.*                            1               1
 ATI Radeon X1700                                .*ATI.*Radeon X17.*                                     1               1
 ATI Radeon X1800                                .*ATI.*Radeon X18.*                                     3               1
 ATI Radeon X1900                                .*ATI.*Radeon X19.*                                     3               1
@@ -134,8 +145,8 @@ Intel 865G						.*Intel.*865G						0		0
 Intel 900                                               .*Intel.*900.*900                                       0               0
 Intel 915GM                                             .*Intel.*915GM                                          0               0
 Intel 915G                                              .*Intel.*915G                                           0               0
-Intel 945GM                                             .*Intel.*945GM                                          0               1
-Intel 945G                                              .*Intel.*945G                                           0               1
+Intel 945GM                                             .*Intel.*945GM.*                                        0               1
+Intel 945G                                              .*Intel.*945G.*                                         0               1
 Intel 950                                               .*Intel.*950.*                                          0               1
 Intel 965                                               .*Intel.*965.*                                          0               1
 Intel G33                                               .*Intel.*G33.*                                          0               0
@@ -143,15 +154,20 @@ Intel G45						.*Intel.*G45.*						0		1
 Intel Bear Lake                                 .*Intel.*Bear Lake.*                            0               0
 Intel Broadwater                                .*Intel.*Broadwater.*                           0               0
 Intel Brookdale                                 .*Intel.*Brookdale.*                            0               0
-Intel Eaglelake                                 .*Intel.*Eaglelake.*                            0               1
+Intel Cantiga                                   .*Intel.*Cantiga.*                                      0               0
+Intel Eaglelake                                 .*Intel.*Eaglelake.*                            0               0
 Intel Montara                                   .*Intel.*Montara.*                                      0               0
 Intel Springdale                                .*Intel.*Springdale.*                           0               0
 Matrox                                                  .*Matrox.*                                                      0               0
 Mesa                                                    .*Mesa.*                                                        0               0
 NVIDIA GTX 260                                  .*NVIDIA.*GeForce.*GTX.*260.*           3               1
 NVIDIA GTX 280                                  .*NVIDIA.*GeForce.*GTX.*280.*           3               1
+NVIDIA C51                                              .*NVIDIA.*C51.*                                         0               1
 NVIDIA G72                                              .*NVIDIA.*G72.*                                         1               1
 NVIDIA G73                                              .*NVIDIA.*G73.*                                         1               1
+NVIDIA G84                                              .*NVIDIA.*G84.*                                         3               1
+NVIDIA G86                                              .*NVIDIA.*G86.*                                         3               1
+NVIDIA G92                                              .*NVIDIA.*G92.*                                         3               1
 NVIDIA GeForce                                  .*GeForce 256.*                                         0               0
 NVIDIA GeForce 2                                .*GeForce2.*                                            0               1
 NVIDIA GeForce 3                                .*GeForce3.*                                            0               1
@@ -170,17 +186,25 @@ NVIDIA GeForce 7200				.*NVIDIA.*GeForce 72.*				1		1
 NVIDIA GeForce 7300                             .*NVIDIA.*GeForce 73.*                          1               1
 NVIDIA GeForce 7500                             .*NVIDIA.*GeForce 75.*                          1               1
 NVIDIA GeForce 7600                             .*NVIDIA.*GeForce 76.*                          2               1
-NVIDIA GeForce 7800                             .*NVIDIA.*GeForce 78.*                          2               1
+NVIDIA GeForce 7800                             .*NVIDIA.*GeForce.*78.*                         2               1
 NVIDIA GeForce 7900                             .*NVIDIA.*GeForce 79.*                          2               1
+NVIDIA GeForce 8100                             .*NVIDIA.*GeForce 81.*                          1               1
 NVIDIA GeForce 8200                             .*NVIDIA.*GeForce 82.*                          1               1
 NVIDIA GeForce 8300                             .*NVIDIA.*GeForce 83.*                          1               1
 NVIDIA GeForce 8400                             .*NVIDIA.*GeForce 84.*                          1               1
-NVIDIA GeForce 8500                             .*NVIDIA.*GeForce 85.*                          3               1
+NVIDIA GeForce 8500                             .*GeForce 85.*                                          3               1
+NVIDIA GeForce 8600M                    .*NVIDIA.*GeForce.*8600M.*                      1               1
 NVIDIA GeForce 8600                             .*NVIDIA.*GeForce 86.*                          3               1
 NVIDIA GeForce 8700                             .*NVIDIA.*GeForce 87.*                          3               1
 NVIDIA GeForce 8800                             .*NVIDIA.*GeForce 88.*                          3               1
 NVIDIA GeForce 9300M                    .*NVIDIA.*GeForce 9300M.*                       1               1
+NVIDIA GeForce 9400M                    .*NVIDIA.*GeForce 9400M.*                       1               1
 NVIDIA GeForce 9500M                    .*NVIDIA.*GeForce 9500M.*                       2               1
+NVIDIA GeForce 9600M                    .*NVIDIA.*GeForce 9600M.*                       2               1
+NVIDIA GeForce 9700M                    .*NVIDIA.*GeForce 9700M.*                       2               1
+NVIDIA GeForce 9300                             .*NVIDIA.*GeForce 93.*                          1               1
+NVIDIA GeForce 9400                             .*GeForce 94.*                                          1               1
+NVIDIA GeForce 9500                             .*NVIDIA.*GeForce 95.*                          2               1
 NVIDIA GeForce 9600                             .*NVIDIA.*GeForce 96.*                          3               1
 NVIDIA GeForce 9800                             .*NVIDIA.*GeForce 98.*                          3               1
 NVIDIA GeForce FX 5100                  .*NVIDIA.*GeForce FX 51.*                       0               1
@@ -212,11 +236,23 @@ NVIDIA GeForce Go 7600			.*NVIDIA.*GeForce Go 76.*			2		1
 NVIDIA GeForce Go 7700                  .*NVIDIA.*GeForce Go 77.*                       2               1
 NVIDIA GeForce Go 7800                  .*NVIDIA.*GeForce Go 78.*                       2               1
 NVIDIA GeForce Go 7900                  .*NVIDIA.*GeForce Go 79.*                       2               1
+NVIDIA GeForce GTX 260                  .*NVIDIA.*GeForce GTX 26.*                      3               1
+NVIDIA GeForce GTX 280                  .*NVIDIA.*GeForce GTX 28.*                      3               1
+NVIDIA D9M                                              .*D9M.*                                                         1               1
+NVIDIA G84                                              .*G84.*                                                         1               1
+NVIDIA G92                                              .*G92.*                                                         3               1
+NVIDIA G94                                              .*G94.*                                                         3               1
 NVIDIA GeForce Go 6                             .*GeForce Go 6.*                                        1               1
+NVIDIA NB9M                                             .*GeForce NB9M.*                                        1               1
+NVIDIA NB9P                                             .*GeForce NB9P.*                                        1               1
 NVIDIA GeForce PCX                              .*GeForce PCX.*                                         0               1
 NVIDIA Generic                                  .*NVIDIA.*Unknown.*                                     0               0
+NVIDIA NV17                                             .*GeForce NV17.*                                        0               1
 NVIDIA NV34                                             .*NVIDIA.*NV34.*                                        0               1
+NVIDIA NV36                                             .*GeForce NV36.*                                        1               1
 NVIDIA NV43                                             .*NVIDIA.*NV43.*                                        1               1
+NVIDIA NV44                                             .*NVIDIA.*NV44.*                                        1               1
+NVIDIA nForce                                   .*NVIDIA.*nForce.*                                      0               0
 NVIDIA MCP78                                    .*NVIDIA.*MCP78.*                                       1               1
 NVIDIA Quadro2                                  .*Quadro2.*                                                     0               1
 NVIDIA Quadro4                                  .*Quadro4.*                                                     0               1
@@ -225,10 +261,12 @@ NVIDIA Quadro FX 4500			.*Quadro.*FX.*4500.*				3		1
 NVIDIA Quadro FX                                .*Quadro FX.*                                           1               1
 NVIDIA Quadro NVS                               .*Quadro NVS.*                                          0               1
 NVIDIA RIVA TNT                                 .*RIVA TNT.*                                            0               0
+NVIDIA PCI                                              .*NVIDIA.*/PCI/SSE2                                     0               0
 S3                                                              .*S3 Graphics.*                                         0               0
 SiS                                                             SiS.*                                                           0               0
 Trident                                                 Trident.*                                                       0               0
 Tungsten Graphics                               Tungsten.*                                                      0               0
 XGI                                                             XGI.*                                                           0               0
 VIA                                                             VIA.*                                                           0               0
-
+Apple Generic                                   Apple.*Generic.*                                        0               0
+Apple Software Renderer                 Apple.*Software Renderer.*                      0               0
diff --git a/linden/indra/newview/installers/darwin/dmg-cleanup.applescript b/linden/indra/newview/installers/darwin/dmg-cleanup.applescript
new file mode 100644
index 0000000..f3d39ae
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/dmg-cleanup.applescript
@@ -0,0 +1,28 @@
+-- First, convert the disk image to "read-write" format with Disk Utility or hdiutil
+-- Mount the image, open the disk image window in the Finder and make it frontmost, then run this script from inside Script Editor
+-- After running the script, unmount the disk image, re-mount it, and copy the .DS_Store file off from the command line.
+
+tell application "Finder"
+        
+        set foo to every item in front window
+        repeat with i in foo
+                if the name of i is "Applications" then
+                        set the position of i to {391, 165}
+                else if the name of i ends with ".app" then
+                        set the position of i to {121, 166}
+                end if
+        end repeat
+        
+        -- There doesn't seem to be a way to set the background picture with applescript, but all the saved .DS_Store files should already have that set correctly.
+        
+        set foo to front window
+        set current view of foo to icon view
+        set toolbar visible of foo to false
+        set statusbar visible of foo to false
+        set the bounds of foo to {100, 100, 600, 399}
+        
+        -- set the position of front window to {100, 100}
+        -- get {name, position} of every item of front window
+        
+        get properties of front window
+end tell
diff --git a/linden/indra/newview/installers/darwin/firstlookslim-dmg/Applications-alias.r b/linden/indra/newview/installers/darwin/firstlookslim-dmg/Applications-alias.r
new file mode 100644
index 0000000..aa3cfb8
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/firstlookslim-dmg/Applications-alias.r
@@ -0,0 +1,6996 @@
+data 'alis' (0) {
+        $"0000 0000 0112 0002 0001 036D 6277 0000"            /* ...........mbw.. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 C135 A717 482B 0000 0000"            /* ......Á5§.H+.... */
+        $"0002 0C41 7070 6C69 6361 7469 6F6E 7300"            /* ...Applications. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 00E2 4F18 C2E8 9FB0 0000 0000 0000"            /* ...âO.Â蟰...... */
+        $"0000 FFFF FFFF 0000 0920 0000 0000 0000"            /* ..ÿÿÿÿ..Æ ...... */
+        $"0000 0000 0000 0000 0003 6D62 7700 0010"            /* ..........mbw... */
+        $"0008 0000 C136 0987 0000 0011 0008 0000"            /* ....Á6Ƈ........ */
+        $"C2E9 0220 0000 0001 0000 0002 0010 6D62"            /* Âé. ..........mb */
+        $"773A 4170 706C 6963 6174 696F 6E73 000E"            /* w:Applications.. */
+        $"001A 000C 0041 0070 0070 006C 0069 0063"            /* .....A.p.p.l.i.c */
+        $"0061 0074 0069 006F 006E 0073 000F 0008"            /* .a.t.i.o.n.s.... */
+        $"0003 006D 0062 0077 0012 000C 4170 706C"            /* ...m.b.w....Appl */
+        $"6963 6174 696F 6E73 0013 0001 2F00 FFFF"            /* ications..../.ÿÿ */
+        $"0000"                                               /* .. */
+};
+
+
+data 'icns' (-16455) {
+        $"6963 6E73 0001 B3AC 6973 3332 0000 0224"            /* icns..³¬is32...$ */
+        $"9F00 005F 8061 005D 8700 055D 9AA2 A0A4"            /* Ÿ.._€a.]‡..]š¢ ¤ */
+        $"8986 0008 557D B3B2 B1B3 A881 8081 8104"            /* ‰†..U}³²±³¨�€��. */
+        $"826F 577E AF82 A801 B3AE 82AD 03AF 7B7A"            /* ‚oW~¯‚¨.³®‚­.¯{z */
+        $"A781 A203 9EB7 C89D 81A2 03A6 776E 9A80"            /* §�¢.ž·È��¢.¦wnš€ */
+        $"9705 959F D3DC A295 8097 5899 6C67 8F8D"            /* —.•ŸÓÜ¢•€—X™lg�� */
+        $"8E89 85C9 BCA9 C883 898D 8D8E 6561 8585"            /* Ž‰…ɼ©Èƒ‰��Žea…… */
+        $"83A8 B7F3 BAB4 DFB6 AA84 8585 605E 7B7D"            /* ƒ¨·óº´ß¶ª„……`^{} */
+        $"79D0 F9E0 F0F2 DAE1 D87C 7D7B 5D5B 7476"            /* yÐùàðòÚáØ|}{][tv */
+        $"7099 D876 7373 76CA 8A72 7673 5B5A 6D70"            /* p™ØvssvÊŠrvs[Zmp */
+        $"6B9B 816C 6F6F 67B3 C567 706C 5A59 686B"            /* k›�loog³ÅgplZYhk */
+        $"6B67 686B 806A 056B 6F6A 6B67 5A88 5900"            /* kghk€j.kojkgZˆY. */
+        $"5882 598A 5801 0059 9F00 0482 8383 8480"            /* X‚YŠX..YŸ..‚ƒƒ„€ */
+        $"8700 057F B7BE BDC0 A786 0008 799E D0CE"            /* ‡...·¾½À§†..yžÐÎ */
+        $"CECF C5A1 A081 A105 A390 7AA0 D0CA 80C9"            /* ÎÏÅ¡ �¡.£�z ÐÊ€É */
+        $"01CA D183 CE03 D09C 9ECD 81C9 03C7 D4DE"            /* .ÊуÎ.ÐœžÍ�É.ÇÔÞ */
+        $"C681 C903 CD9A 94C5 80C2 05C1 C6E3 E9C8"            /* Æ�É.Íš”Å€Â.ÁÆãéÈ */
+        $"C180 C20D C491 8DBD BBBC B9B6 DDD7 CCDD"            /* Á€Â.Ä‘�½»¼¹¶Ý×ÌÝ */
+        $"B5B9 80BC 468B 87B4 B4B3 C8D1 F7D3 CFEA"            /* µ¹€¼F‹‡´´³ÈÑ÷ÓÏê */
+        $"D0C9 B4B4 B385 83AA ABA9 E0FB EAF5 F6E5"            /* ÐÉ´´³…ƒª«©àûêõöå */
+        $"EAE5 AAAB A981 80A0 A39E BAE4 A2A0 A1A2"            /* ê媫©�€ £žºä¢ ¡¢ */
+        $"DAAF 9FA3 9F7F 7E97 9B97 B8A6 979A 9A94"            /* Ú¯Ÿ£Ÿ.~—›—¸¦—šš” */
+        $"CAD6 949B 977D 7D90 9493 9091 8293 0496"            /* ÊÖ”›—}}�”“�‘‚“.– */
+        $"9294 907D 8E7C 8A7B 0100 7C9F 0000 7A80"            /* ’”�}Ž|Š{..|Ÿ..z€ */
+        $"7C00 7887 0005 77B1 B8B7 BBA0 8600 0871"            /* |.x‡..w±¸·» †..q */
+        $"97CB C9C8 CAC0 9B99 819A 049C 8972 99CA"            /* —ËÉÈÊÀ›™�š.œ‰r™Ê */
+        $"82C3 00CB 83C8 03CA 9596 C681 C203 BFCF"            /* ‚Ã.˃È.Ê•–Æ�Â.¿Ï */
+        $"DABF 81C2 03C6 938C BD80 BA05 B9BF E0E7"            /* Ú¿�Â.Æ“Œ½€º.¹¿àç */
+        $"C1B9 80BA 57BC 8985 B5B3 B3B0 ADD9 D2C6"            /* Á¹€ºW¼‰…µ³³°­ÙÒÆ */
+        $"D9AC B0B3 B3B4 827F ACAB AAC2 CCF6 CECA"            /* Ù¬°³³´‚.¬«ªÂÌöÎÊ */
+        $"E8CB C3AB ACAA 7D7B A1A3 A0DD FAE9 F4F5"            /* èË묪}{¡£ Ýúéôõ */
+        $"E3E8 E3A2 A3A0 7A78 989B 96B3 E29A 9898"            /* ãè㢣 zx˜›–³âš˜˜ */
+        $"9AD7 A897 9B97 7776 8F93 8FB2 9F8F 9292"            /* š×¨—›—wv�“�²Ÿ�’’ */
+        $"8BC5 D28C 938F 7575 888C 8B89 8982 8B04"            /* ‹ÅÒŒ“�uuˆŒ‹‰‰‚‹. */
+        $"8F8A 8C88 758E 748A 7301 0074 7338 6D6B"            /* �ŠŒˆuŽtŠs..ts8mk */
+        $"0000 0108 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 1E24 2424 1600 0000 0000"            /* .......$$$...... */
+        $"0000 0000 0011 BDC8 C8C8 9600 0000 0000"            /* ......½ÈÈÈ–..... */
+        $"0000 0000 048C FFFF FFFF F5A7 9C9E 9E9E"            /* .....Œÿÿÿÿõ§œžžž */
+        $"9E9E 6003 8AFF FCFC FCFC FEFF FFFF FFFF"            /* žž`.Šÿüüüüþÿÿÿÿÿ */
+        $"FFFF FF7A 89FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿz‰ÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FF7A 73FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿzsÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FF64 62FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿdbÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FF53 53FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿSSÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FF45 48FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿEHÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FF3C 41FF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿ<Aÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FD35 3DFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿý5=ÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FA30 3CFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿú0<ÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FB2F 1247 4B4A 4A4A 4A4A 4A4A 4A4A"            /* ÿÿû/.GKJJJJJJJJJ */
+        $"4A4B 450F 0101 0201 0101 0101 0101 0101"            /* JKE............. */
+        $"0102 0001 696C 3332 0000 05AB FF00 BE00"            /* ....il32...«ÿ.¾. */
+        $"025A 7881 847F 0064 9200 0262 BBC4 83C2"            /* .Zx�„..d’..b»ÄƒÂ */
+        $"02C7 8451 9000 0255 86BF 84BC 03BF A064"            /* .Ç„Q�..U†¿„¼.¿ d */
+        $"6389 6400 6281 0003 5770 A2A2 85A1 01A3"            /* c‰d.b�..Wp¢¢…¡.£ */
+        $"9D89 9B07 9C97 6758 005B 95AC 88A7 02A8"            /* �‰›.œ—gX.[•¬ˆ§.¨ */
+        $"A4A7 89A8 05AB 925A 61A7 AE88 AC03 ABCA"            /* ¤§‰¨.«’Za§®ˆ¬.«Ê */
+        $"AEAB 88AC 05AE A15E 5B9A A788 A503 A0D7"            /* ®«ˆ¬.®¡^[š§ˆ¥. × */
+        $"D79F 88A5 05A8 9559 5990 A288 9F04 9BAB"            /* ןˆ¥.¨•YY�¢ˆŸ.›« */
+        $"FBAE 9C87 9F05 A28B 5857 879D 879A 0595"            /* û®œ‡Ÿ.¢‹XW‡�‡š.• */
+        $"BDD6 E6E3 9487 9A05 9D82 5656 7F97 8594"            /* ½Öæ㔇š.�‚VV.—…” */
+        $"0995 8FB3 F4CF B1FF AD90 9585 9405 977A"            /* Æ•�³ôϱÿ­�•…”.—z */
+        $"0000 7793 8690 078D CDF8 B886 E8E5 8B86"            /* ..w“†�.�Íø¸†è勆 */
+        $"9005 9372 0000 708F 828C 808B 0984 BBF7"            /* �.“r..p�‚Œ€‹Æ„»÷ */
+        $"C687 85AB FFA9 8580 8B82 8C05 8E6D 0000"            /* Ƈ…«ÿ©…€‹‚Œ.Žm.. */
+        $"6B8A 8287 0D88 8785 8FF3 FDA1 8186 84E5"            /* kŠ‚‡.ˆ‡…�óý¡�†„å */
+        $"E484 8684 8705 8868 0000 6685 8183 117E"            /* 䄆„‡.ˆh..f…�ƒ.~ */
+        $"B3E3 D0D2 FFDC D4DF DDDB D2FD D0DE E2B7"            /* ³ãÐÒÿÜÔßÝÛÒýÐÞâ· */
+        $"8082 8304 6400 0062 8081 7F06 76C5 FFDB"            /* €‚ƒ.d..b€�..vÅÿÛ */
+        $"F9F3 E381 FF06 F6D4 BFF4 FFD3 7882 7F03"            /* ùóã�ÿ.öÔ¿ôÿÓx‚.. */
+        $"6100 005F 827B 0675 B0D9 E1FF C8D8 82DF"            /* a.._‚{.u°ÙáÿÈØ‚ß */
+        $"05BF F3C9 DCB9 7681 7B04 7A5E 0000 5C82"            /* .¿óÉܹv�{.z^..\‚ */
+        $"7706 786F 96FF E879 7281 7306 7278 C8C2"            /* w.xo–ÿèyr�s.rxÈÂ */
+        $"7074 7880 7706 7875 5C00 005A 7382 7405"            /* ptx€w.xu\..Zs‚t. */
+        $"71C1 E19A 6D74 8173 0574 6BA2 FFAD 6C81"            /* qÁášmt�s.tk¢ÿ­l� */
+        $"7406 7571 5B00 005A 6F81 7104 6F77 F2AF"            /* t.uq[..Zo�q.owò¯ */
+        $"6984 7105 6E7E FAFB 836D 8071 0772 6D5A"            /* i„q.n~úûƒm€q.rmZ */
+        $"0000 586C 6F80 6E03 6C7B 9368 866E 0467"            /* ..Xlo€n.l{“h†n.g */
+        $"C3FA 8B69 806E 076F 6A59 0000 586A 6E81"            /* Ãú‹i€n.ojY..Xjn� */
+        $"6D01 6C68 876D 036B 717D 6B81 6D07 6E69"            /* m.lh‡m.kq}k�m.ni */
+        $"5900 0058 666A 8E69 0168 6682 6903 6A65"            /* Y..XfjŽi.hf‚i.je */
+        $"5900 BD59 0000 9B59 9E00 FF00 BE00 027D"            /* Y.½Y..›Yž.ÿ.¾..} */
+        $"98A0 829E 029F 9E85 9200 0284 D5DE 83DC"            /* ˜ ‚ž.Ÿž…’..„ÕÞƒÜ */
+        $"02E0 A275 9000 0279 A7DB 84D8 03DB BD87"            /* .à¢u�..y§Û„Ø.Û½‡ */
+        $"8689 8700 8581 0003 7A92 C0C0 85BF 01C0"            /* †‰‡.…�..z’ÀÀ…¿.À */
+        $"BB89 B907 BAB4 887B 007E B7CC 88C7 01C8"            /* »‰¹.º´ˆ{.~·ÌˆÇ.È */
+        $"C68A C805 CBB2 7C84 CAD1 89CF 02DE CFCE"            /* ÆŠÈ.˲|„ÊщÏ.ÞÏÎ */
+        $"88CF 05D2 C380 7FBF CC88 CA03 C7E8 E5C6"            /* ˆÏ.ÒÀ.¿ÌˆÊ.ÇèåÆ */
+        $"88CA 05CD B87C 7CB7 CA88 C704 C4CD FCCD"            /* ˆÊ.͸||·ÊˆÇ.ÄÍüÍ */
+        $"C587 C705 CAB0 7A7A AFC7 87C4 05C1 D4E3"            /* ŇÇ.Ê°zz¯Ç‡Ä.ÁÔã */
+        $"F0ED C087 C405 C8A8 7979 A7C4 85C0 09C1"            /* ðíÀ‡Ä.Ȩyy§Ä…ÀÆÁ */
+        $"BDD0 F7E1 D1FF CDBE C185 C005 C4A1 0000"            /* ½Ð÷áÑÿ;Á…À.Ä¡.. */
+        $"A0C1 86BD 07BA DEFB D5B7 F2EE B986 BD05"            /*  Á†½.ºÞûÕ·ò½. */
+        $"C09A 0000 9ABE 85BA 09B6 D4F9 DBB8 B6CD"            /* Àš..š¾…ºÆ¶ÔùÛ¸¶Í */
+        $"FFCA B785 BA05 BD94 0000 94B9 83B6 0EB4"            /* ÿÊ·…º.½”..”¹ƒ¶.´ */
+        $"B3B9 F7FE C4B0 B4B2 EFED B2B4 B4B5 82B6"            /* ³¹÷þÄ°´²ïí²´´µ‚¶ */
+        $"05B8 8F00 008E B481 B211 AFCD EBDF E0FF"            /* .¸�..Ž´�².¯Íëßàÿ */
+        $"E8E2 E9E8 E6E0 FEDF E8EA D0B0 81B2 05B3"            /* èâéèæàþßèêа�².³ */
+        $"8A00 0089 AF81 AD06 A8D9 FFE7 FBF7 EB81"            /* Š..‰¯�­.¨Ùÿçû÷ë� */
+        $"FF06 F9E1 D3F8 FFE3 A980 AD05 AEAD 8600"            /* ÿ.ùáÓøÿã©€­.®­†. */
+        $"0086 82A9 06A5 CBE5 EAFF DAE5 82EA 05D3"            /* .†‚©.¥ËåêÿÚå‚ê.Ó */
+        $"F7DA E8D1 A680 A906 AAA7 8300 0082 A382"            /* ÷ÚèѦ€©.ª§ƒ..‚£‚ */
+        $"A405 9FB7 FFF0 A5A1 81A2 05A1 A5D9 D39F"            /* ¤.Ÿ·ÿð¥¡�¢.¡¥ÙÓŸ */
+        $"A281 A406 A5A1 8000 0080 9F82 A004 9ED2"            /* ¢�¤.¥¡€..€Ÿ‚ .žÒ */
+        $"E9BA 9B83 A004 9ABF FFC5 9A81 A007 A19C"            /* 麛ƒ .š¿ÿÅš� .¡œ */
+        $"7F00 007E 999D 809B 059A 9FF6 C696 9C83"            /* ...~™�€›.šŸöÆ–œƒ */
+        $"9B05 99A4 FBFB A799 809B 079C 977D 0000"            /* ›.™¤ûû§™€›.œ—}.. */
+        $"7C95 9980 9803 97A1 B295 8698 0494 D5FC"            /* |•™€˜.—¡²•†˜.”Õü */
+        $"AC95 8098 0799 937C 0000 7C93 9782 9600"            /* ¬•€˜.™“|..|“—‚–. */
+        $"9387 9603 9599 A295 8196 0797 917C 0000"            /* “‡–.•™¢•�–.—‘|.. */
+        $"7B8E 928D 9102 9290 8F82 9103 928C 7B00"            /* {Ž’�‘.’��‚‘.’Œ{. */
+        $"BD7C 0000 9B7C 9E00 FF00 BE00 0275 9199"            /* ½|..›|ž.ÿ.¾..u‘™ */
+        $"8498 007E 9200 027D D0D9 83D7 02DB 9B6C"            /* „˜.~’..}ÐÙƒ×.Û›l */
+        $"9000 0271 A0D5 84D2 03D5 B67F 7E89 7F00"            /* �..q Õ„Ò.Õ¶.~‰.. */
+        $"7D81 0003 728B BBBB 85BA 02BB B6B3 88B4"            /* }�..r‹»»…º.»¶³ˆ´ */
+        $"08B5 AF81 7300 76B0 C6C2 87C1 01C2 C089"            /* .µ¯�s.v°Æ‡Á.ÂÀ‰ */
+        $"C206 C3C5 AB75 7CC3 CA89 C801 DBC9 89C8"            /* Â.ÃÅ«u|ÃʉÈ.ÛÉ‰È */
+        $"05CB BD78 77B9 C588 C304 C0E5 E2BF C487"            /* .˽xw¹ÅˆÃ.Àåâ¿Ä‡ */
+        $"C305 C6B2 7574 B0C3 87C0 05BF BCC7 FCC7"            /* Ã.Ʋut°Ã‡À.¿¼ÇüÇ */
+        $"BE87 C005 C3A9 7272 A7BF 87BC 05B9 D0E1"            /* ¾‡À.érr§¿‡¼.¹Ðá */
+        $"EEEB B887 BC05 C0A1 7171 A0BC 86B8 07B5"            /* î븇¼.À¡qq ¼†¸.µ */
+        $"CBF6 DDCB FFC7 B586 B805 BB99 0000 98B9"            /* ËöÝËÿǵ†¸.»™..˜¹ */
+        $"86B5 07B2 DBFA D0AE F0EC B186 B505 B892"            /* †µ.²ÛúЮð챆µ.¸’ */
+        $"0000 91B5 82B2 80B1 09AC D0F9 D7AF ADC7"            /* ..‘µ‚²€±Æ¬Ðùׯ­Ç */
+        $"FFC4 AD80 B182 B205 B48C 0000 8BB1 81AD"            /* ÿÄ­€±‚².´Œ..‹±�­ */
+        $"11AE ADAC ABB1 F6FD BDA8 ABAA EDEB A9AB"            /* .®­¬«±öý½¨«ªíë©« */
+        $"ACAC AE81 AD05 AF87 0000 86AB 81A9 11A6"            /* ¬¬®�­.¯‡..†«�©.¦ */
+        $"C8E9 DCDE FFE5 DFE7 E6E4 DDFE DCE6 E9CB"            /* ÈéÜÞÿåßçæäÝþÜæéË */
+        $"A781 A905 AA82 0000 81A6 81A5 069F D6FF"            /* §�©.ª‚..�¦�¥.ŸÖÿ */
+        $"E4FA F6EA 81FF 06F8 DFCF F7FF E0A0 80A5"            /* äúöê�ÿ.øßÏ÷ÿà €¥ */
+        $"05A6 A47E 0000 7D82 A006 9BC6 E3E8 FFD6"            /* .¦¤~..}‚ .›ÆãèÿÖ */
+        $"E282 E805 CFF6 D7E6 CC9C 80A0 06A1 9E7B"            /* â‚è.Ïö×æÌœ€ .¡ž{ */
+        $"0000 7A9B 829C 0496 B1FF EF9D 8399 049C"            /* ..z›‚œ.–±ÿï�ƒ™.œ */
+        $"D6D0 969A 819C 069D 9979 0000 7897 8198"            /* ÖЖš�œ.�™y..x—�˜ */
+        $"0597 95CF E7B4 9283 9704 91BA FFC0 9181"            /* .—•Ïç´’ƒ—.‘ºÿÀ‘� */
+        $"9807 9994 7700 0076 9295 8094 0493 98F5"            /* ˜.™”w..v’•€”.“˜õ */
+        $"C28E 8494 0592 9DFB FBA0 9180 9407 958F"            /* ÂŽ„”.’�ûû ‘€”.•� */
+        $"7500 0074 8E91 8090 038F 9AAC 8C86 9004"            /* u..tŽ‘€�.�š¬Œ†�. */
+        $"8BD1 FBA6 8C80 9007 918B 7400 0074 8B8F"            /* ‹Ñû¦Œ€�.‘‹t..t‹� */
+        $"808E 048F 8E8B 8E8F 848E 048F 8D91 9B8D"            /* €Ž.�Ž‹Ž�„Ž.��‘›� */
+        $"818E 078F 8974 0000 7487 8B8E 8A01 8987"            /* �Ž.�‰t..t‡‹ŽŠ.‰‡ */
+        $"828A 038B 8574 00BD 7400 009B 749E 006C"            /* ‚Š.‹…t.½t..›tž.l */
+        $"386D 6B00 0004 0800 0000 0000 0000 0000"            /* 8mk............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0B76 8889 8989"            /* ...........vˆ‰‰‰ */
+        $"8989 8988 3800 0000 0000 0000 0000 0000"            /* ‰‰‰ˆ8........... */
+        $"0000 0000 0000 0000 0000 36FF FFFF FFFF"            /* ..........6ÿÿÿÿÿ */
+        $"FFFF FFFF A301 0000 0000 0000 0000 0000"            /* ÿÿÿÿ£........... */
+        $"0000 0000 0000 0000 0006 A4FF FFFF FFFF"            /* ..........¤ÿÿÿÿÿ */
+        $"FFFF FFFF DE59 3F40 4040 4040 4040 4040"            /* ÿÿÿÿÞY?@@@@@@@@@ */
+        $"4040 4033 0000 0000 1384 F8F3 F3F3 F3F3"            /* @@@3.....„øóóóóó */
+        $"F3F3 F3F3 F7F9 F7F7 F7F7 F7F7 F7F7 F7F7"            /* óóóó÷ù÷÷÷÷÷÷÷÷÷÷ */
+        $"F7F7 F7F1 520D 001D E1FF FAFB FBFB FBFB"            /* ÷÷÷ñR...áÿúûûûûû */
+        $"FBFB FBFB FBFB FBFB FBFB FBFB FBFB FBFB"            /* ûûûûûûûûûûûûûûûû */
+        $"FBFB FBFB FFCD 0E39 FFFF FFFF FFFF FFFF"            /* ûûûûÿÍ.9ÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFF8 1F26 F6FF FFFF FFFF FFFF"            /* ÿÿÿÿÿø.&öÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFE5 1318 ECFF FFFF FFFF FFFF"            /* ÿÿÿÿÿå..ìÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFD5 0A0F DDFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÕÂ.Ýÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFC6 0206 D0FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÆ..Ðÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFB6 0000 C2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¶..Âÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFA5 0000 B2FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ¥..²ÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF95 0000 A4FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ•..¤ÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF87 0000 96FF FFFF FFFF FFFF"            /* ÿÿÿÿÿ‡..–ÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF7A 0000 8AFF FFFF FFFF FFFF"            /* ÿÿÿÿÿz..Šÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF6D 0000 7FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿm...ÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF63 0000 77FF FFFF FFFF FFFF"            /* ÿÿÿÿÿc..wÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF5A 0000 6FFF FFFF FFFF FFFF"            /* ÿÿÿÿÿZ..oÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF54 0000 69FF FFFF FFFF FFFF"            /* ÿÿÿÿÿT..iÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF4F 0000 65FF FFFF FFFF FFFF"            /* ÿÿÿÿÿO..eÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF4C 0000 64FF FFFF FFFF FFFF"            /* ÿÿÿÿÿL..dÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF4B 0000 61FF FFFF FFFF FFFF"            /* ÿÿÿÿÿK..aÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF48 0004 2C6D 7574 7474 7474"            /* ÿÿÿÿÿH..,muttttt */
+        $"7474 7474 7474 7474 7474 7474 7474 7474"            /* tttttttttttttttt */
+        $"7474 7475 6824 0202 0D18 1C1C 1C1C 1C1C"            /* tttuh$.......... */
+        $"1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C 1C1C"            /* ................ */
+        $"1C1C 1C1C 170C 0100 0103 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0301 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0069 6833 3200 0009 DEFF"            /* .......ih32..ÆÞÿ */
+        $"00FF 00FF 00AD 0001 5E66 8865 0261 5859"            /* .ÿ.ÿ.­..^fˆe.aXY */
+        $"9C00 025E A6BA 87B7 04B9 AE67 5659 9B00"            /* œ..^¦º‡·.¹®gVY›. */
+        $"0266 BABF 87BE 04BF BC70 5459 9A00 0252"            /* .fº¿‡¾.¿¼pTYš..R */
+        $"81BD 89BA 03BC 8652 5491 5585 0003 5580"            /* �½‰º.¼†RT‘U…..U€ */
+        $"B7BA 89B9 02BA B497 918F 0191 7683 0003"            /* ·º‰¹.º´—‘�.‘vƒ.. */
+        $"5864 9399 8B97 0098 929B 039D 855F 5A80"            /* Xd“™‹—.˜’›.�…_Z€ */
+        $"0002 649D A990 A500 A490 A509 A6A9 9B65"            /* ..d�©�¥.¤�¥Æ¦©›e */
+        $"0000 85B4 AFAF 8EAE 03B0 AEAC AF8E AE07"            /* ..…´¯¯Ž®.°®¬¯Ž®. */
+        $"AFAF B280 0000 80AD 8FA9 04A8 B2E7 ACA8"            /* ¯¯²€..€­�©.¨²ç¬¨ */
+        $"90A9 05AB 7A00 0076 A98F A604 A5A4 F1E0"            /* �©.«z..v©�¦.¥¤ñà */
+        $"A08F A606 A7A6 7100 006D A390 A204 9DC8"            /*  �¦.§¦q..m£�¢.�È */
+        $"FFB9 9C8E A207 A3A0 6A00 0065 9D9F 8D9E"            /* ÿ¹œŽ¢.£ j..e�Ÿ�ž */
+        $"069F 9C96 A2FA EF9C 8E9E 079F 9A65 0000"            /* .Ÿœ–¢úž.Ÿše.. */
+        $"6097 9C8D 9B07 97A5 E2C6 D2FF C394 8D9B"            /* `—œ�›.—¥âÆÒÿÔ�› */
+        $"079C 9461 0000 5E90 988C 9709 959A D5CE"            /* .œ”a..^�˜Œ—Æ•šÕÎ */
+        $"E4B2 FCF4 9A95 8C97 0799 8D5E 0000 5A8B"            /* ä²üôš•Œ—.™�^..Z‹ */
+        $"968C 9409 8EC8 FFF6 C18D DDFF C78C 8C94"            /* –Œ”ÆŽÈÿöÁ�ÝÿÇŒŒ” */
+        $"0796 875B 0000 5885 938B 910B 8F8F E5FF"            /* .–‡[..X…“‹‘.��åÿ */
+        $"FFA9 87AA FFF7 988E 8B91 0793 8159 0000"            /* ÿ©‡ªÿ÷˜Ž‹‘.“�Y.. */
+        $"577F 908B 8E0B 87CF D4D0 CA89 8D8B E0FF"            /* W.�‹Ž.‡ÏÔÐʉ�‹àÿ */
+        $"C786 8B8E 0790 7B58 0000 5779 8C86 8A81"            /* dž‹Ž.�{X..WyŒ†Š� */
+        $"8B0D 84A5 FFFF E38B 898B 85A8 FFF8 9387"            /* ‹.„¥ÿÿ㋉‹…¨ÿø“‡ */
+        $"818B 868A 078C 7557 0000 5674 8A85 8800"            /* �‹†Š.ŒuW..VtŠ…ˆ. */
+        $"8680 820E 8385 E4FF FFB9 7C83 8381 7FDD"            /* †€‚.ƒ…äÿÿ¹|ƒƒ�.Ý */
+        $"FFC6 7E81 8200 8585 8807 8A71 5759 0056"            /* ÿÆ~�‚.……ˆ.ŠqWY.V */
+        $"6F87 8485 1983 929F A3A0 94B0 FFFF E39D"            /* o‡„….ƒ’Ÿ£ ”°ÿÿã� */
+        $"9F9E 9DA3 9AB0 FBF4 98A0 A09F A192 8484"            /* Ÿž�£š°ûô˜  Ÿ¡’„„ */
+        $"8507 876D 5759 0056 6984 8482 197C A7EB"            /* ….‡mWY.Vi„„‚.|§ë */
+        $"FBF1 C2EC FFFB C1ED F2F6 ECFB EDD9 DBFF"            /* ûñÂìÿûÁíòöìûíÙÛÿ */
+        $"D4EE F0F6 F6B7 7C84 8207 8369 5700 5956"            /* Ôîðöö·|„‚.ƒiW.YV */
+        $"6481 847F 0979 A3FF FFEB CCFF FFD5 E084"            /* d�„.Æy£ÿÿëÌÿÿÕà„ */
+        $"FF03 C8F1 BCC4 80FF 01C0 7785 7F06 6557"            /* ÿ.Èñ¼Ä€ÿ.Àw…..eW */
+        $"5959 5661 7E84 7D08 76A3 FFFF C3F4 FFF5"            /* YYVa~„}.v£ÿÿÃôÿõ */
+        $"CB85 FF08 EDA8 CCC0 F2FF FFC1 7485 7D06"            /* Ë…ÿ.í¨ÌÀòÿÿÁt…}. */
+        $"6358 5959 575E 7B84 7A09 7692 D0BE D6FF"            /* cXYYW^{„zÆv’оÖÿ */
+        $"FFC2 B9D0 84CF 08CD B9FF F1B1 CED0 A574"            /* ÿ¹ЄÏ.͹ÿñ±ÎÐ¥t */
+        $"847A 0679 6058 5959 585D 8678 0776 6A9C"            /* „z.y`XYYX]†x.vjœ */
+        $"FFFF F081 7086 7106 75D1 D89D 6A71 7484"            /* ÿÿð�p†q.uÑØ�jqt„ */
+        $"7808 7976 5E58 5959 585B 7486 7505 73B9"            /* x.yv^XYYX[t†u.s¹ */
+        $"F5FF AC6D 8775 0570 8CEB F889 6F85 7508"            /* õÿ¬m‡u.pŒëø‰o…u. */
+        $"7672 5C58 5959 5859 7285 7306 6F8A E1C6"            /* vr\XYYXYr…s.oŠáÆ */
+        $"C176 7287 7306 7179 EEFF E173 7184 7308"            /* Ávr‡s.qyîÿásq„s. */
+        $"7470 5B58 5959 5859 7085 7205 6B97 FFE7"            /* tp[XYYXYp…r.k—ÿç */
+        $"776E 8972 0569 C6FF FFB4 6A84 7202 736E"            /* wn‰r.iÆÿÿ´j„r.sn */
+        $"5A81 5901 586D 856F 0567 B9D9 786B 7089"            /* Z�Y.Xm…o.g¹Ùxkp‰ */
+        $"6F06 6993 FFFF F173 6D83 6F01 706B 8259"            /* o.i“ÿÿñsmƒo.pk‚Y */
+        $"0157 6B85 6E03 6C8C 7269 8B6E 066D 6BD3"            /* .Wk…n.lŒri‹n.mkÓ */
+        $"FFCB 6C6D 836E 026F 6958 8159 0256 6A6E"            /* ÿËlmƒn.oiX�Y.Vjn */
+        $"856D 0169 6B8D 6D04 6A73 8A6D 6B84 6D02"            /* …m.ik�m.jsŠmk„m. */
+        $"6E68 5881 5902 566A 6E98 6D02 6B67 6C85"            /* nhX�Y.Vjn˜m.kgl… */
+        $"6D02 6E68 5881 5902 5665 69A3 6802 6963"            /* m.nhX�Y.Vei£h.ic */
+        $"5881 5901 5858 A559 0058 B059 0000 AB59"            /* X�Y.XX¥Y.X°Y..«Y */
+        $"8000 A959 DF00 FF00 FF00 FF00 AD00 0081"            /* €.©Yß.ÿ.ÿ.ÿ.­..� */
+        $"8987 0283 7B7C 9C00 0280 C1D3 87D1 04D2"            /* ‰‡.ƒ{|œ..€ÁÓ‡Ñ.Ò */
+        $"C787 7A7C 9B00 0288 D4DA 87D9 04DA D68F"            /* LJz|›..ˆÔÚ‡Ù.ÚÖ� */
+        $"787C 9A00 0276 A2D8 89D6 02D7 A476 9278"            /* x|š..v¢Ø‰Ö.פv’x */
+        $"8500 0379 A2D3 D789 D503 D6D0 B5AD 90AE"            /* …..y¢Ó׉Õ.Öе­�® */
+        $"01B0 9683 0003 7C87 B1B7 8BB5 00B6 92B9"            /* .°–ƒ..|‡±·‹µ.¶’¹ */
+        $"03BA A282 7D80 0003 87BD C8C5 90C4 00C5"            /* .º¢‚}€..‡½ÈÅ�Ä.Å */
+        $"8FC4 08C5 C8B9 8700 00A7 D6D1 90D0 01CD"            /* �Ä.Åȹ‡..§ÖÑ�Ð.Í */
+        $"CF90 D006 D1D3 A000 00A3 D18F CD04 CCD1"            /* Ï�Ð.ÑÓ ..£Ñ�Í.ÌÑ */
+        $"EECC CC90 CD05 CF9B 0000 9ACE 90CB 03CA"            /* îÌÌ�Í.Ï›..šÎ�Ë.Ê */
+        $"F7E9 C68F CB07 CCCB 9300 0091 C9C9 8FC8"            /* ÷éÆ�Ë.ÌË“..‘ÉÉ�È */
+        $"04C6 DFFF D2C5 8EC8 07C9 C68D 0000 8BC5"            /* .ÆßÿÒÅŽÈ.ÉÆ�..‹Å */
+        $"C78D C606 C7C5 BFC7 FDF3 C38E C607 C7C0"            /* Ç�Æ.ÇÅ¿ÇýóÃŽÆ.ÇÀ */
+        $"8800 0086 C0C5 8DC4 07C2 C7EB DAE4 FFD9"            /* ˆ..†ÀÅ�Ä.ÂÇëÚäÿÙ */
+        $"C08D C407 C6BC 8400 0082 BBC4 8CC2 09C1"            /* À�Ä.Ƽ„..‚»ÄŒÂÆÁ */
+        $"C2E2 DEED D1FD F7C1 C18C C207 C4B6 8100"            /* ÂâÞíÑý÷ÁÁŒÂ.Ķ�. */
+        $"007F B5C2 8CC0 09BC DBFF F8D7 BBEA FFDB"            /* ..µÂŒÀƼÛÿø×»êÿÛ */
+        $"BA8C C007 C2B0 7E00 007C B0C0 8BBE 0BBD"            /* ºŒÀ.°~..|°À‹¾.½ */
+        $"BAED FFFF CCB8 CCFF F9BF BC8B BE07 C0AA"            /* ºíÿÿ̸Ìÿù¿¼‹¾.Àª */
+        $"7C00 007B ABBF 8BBC 0BB7 DEE1 DFDF B9BB"            /* |..{«¿‹¼.·Þáßß¹» */
+        $"BAED FFDA B78B BC07 BFA5 7B00 007A A5BC"            /* ºíÿÚ·‹¼.¿¥{..z¥¼ */
+        $"89B9 0EBA B6C6 FFFF ECB9 B9BA B6CB FFFA"            /* ‰¹.º¶Æÿÿì¹¹º¶Ëÿú */
+        $"BCB8 8AB9 07BC 9F7A 0000 799F B984 B601"            /* ¼¸Š¹.¼Ÿz..yŸ¹„¶. */
+        $"B7B5 82B3 0CEC FFFF D4AF B3B3 B2B1 EAFF"            /* ·µ‚³.ìÿÿÔ¯³³²±êÿ */
+        $"D9B0 81B3 01B5 B784 B607 B899 797C 0079"            /* Ù°�³.µ·„¶.¸™y|.y */
+        $"99B7 84B4 13B3 B9BE C1C0 B9CB FFFF EDBE"            /* ™·„´.³¹¾ÁÀ¹Ëÿÿí¾ */
+        $"BFBE BEC1 BCCB FCF7 BB80 BF02 C0B9 B384"            /* ¿¾¾Á¼Ëü÷»€¿.À¹³„ */
+        $"B407 B694 797C 0079 93B4 84B1 19AD C7F1"            /* ´.¶”y|.y“´„±.­Çñ */
+        $"FBF5 D6F1 FFFD D5F2 F5F8 F1FB F2E4 E7FF"            /* ûõÖñÿýÕòõøñûòäçÿ */
+        $"E2F3 F4F8 F8D0 AD84 B107 B290 7A00 7C79"            /* âóôøøЭ„±.²�z.|y */
+        $"8DB0 84AE 09AA C3FF FFF2 DCFF FFE2 E984"            /* �°„®ÆªÃÿÿòÜÿÿâé„ */
+        $"FF03 D9F6 D1D8 80FF 01D6 A985 AE06 8C7A"            /* ÿ.ÙöÑØ€ÿ.Ö©…®.Œz */
+        $"7C7C 7989 AD84 AB08 A7C3 FFFF D5F7 FFF8"            /* ||y‰­„«.§ÃÿÿÕ÷ÿø */
+        $"DA85 FF08 F2C2 DAD3 F6FF FFD7 A583 AB08"            /* Ú…ÿ.òÂÚÓöÿÿ×¥ƒ«. */
+        $"ACAA 897A 7C7C 7A86 A984 A809 A5B7 E0D3"            /* ¬ª‰z||z†©„¨Æ¥·àÓ */
+        $"E2FF FFD6 D0E0 84DF 08DD CFFF F5CB DFE0"            /* âÿÿÖÐà„ß.ÝÏÿõËßà */
+        $"C3A4 83A8 07A9 A686 7A7C 7C7A 8386 A506"            /* 䃨.©¦†z||zƒ†¥. */
+        $"A39B BAFF FFF5 AA87 A006 A3DF E2BA 9BA1"            /* £›ºÿÿõª‡ .£ß⺛¡ */
+        $"A284 A507 A6A2 837B 7C7C 7B82 87A2 059F"            /* ¢„¥.¦¢ƒ{||{‚‡¢.Ÿ */
+        $"CCF8 FFC7 9C87 A205 9EAF F0F9 AD9E 85A2"            /* ÌøÿÇœ‡¢.ž¯ðù­ž…¢ */
+        $"08A3 9F81 7B7C 7C7B 7F9D 859F 069C AEE8"            /* .£Ÿ�{||{.�…Ÿ.œ®è */
+        $"D4D3 A09E 879F 069D A3F4 FFE8 9D9E 849F"            /* ÔÓ ž‡Ÿ.�£ôÿè�ž„Ÿ */
+        $"09A0 9B7F 7B7C 7C7B 7E9A 9D84 9C05 98B5"            /* Æ ›.{||{~š�„œ.˜µ */
+        $"FFEE 9F99 899C 0596 D7FF FFC9 9684 9C09"            /* ÿ‰œ.–×ÿÿÉ–„œÆ */
+        $"9D97 7E7B 7C7C 7B7C 989B 849A 0494 CCE4"            /* �—~{||{|˜›„š.”Ìä */
+        $"A097 8A9A 0695 B3FF FFF4 9C99 839A 019B"            /*  —Šš.•³ÿÿôœ™ƒš.› */
+        $"9482 7C02 7B95 9984 9803 97AD 9B95 8B98"            /* ”‚|.{•™„˜.—­›•‹˜ */
+        $"0697 96E0 FFDA 9797 8398 0199 9282 7C02"            /* .—–àÿÚ——ƒ˜.™’‚|. */
+        $"7A93 9785 9601 9395 8D96 0494 9AAB 9695"            /* z“—…–.“•�–.”š«–• */
+        $"8496 0297 8F7B 817C 027A 9297 9896 0294"            /* „–.—�{�|.z’—˜–.” */
+        $"9295 8596 0297 8F7B 817C 027A 8C91 A390"            /* ’•…–.—�{�|.zŒ‘£� */
+        $"0291 897A 817C 017B 7BA5 7C00 7BB0 7C00"            /* .‘‰z�|.{{¥|.{°|. */
+        $"00AB 7C80 00A9 7CDF 00FF 00FF 00FF 00AD"            /* .«|€.©|ß.ÿ.ÿ.ÿ.­ */
+        $"0000 7A89 8002 7C73 749C 0002 79BC CE87"            /* ..z‰€.|stœ..y¼Î‡ */
+        $"CC04 CDC2 8172 749B 0002 80CF D587 D304"            /* Ì.ÍÂ�rt›..€ÏÕ‡Ó. */
+        $"D4D1 8870 749A 0002 6E9B D288 D003 D1D2"            /* Ôшptš..n›ÒˆÐ.ÑÒ */
+        $"9E6E 9270 8500 0371 9BCE D289 D002 D1CB"            /* žn’p…..q›ÎÒ‰Ð.ÑË */
+        $"AF91 A801 AA90 8300 0474 80AC B2AF 8AB0"            /* ¯‘¨.ª�ƒ..t€¬²¯Š° */
+        $"02B1 B3B4 90B3 03B5 9D7A 7580 0002 80B7"            /* .±³´�³.µ�zu€..€· */
+        $"C3A4 BF09 C0C3 B57F 0000 A0CF CACA 8DC9"            /* ä¿ÆÀõ... ÏÊÊ�É */
+        $"04CA CAC6 C8CA 8EC9 07CA CACD 9900 009C"            /* .ÊÊÆÈÊŽÉ.ÊÊÍ™..œ */
+        $"CA8F C604 C5CB EDC5 C58F C606 C7C8 9400"            /* Ê�Æ.ÅËíÅÅ�Æ.ÇÈ”. */
+        $"0093 C790 C403 C3F6 E7BF 8FC4 07C5 C48B"            /* .“Ç�Ä.Ãöç¿�Ä.ÅÄ‹ */
+        $"0000 8AC2 C28F C104 BEDA FFCE BE8E C107"            /* ..ŠÂÂ�Á.¾ÚÿξŽÁ. */
+        $"C2BF 8600 0083 BEC0 8DBF 06C0 BEB8 C1FC"            /* ¿†..ƒ¾À�¿.À¾¸Áü */
+        $"F3BC 8EBF 07C0 BA81 0000 7EB9 BE8D BD07"            /* 󼎿.Àº�..~¹¾�½. */
+        $"BAC0 E9D6 E1FF D5B8 8DBD 07BF B57C 0000"            /* ºÀéÖáÿÕ¸�½.¿µ|.. */
+        $"7AB3 BC8C BA09 B9BB DFDB EBCB FDF7 BAB9"            /* z³¼ŒºÆ¹»ßÛëËý÷º¹ */
+        $"8CBA 07BC AE79 0000 77AE B98C B709 B3D7"            /* Œº.¼®y..w®¹Œ·Æ³× */
+        $"FFF8 D3B2 E8FF D7B1 8CB7 07B9 A876 0000"            /* ÿøÓ²èÿ×±Œ·.¹¨v.. */
+        $"74A9 B78A B50C B6B5 B2EC FFFF C6AF C6FF"            /* t©·Šµ.¶µ²ìÿÿƯÆÿ */
+        $"F9B8 B48B B507 B7A3 7400 0073 A3B6 8BB3"            /* ù¸´‹µ.·£t..s£¶‹³ */
+        $"0BAE DBDE DDDB B0B3 B1EA FFD7 AE8B B307"            /* .®ÛÞÝÛ°³±êÿ×®‹³. */
+        $"B59D 7300 0072 9CB3 8AB0 04AD C0FF FFEA"            /* µ�s..rœ³Š°.­Àÿÿê */
+        $"80B0 05AD C4FF F9B4 AF8A B007 B397 7200"            /* €°.­Äÿù´¯Š°.³—r. */
+        $"0071 97B1 85AE 00AC 80AA 0EAB AAEA FFFF"            /* .q—±…®.¬€ª.«ªêÿÿ */
+        $"CFA6 AAAA A9A7 E7FF D5A7 81AA 00AC 85AE"            /* Ϧªª©§çÿÕ§�ª.¬…® */
+        $"07B0 9171 7400 7191 AE84 AB13 AAB2 B9BB"            /* .°‘qt.q‘®„«.ª²¹» */
+        $"BAB2 C6FF FFEB B7B9 B8B7 BBB6 C5FC F7B5"            /* º²Æÿÿë·¹¸·»¶Åü÷µ */
+        $"80B9 01BA B285 AB07 AD8C 7174 0070 8BAB"            /* €¹.º²…«.­Œqt.p‹« */
+        $"84A8 19A4 C1EF FBF4 D2F0 FFFC D1F1 F4F8"            /* „¨.¤ÁïûôÒðÿüÑñôø */
+        $"F0FB F1E2 E5FF DFF2 F3F8 F8CB A484 A807"            /* ðûñâåÿßòóøøˤ„¨. */
+        $"A988 7200 7471 85A7 84A5 09A1 BDFF FFF0"            /* ©ˆr.tq…§„¥Æ¡½ÿÿð */
+        $"D9FF FFE0 E784 FF03 D6F5 CDD4 80FF 01D2"            /* Ùÿÿàç„ÿ.ÖõÍÔ€ÿ.Ò */
+        $"9F85 A506 8472 7474 7181 A484 A208 9EBD"            /* Ÿ…¥.„rttq�¤„¢.ž½ */
+        $"FFFF D2F6 FFF7 D785 FF08 F1BD D8CF F6FF"            /* ÿÿÒöÿ÷×…ÿ.ñ½ØÏöÿ */
+        $"FFD3 9C83 A208 A3A2 8172 7474 727E A084"            /* ÿÓœƒ¢.£¢�rttr~ „ */
+        $"9F09 9CB0 DDCF DFFF FFD2 CCDD 84DC 08DA"            /* ŸÆœ°ÝÏßÿÿÒÌÝ„Ü.Ú */
+        $"CBFF F4C6 DCDD BE9B 839F 08A0 9E7E 7274"            /* ËÿôÆÜݾ›ƒŸ. ž~rt */
+        $"7472 7C9D 849C 089D 9B93 B5FF FFF4 A397"            /* tr|�„œ.�›“µÿÿô£— */
+        $"8598 0897 9BDD E0B4 9398 9A9D 839C 089D"            /* …˜.—›Ýà´“˜š�ƒœ.� */
+        $"9A7B 7374 7473 7998 8699 0597 C8F7 FFC1"            /* š{sttsy˜†™.—È÷ÿÁ */
+        $"9387 9905 96A9 EEF9 A695 8599 089A 9679"            /* “‡™.–©îù¦•…™.š–y */
+        $"7374 7473 7795 8596 0693 A7E6 D1D0 9895"            /* sttsw•…–.“§æÑИ• */
+        $"8796 0695 9BF3 FFE7 9595 8496 0897 9377"            /* ‡–.•›óÿç••„–.—“w */
+        $"7374 7473 7693 8595 058F B0FF ED98 9289"            /* sttsv“…•.�°ÿ혒‰ */
+        $"9505 8ED4 FFFF C58E 8495 0996 9076 7374"            /* •.ŽÔÿÿÅŽ„•Æ–�vst */
+        $"7473 7490 9384 9204 8BC8 E299 8F8A 9206"            /* tst�“„’.‹Èâ™�Š’. */
+        $"8DAD FFFF F494 9183 9202 938C 7581 7402"            /* �­ÿÿô”‘ƒ’.“Œu�t. */
+        $"738D 9184 9003 8EA7 938D 8B90 068F 8EDD"            /* s�‘„�.Ž§“�‹�.�ŽÝ */
+        $"FFD7 8E8F 8390 0191 8A82 7402 728B 8F85"            /* ÿ׎�ƒ�.‘Š‚t.r‹�… */
+        $"8E01 8B8D 8D8E 048C 93A4 8E8D 848E 028F"            /* Ž.‹��Ž.Œ“¤Ž�„Ž.� */
+        $"8773 8174 0272 8B8F 988E 028C 8A8D 858E"            /* ‡s�t.r‹�˜Ž.ŒŠ�…Ž */
+        $"028F 8773 8174 0272 8489 A388 0289 8173"            /* .�‡s�t.r„‰£ˆ.‰�s */
+        $"8174 0173 73A5 7400 73B0 7400 00AB 7480"            /* �t.ss¥t.s°t..«t€ */
+        $"00A9 74DF 0068 386D 6B00 0009 0800 0000"            /* .©tß.h8mk..Æ.... */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 002E 4549 4A4A 4A4A 4A4A 4A4A 4A4A"            /* ....EIJJJJJJJJJJ */
+        $"3B0A 0400 0000 0000 0000 0000 0000 0000"            /* ;Â.............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 2FF9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ../ùÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FD52 0802 0000 0000 0000 0000 0000 0000"            /* ýR.............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 4DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Mÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FF7E 1306 0000 0000 0000 0000 0000 0000"            /* ÿ~.............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0002 ABFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..«ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFBB 2C11 0B0B 0B0B 0B0B 0B0B 0B0B 0B0B"            /* ÿ»,............. */
+        $"0B0B 0B0B 0B0B 0903 0000 0000 0000 0000"            /* ......Æ......... */
+        $"08B2 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .²ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF DFCC CCCC CCCC CCCC CCCC CCCC CCCC"            /* ÿÿßÌÌÌÌÌÌÌÌÌÌÌÌÌ */
+        $"CCCC CCCC CCCC CBC9 8000 0000 0000 0026"            /* ÌÌÌÌÌÌËÉ€......& */
+        $"71F2 EDEE EFEF EFEF EFEF EFEF EFEF EFEF"            /* qòíîïïïïïïïïïïïï */
+        $"EFEF F4F7 F7F7 F7F7 F7F7 F7F7 F7F7 F7F7"            /* ïïô÷÷÷÷÷÷÷÷÷÷÷÷÷ */
+        $"F7F7 F7F7 F7F7 F7F5 CE41 2000 0000 5EF7"            /* ÷÷÷÷÷÷÷õÎA ...^÷ */
+        $"FFF8 F8F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ÿøøùùùùùùùùùùùùù */
+        $"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+        $"F9F9 F9F9 F9F9 F9F8 FAFF EE41 0000 C4FF"            /* ùùùùùùùøúÿîA..Äÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFA1 0000 B6FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ¡..¶ÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FF91 0000 A2FF"            /* ÿÿÿÿÿÿÿÿÿÿÿ‘..¢ÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FF7A 0000 8FFF"            /* ÿÿÿÿÿÿÿÿÿÿÿz..�ÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FF68 0000 79FF"            /* ÿÿÿÿÿÿÿÿÿÿÿh..yÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FF57 0000 5EFF"            /* ÿÿÿÿÿÿÿÿÿÿÿW..^ÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FF48 0000 4BFF"            /* ÿÿÿÿÿÿÿÿÿÿÿH..Kÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FD3B 0000 3FFE"            /* ÿÿÿÿÿÿÿÿÿÿý;..?þ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF F62F 0000 33F8"            /* ÿÿÿÿÿÿÿÿÿÿö/..3ø */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF ED23 0000 27F2"            /* ÿÿÿÿÿÿÿÿÿÿí#..'ò */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF DE1A 0000 1FE9"            /* ÿÿÿÿÿÿÿÿÿÿÞ....é */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF CE10 0000 1ADF"            /* ÿÿÿÿÿÿÿÿÿÿÎ....ß */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF C10B 0100 14D5"            /* ÿÿÿÿÿÿÿÿÿÿÁ....Õ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF B509 0100 0FCD"            /* ÿÿÿÿÿÿÿÿÿÿµÆ...Í */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF AA07 0001 0BC2"            /* ÿÿÿÿÿÿÿÿÿÿª.... */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF A005 0101 09B3"            /* ÿÿÿÿÿÿÿÿÿÿ ...Ƴ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 9504 0101 08A6"            /* ÿÿÿÿÿÿÿÿÿÿ•....¦ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 8D04 0101 069A"            /* ÿÿÿÿÿÿÿÿÿÿ�....š */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 8505 0101 0691"            /* ÿÿÿÿÿÿÿÿÿÿ…....‘ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 7D05 0101 078B"            /* ÿÿÿÿÿÿÿÿÿÿ}....‹ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 7606 0101 0885"            /* ÿÿÿÿÿÿÿÿÿÿv....… */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 7106 0102 0881"            /* ÿÿÿÿÿÿÿÿÿÿq....� */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 6D07 0102 0A7E"            /* ÿÿÿÿÿÿÿÿÿÿm...Â~ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 6A08 0102 0B7B"            /* ÿÿÿÿÿÿÿÿÿÿj....{ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 6709 0102 0C7C"            /* ÿÿÿÿÿÿÿÿÿÿgÆ...| */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 670A 0102 0C75"            /* ÿÿÿÿÿÿÿÿÿÿgÂ...u */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF 600B 0102 113A"            /* ÿÿÿÿÿÿÿÿÿÿ`....: */
+        $"7B85 8585 8585 8585 8585 8585 8585 8585"            /* {……………………………………… */
+        $"8585 8585 8585 8585 8585 8585 8585 8585"            /* ………………………………………… */
+        $"8585 8585 8585 8585 8574 310F 0101 0B1E"            /* ………………………t1..... */
+        $"2B34 3535 3535 3535 3535 3535 3535 3535"            /* +455555555555555 */
+        $"3535 3535 3535 3535 3535 3535 3535 3535"            /* 5555555555555555 */
+        $"3535 3535 3535 3535 332A 1C0A 0100 040C"            /* 555555553*.Â.... */
+        $"1418 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+        $"1818 1818 1818 1818 1818 1818 1818 1818"            /* ................ */
+        $"1818 1818 1818 1818 1813 0B03 0000 0002"            /* ................ */
+        $"0304 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0402 0100 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0069 7433"            /* .............it3 */
+        $"3200 0025 F700 0000 00FF 00FF 00FF 00FF"            /* 2..%÷....ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00DF 009F 59D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.ŸY× */
+        $"00A6 59D3 0001 5959 8000 9D58 8459 D000"            /* .¦YÓ..YY€.�X„YÐ. */
+        $"0359 5900 569F 5901 5658 8359 D000 0257"            /* .YY.VŸY.VXƒYÐ..W */
+        $"6287 9D95 0494 917F 5E58 8359 CD00 0459"            /* b‡�•.”‘.^XƒYÍ..Y */
+        $"005C 9ABA 9EBC 03B9 AE85 5883 59CD 0004"            /* .\šºž¼.¹®…XƒYÍ.. */
+        $"5900 6EB3 BE9E BF04 BEB6 9D62 5782 59CD"            /* Y.n³¾ž¿.¾¶�bW‚YÍ */
+        $"0003 5900 74B6 A0BE 03B8 9F63 5782 59CC"            /* ..Y.t¶ ¾.¸ŸcW‚YÌ */
+        $"0004 5959 547A B8A0 BC03 B7A0 6357 8359"            /* ..YYTz¸ ¼.· cWƒY */
+        $"CB00 0459 5954 88B9 A0BB 03B7 A366 56B8"            /* Ë..YYTˆ¹ ».·£fV¸ */
+        $"5995 0005 5959 005B A0B9 A0BA 03B8 AA73"            /* Y•..YY.[ ¹ º.¸ªs */
+        $"55BA 5992 0006 5959 0053 7BB4 B9A0 BA04"            /* UºY’..YY.S{´¹ º. */
+        $"B9B2 905A 56BA 5990 0006 5959 0054 73AB"            /* ¹²�ZVºY�..YY.Ts« */
+        $"B8A2 B903 B5AB 865E B756 0300 5859 598E"            /* ¸¢¹.µ«†^·V..XYYŽ */
+        $"0007 5959 005A 83AD B6B7 A2B8 04B7 B4AD"            /* ..YY.Zƒ­¶·¢¸.·´­ */
+        $"9B87 B57D 047B 725D 0059 8D00 0759 5900"            /* ›‡µ}.{r].Y�..YY. */
+        $"5A8F B2B6 B6A4 B704 B6B5 B4B2 B1B4 B003"            /* Z�²¶¶¤·.¶µ´²±´°. */
+        $"ADA0 7600 8059 8900 8159 0355 77AC B0E2"            /* ­ v.€Y‰.�Y.Uw¬°â */
+        $"B103 AFA4 7D56 8259 8600 0159 5980 0003"            /* ±.¯¤}V‚Y†..YY€.. */
+        $"5279 9697 E298 0496 9073 5456 8000 0159"            /* Ry–—â˜.–�sTV€..Y */
+        $"5984 0008 5900 5457 6268 686D 7284 73A1"            /* Y„..Y.TWbhhmr„s¡ */
+        $"74B9 7309 706C 6868 6763 5900 5959 8200"            /* t¹sÆplhhgcY.YY‚. */
+        $"0759 0052 6E96 A4A7 A8E7 A980 A706 A6A0"            /* .Y.Rn–¤§¨ç©€§.¦  */
+        $"8E6A 5759 5982 0002 536F A782 B0E5 AF81"            /* ŽjWYY‚..So§‚°å¯� */
+        $"B006 AFAF AB99 6A00 5980 0004 5900 5A9B"            /* °.¯¯«™j.Y€..Y.Z› */
+        $"AEF0 AF0B AEA6 895B 0059 0000 5900 6CA7"            /* ®ð¯.®¦‰[.Y..Y.l§ */
+        $"B4AE 03AF ABAE AFB7 AE0A A996 6500 5900"            /* ´®.¯«®¯·®Â©–e.Y. */
+        $"0059 5470 A7B3 AD05 AEA8 A299 A8AE B6AD"            /* .YTp§³­.®¨¢™¨®¶­ */
+        $"0AA8 9666 0059 0059 5900 6CA3 B4AB 05A6"            /* ¨–f.Y.YY.l£´«.¦ */
+        $"EDE9 99A7 ACB5 AB0A A692 6200 5900 5959"            /* í陧¬µ«Â¦’b.Y.YY */
+        $"0063 9EB3 A905 A8A8 ECFF E195 B6A9 0BA3"            /* .cž³©.¨¨ìÿᕶ©.£ */
+        $"8D5F 5859 0059 5900 6099 A7B3 A806 A4DC"            /* �_XY.YY.`™§³¨.¤Ü */
+        $"FFFF CA96 AAB4 A80B A187 5B58 5900 5959"            /* ÿÿÊ–ª´¨.¡‡[XY.YY */
+        $"005C 94A6 B3A7 01A3 C580 FF02 AD9D A8B3"            /* .\”¦³§.£Å€ÿ.­�¨³ */
+        $"A70B 9F82 5A58 5900 5959 5857 8DA5 B3A6"            /* §.Ÿ‚ZXY.YYXW�¥³¦ */
+        $"07A4 AEF8 FFFF ED97 A4B2 A603 A59C 7C58"            /* .¤®øÿÿí—¤²¦.¥œ|X */
+        $"8359 0257 87A3 B4A4 01A1 E180 FF02 CB94"            /* ƒY.W‡£´¤.¡á€ÿ.Ë” */
+        $"A6B1 A403 A399 7657 8359 0254 80A1 B4A2"            /* ¦±¤.£™vWƒY.T€¡´¢ */
+        $"019D C180 FF03 FEA4 9BA3 B0A2 03A1 9672"            /* .�Á€ÿ.þ¤›£°¢.¡–r */
+        $"5783 5902 547A 9FB4 A202 A0A6 F380 FF02"            /* WƒY.TzŸ´¢. ¦ó€ÿ. */
+        $"E192 A3B0 A203 A094 6D56 8359 0255 759D"            /* á’£°¢. ”mVƒY.Uu� */
+        $"B5A0 019B D381 FF02 B495 A1AF A006 9D90"            /* µ .›Ó�ÿ.´•¡¯ .�� */
+        $"6957 5959 0080 5902 546D 9BB1 9E00 9F80"            /* iWYY.€Y.Tm›±ž.Ÿ€ */
+        $"A002 9CAF FD80 FF02 EF93 9DAF 9E06 9B8C"            /*  .œ¯ý€ÿ.ï“�¯ž.›Œ */
+        $"6657 5959 0080 5902 5568 97B0 9D07 9F95"            /* fWYY.€Y.Uh—°�.Ÿ• */
+        $"8A89 8B98 9CE2 81FF 02C3 8F9E AE9D 0699"            /* Š‰‹˜œâ�ÿ.Ã�ž®�.™ */
+        $"8861 5759 5900 8059 0256 6494 AF9C 089D"            /* ˆaWYY.€Y.Vd”¯œ.� */
+        $"8C9E D0DD C793 8CBC 81FF 02F7 9899 AE9C"            /* ŒžÐÝÇ“Œ¼�ÿ.÷˜™®œ */
+        $"0697 855F 5859 5900 8059 0257 5E91 AF9B"            /* .—…_XYY.€Y.W^‘¯› */
+        $"0195 B781 FF03 F69B 96ED 81FF 02CE 8B9C"            /* .•·�ÿ.ö›–í�ÿ.΋œ */
+        $"AD9B 0D95 815D 5859 5900 0059 5957 5B8C"            /* ­›.•�]XYY..YYW[Œ */
+        $"98AD 9903 9889 9AD8 81FF 02E0 89C4 81FF"            /* ˜­™.˜‰šØ�ÿ.à‰Ä�ÿ */
+        $"02FD 9E93 AD99 0D93 7C5A 5859 5900 0059"            /* .ýž“­™.“|ZXYY..Y */
+        $"5958 5987 96AC 970C 9889 D3CE 88A1 E8FF"            /* YXY‡–¬—.˜‰ÓΈ¡èÿ */
+        $"FFF9 9B9D F481 FF02 D788 98AC 9702 9079"            /* ÿù›�ô�ÿ.׈˜¬—.�y */
+        $"5A80 5901 0000 8059 0255 8395 AB96 0D97"            /* Z€Y...€Y.Uƒ•«–.— */
+        $"8DA4 FFFF F6B2 84B4 F6FB A28E CC82 FF02"            /* �¤ÿÿö²„´öû¢ŽÌ‚ÿ. */
+        $"A28F 97AB 9601 8E75 8159 0100 0080 5902"            /* ¢�—«–.Žu�Y...€Y. */
+        $"547F 94AB 9502 9688 E481 FF07 E99E 8CBC"            /* T.”«•.–ˆä�ÿ.鞌¼ */
+        $"9991 A2F8 81FF 02DD 8896 AA95 0394 8D71"            /* ™‘¢ø�ÿ.݈–ª•.”�q */
+        $"5880 5901 0000 8059 0255 7993 AA94 0295"            /* X€Y...€Y.Uy“ª”.• */
+        $"87B4 84FF 05D4 8C93 948F D182 FF02 A68C"            /* ‡´„ÿ.ÔŒ“”�Ñ‚ÿ.¦Œ */
+        $"95A9 9403 938A 6D57 8059 0700 0059 595A"            /* •©”.“ŠmW€Y...YYZ */
+        $"5374 91AA 9302 908C F284 FF06 DD92 9293"            /* St‘ª“.�Œò„ÿ.Ý’’“ */
+        $"8FA4 FB81 FF01 E086 AA93 0391 876A 5780"            /* �¤û�ÿ.à†ª“.‘‡jW€ */
+        $"5907 0000 5959 5A53 6F8F A991 0292 87CA"            /* Y...YYZSo�©‘.’‡Ê */
+        $"84FF 02F8 A18D 8091 018D D782 FF02 A788"            /* „ÿ.ø¡�€‘.�ׂÿ.§ˆ */
+        $"92A8 9103 8F84 6757 8059 0100 0080 5902"            /* ’¨‘.�„gW€Y...€Y. */
+        $"556B 8DA9 9002 8E85 DB84 FF01 C78A 8190"            /* Uk�©�.Ž…Û„ÿ.ÇŠ�� */
+        $"028B A8FE 81FF 01E2 84A9 9003 8E82 6357"            /* .‹¨þ�ÿ.â„©�.Ž‚cW */
+        $"8059 0100 0080 5902 5466 8CA8 9005 9186"            /* €Y...€Y.TfŒ¨�.‘† */
+        $"AB85 A6EE 81FF 02EE 958E 8190 028F 8CDC"            /* «…¦î�ÿ.î•Ž��.�ŒÜ */
+        $"82FF 02AA 8591 A790 038D 7F62 5880 5901"            /* ‚ÿ.ª…‘§�.�.bX€Y. */
+        $"0000 8059 0254 618A A78E 0C8F 84A5 FFF0"            /* ..€Y.TaŠ§Ž.�„¥ÿð */
+        $"A480 BBF9 FFFF B688 838E 0189 A982 FF01"            /* ¤€»ùÿÿ¶ˆƒŽ.‰©‚ÿ. */
+        $"E583 A88E 038B 7C5F 5880 5901 0000 8059"            /* 僨Ž.‹|_X€Y...€Y */
+        $"0256 5F87 A78D 028C 83E8 80FF 06DF 9087"            /* .V_‡§�.Œƒè€ÿ.ß�‡ */
+        $"D4E0 8C8C 838D 028C 8ADE 82FF 02AB 838E"            /* ÔàŒŒƒ�.ŒŠÞ‚ÿ.«ƒŽ */
+        $"A68D 038A 7A5D 5880 5901 0000 8059 0257"            /* ¦�.Šz]X€Y...€Y.W */
+        $"5C84 A68C 028D 7EB7 83FF 03C9 8B8E 8B85"            /* \„¦Œ.�~·ƒÿ.É‹Ž‹… */
+        $"8C01 87AA 82FF 01E6 82A7 8C03 8877 5C58"            /* Œ.‡ª‚ÿ.悧Œ.ˆw\X */
+        $"8059 0100 0080 5902 5757 81A6 8A02 878A"            /* €Y...€Y.WW�¦Š.‡Š */
+        $"F584 FF01 CB83 868A 0289 88E0 82FF 02A8"            /* õ„ÿ.˃†Š.‰ˆà‚ÿ.¨ */
+        $"808B A58A 0386 735B 5880 5901 0000 8059"            /* €‹¥Š.†s[X€Y...€Y */
+        $"0258 557F A58A 028B 7BC9 84FF 02F6 9987"            /* .XU.¥Š.‹{É„ÿ.ö™‡ */
+        $"878A 0184 AB82 FF01 E580 A68A 0285 715A"            /* ‡Š.„«‚ÿ.倦Š.…qZ */
+        $"8159 0100 0081 5902 577B 88A3 8902 8A81"            /* �Y...�Y.W{ˆ£‰.Š� */
+        $"9685 FF01 BF82 8889 0288 87E0 82FF 02A7"            /* –…ÿ.¿‚ˆ‰.ˆ‡à‚ÿ.§ */
+        $"7F8A A489 0183 6F82 5901 0000 8159 0254"            /* .Š¤‰.ƒo‚Y...�Y.T */
+        $"7787 A488 017A DC84 FF02 EA8C 8689 8801"            /* w‡¤ˆ.zÜ„ÿ.ꌆ‰ˆ. */
+        $"82A9 82FF 01E3 7EA4 8802 8781 6C82 5901"            /* ‚©‚ÿ.ã~¤ˆ.‡�l‚Y. */
+        $"0000 8159 0151 7497 860E 8784 8686 8486"            /* ..�Y.Qt—†.‡„††„† */
+        $"8684 8685 8486 877B A685 FF11 AD7D 8685"            /* †„†…„†‡{¦…ÿ.­}†… */
+        $"8486 8584 8784 8487 8485 8783 83DF 82FF"            /* „†…„‡„„‡„…‡ƒƒß‚ÿ */
+        $"0FA4 7D87 8584 8785 8487 8485 8784 8586"            /* .¤}‡…„‡…„‡„…‡„…† */
+        $"8596 8602 7F69 5881 5901 0000 8059 035A"            /* …–†..iX�Y...€Y.Z */
+        $"5170 8496 850E 8182 7F7F 827F 8082 7E81"            /* Qp„–….�‚..‚.€‚~� */
+        $"8280 837E EC84 FF12 DB7E 817F 8082 7E81"            /* ‚€ƒ~ì„ÿ.Û~�.€‚~� */
+        $"827E 8182 7E82 817E 827B A682 FF10 E07B"            /* ‚~�‚~‚�~‚{¦‚ÿ.à{ */
+        $"8380 827E 8181 7E82 817E 8280 7F81 8494"            /* ƒ€‚~��~‚�~‚€.�„” */
+        $"8503 847D 6758 8159 0100 0080 5903 5A53"            /* ….„}gX�Y...€Y.ZS */
+        $"6E84 9585 0E82 90FB BCAC FFA4 B9FF 9BD3"            /* n„•….‚�û¼¬ÿ¤¹ÿ›Ó */
+        $"FC97 7BB9 84FF 14FC 91AA FFA8 BFFF 92D1"            /* ü—{¹„ÿ.ü‘ªÿ¨¿ÿ’Ñ */
+        $"FB92 E5ED 87F4 DC95 FFCB 73DF 82FF 0FA0"            /* û’åí‡ôÜ•ÿËsß‚ÿ.  */
+        $"79DC F889 E5ED 90F6 D88F FFC7 AAC2 7D94"            /* yÜø‰åí�öØ�ÿǪÂ}” */
+        $"8503 847C 6558 8159 0100 0080 5903 5A52"            /* ….„|eX�Y...€Y.ZR */
+        $"6983 9584 0E81 92FF BCAA FFC4 D2FF 96D4"            /* iƒ•„.�’ÿ¼ªÿÄÒÿ–Ô */
+        $"FF9A 82F8 84FF 14C6 78CE FFA6 BFFF B6E4"            /* ÿš‚ø„ÿ.ÆxÎÿ¦¿ÿ¶ä */
+        $"FF8D E8F9 AFFE DE91 FFE3 899E 82FF 0FDB"            /* ÿ�èù¯þÞ‘ÿ㉞‚ÿ.Û */
+        $"74E2 FFB1 F3F0 8AFA E9B4 FFC8 A6C7 7C94"            /* tâÿ±óðŠúé´ÿȦÇ|” */
+        $"8403 8379 6258 8159 0100 0080 5903 5A51"            /* „.ƒybX�Y...€Y.ZQ */
+        $"6581 9582 047F 90FF D5C8 81FF 04BB E5F9"            /* e�•‚..�ÿÕÈ�ÿ.»åù */
+        $"86CA 84FF 06F2 82D6 FFFF C6D6 80FF 02FC"            /* †Ê„ÿ.ò‚ÖÿÿÆÖ€ÿ.ü */
+        $"B5EF 80FF 06E9 B8FF FFFA 8AD6 82FF 0196"            /* µï€ÿ.é¸ÿÿúŠÖ‚ÿ.– */
+        $"C680 FF02 F4B4 FA80 FF03 DCC9 C57A 9482"            /* Æ€ÿ.ô´ú€ÿ.ÜÉÅz”‚ */
+        $"0381 7761 5881 5901 0000 8059 035A 5262"            /* .�waX�Y...€Y.ZRb */
+        $"7F95 8102 7E8F FA85 FF01 B190 85FF 01AC"            /* .•�.~�ú…ÿ.±�…ÿ.¬ */
+        $"9A90 FF01 C494 82FF 02D5 8DF9 87FF 01BF"            /* š�ÿ.Ä”‚ÿ.Õ�ù‡ÿ.¿ */
+        $"7994 8103 8075 5F58 8159 0100 0081 5902"            /* y”�.€u_X�Y...�Y. */
+        $"5461 7D95 8002 7D8E FA84 FF02 E779 DD84"            /* Ta}•€.}Žú„ÿ.çyÝ„ */
+        $"FF02 E47C E690 FF02 FC8A D281 FF02 FC8C"            /* ÿ.ä|æ�ÿ.üŠÒ�ÿ.üŒ */
+        $"C787 FF01 BF77 9480 037E 725E 5881 5901"            /* LJÿ.¿w”€.~r^X�Y. */
+        $"0000 8159 0254 5D7C 957F 027C 8EFA 84FF"            /* ..�Y.T]|•..|Žú„ÿ */
+        $"019C A285 FF01 97AD 92FF 01C7 8F80 FF04"            /* .œ¢…ÿ.—­’ÿ.Ç�€ÿ. */
+        $"FBC0 748B F986 FF01 BE76 947F 037D 715C"            /* ûÀt‹ù†ÿ.¾v”..}q\ */
+        $"5881 5901 0000 8159 0254 597B 957F 027C"            /* X�Y...�Y.TY{•..| */
+        $"8EFA 83FF 02D7 7BEF 84FF 02D1 7EF4 92FF"            /* Žúƒÿ.×{ï„ÿ.Ñ~ô’ÿ */
+        $"09FE 8CC9 F8CB 8C64 9F83 C386 FF01 BE76"            /* ÆþŒÉøËŒdŸƒÃ†ÿ.¾v */
+        $"947F 037C 6F5B 5881 5901 0000 8159 0355"            /* ”..|o[X�Y...�Y.U */
+        $"5779 7E94 7D02 7A8C FA82 FF02 FD8A B884"            /* Wy~”}.zŒú‚ÿ.ýŠ¸„ */
+        $"FF02 FA86 C094 FF09 CF74 7C64 7FCB FFC0"            /* ÿ.ú†À”ÿÆÏt|d.ËÿÀ */
+        $"80F7 85FF 01BD 7494 7D02 7A6D 5B82 5901"            /* €÷…ÿ.½t”}.zm[‚Y. */
+        $"0000 8159 0256 5677 957C 0279 8BFA 82FF"            /* ..�Y.VVw•|.y‹ú‚ÿ */
+        $"02C3 82FB 84FF 02BB 86FE 95FF 088C 99D5"            /* .Âû„ÿ.»†þ•ÿ.Œ™Õ */
+        $"FCFF FFFA 7FBC 85FF 01BD 7394 7C02 796B"            /* üÿÿú.¼…ÿ.½s”|.yk */
+        $"5A82 5901 0000 8159 0257 5575 957B 0277"            /* Z‚Y...�Y.WUu•{.w */
+        $"8BFA 81FF 02F4 7DCE 84FF 02EE 7BD6 96FF"            /* ‹ú�ÿ.ô}΄ÿ.î{Ö–ÿ */
+        $"01D0 A782 FF02 C47B F484 FF01 BC72 947B"            /* .Ч‚ÿ.Ä{ô„ÿ.¼r”{ */
+        $"0178 6983 5901 0000 8159 0258 5272 957A"            /* .xiƒY...�Y.XRr•z */
+        $"0877 8AE8 EEEC ECF2 AA91 85FF 02A8 92F2"            /* .wŠèîììòª‘…ÿ.¨’ò */
+        $"95EC 03ED ED93 DC81 FF03 FD83 B2F2 82EC"            /* •ì.íí“Ü�ÿ.ýƒ²ò‚ì */
+        $"02F3 B573 947A 0176 6783 5901 0000 8159"            /* .óµs”z.vgƒY...�Y */
+        $"0258 5070 9679 007A 817F 027E 71E3 84FF"            /* .XPp–y.z�..~qã„ÿ */
+        $"03DF 797F 8096 7F02 8078 A382 FF02 C970"            /* .ßy.€–..€x£‚ÿ.Ép */
+        $"8083 7F00 7D95 7902 7565 5882 5901 0000"            /* €ƒ..}•y.ueX‚Y... */
+        $"8159 0258 4F6F 9779 8077 0278 69AB 85FF"            /* �Y.XOo—y€w.xi«…ÿ */
+        $"029B 7378 9977 0178 DF81 FF02 B468 7583"            /* .›sx™w.xß�ÿ.´huƒ */
+        $"7700 7895 7902 7464 5882 5901 0000 8259"            /* w.x•y.tdX‚Y...‚Y */
+        $"0150 6D9A 7802 747A F384 FF02 CD72 779A"            /* .Pmšx.tzó„ÿ.Írwš */
+        $"7808 71A0 FFFF D98C 8FC6 6D9C 7801 7363"            /* x.q ÿÿÙŒ�Æmœx.sc */
+        $"8359 0100 0082 5901 516B 9A77 016B C484"            /* ƒY...‚Y.Qkšw.kÄ„ */
+        $"FF02 F68A 729B 770A 7677 9B8A 80BD FDFF"            /* ÿ.öŠr›wÂvw›Š€½ýÿ */
+        $"9C6A 789A 7702 7261 5882 5901 0000 8159"            /* œjxšw.raX‚Y...�Y */
+        $"035A 4F68 7598 7602 737B F184 FF01 B96E"            /* .ZOhu˜v.s{ñ„ÿ.¹n */
+        $"9D76 0371 85D7 FB80 FF02 F076 719A 7602"            /* �v.q…×û€ÿ.ðvqšv. */
+        $"7060 5882 5901 0000 8159 035A 4E66 7498"            /* p`X‚Y...�Y.ZNft˜ */
+        $"7504 7380 77C3 FE81 FF02 E97B 729D 7502"            /* u.s€wÃþ�ÿ.é{r�u. */
+        $"727F EF82 FF01 CD66 9A75 026F 5E58 8259"            /* r.ï‚ÿ.Ífšu.o^X‚Y */
+        $"0100 0081 5903 5A4D 6473 9774 0672 76EE"            /* ...�Y.ZMds—t.rvî */
+        $"CC73 83DA 80FF 01A4 6C9F 7401 6CBE 83FF"            /* ÌsƒÚ€ÿ.¤lŸt.l¾ƒÿ */
+        $"02A5 6575 9874 026D 5C58 8259 0100 0081"            /* .¥eu˜t.m\X‚Y...� */
+        $"5902 5A4D 6298 730B 6F82 FAFF F9AD 6A97"            /* Y.ZMb˜s.o‚úÿù­j— */
+        $"F1DC 7172 9F73 016D 9283 FF03 F981 6B74"            /* ñÜqrŸs.m’ƒÿ.ù�kt */
+        $"9773 026C 5B58 8259 0100 0081 5902 5A4D"            /* —s.l[X‚Y...�Y.ZM */
+        $"6098 7301 6C94 81FF 04EC 957B 8470 A073"            /* `˜s.l”�ÿ.ì•{„p s */
+        $"0271 75E7 83FF 02DD 6972 9773 026B 5C58"            /* .quçƒÿ.Ýir—s.k\X */
+        $"8259 0100 0081 5902 5A50 5F98 7201 69A8"            /* ‚Y...�Y.ZP_˜r.i¨ */
+        $"83FF 019B 69A2 7201 6ABF 84FF 02AF 6473"            /* ƒÿ.›i¢r.j¿„ÿ.¯ds */
+        $"9672 026A 5B58 8259 0100 0081 5903 5A51"            /* –r.j[X‚Y...�Y.ZQ */
+        $"5D70 9771 0167 BD81 FF02 F6A1 6FA3 7101"            /* ]p—q.g½�ÿ.ö¡o£q. */
+        $"6B94 84FF 02F7 7B6D 9671 0169 5A83 5901"            /* k”„ÿ.÷{m–q.iZƒY. */
+        $"0000 8159 035A 505B 6F97 7101 69D5 80FF"            /* ..�Y.ZP[o—q.iÕ€ÿ */
+        $"03E8 8B68 70A3 7102 6F74 E984 FF02 BC65"            /* .è‹hp£q.oté„ÿ.¼e */
+        $"7294 7102 7067 5883 5901 0000 8159 035A"            /* r”q.pgXƒY...�Y.Z */
+        $"5059 6F96 7007 6F6F E7FF FFD4 7A69 A670"            /* PYo–p.ooçÿÿÔzi¦p */
+        $"0168 BD84 FF02 EC71 6E94 7002 6F67 5883"            /* .h½„ÿ.ìqn”p.ogXƒ */
+        $"5901 0000 8159 035A 5058 6E96 6F06 6C79"            /* Y...�Y.ZPXn–o.ly */
+        $"F7FF BD6E 6BA7 6F02 6A8B FD83 FF02 FC83"            /* ÷ÿ½nk§o.j‹ýƒÿ.üƒ */
+        $"6B94 6F02 6E66 5783 5901 0000 8159 035A"            /* k”o.nfWƒY...�Y.Z */
+        $"5056 6D96 6E05 688E FBA5 676C A86E 026D"            /* PVm–n.hŽû¥gl¨n.m */
+        $"6AD0 83FF 02F5 7D6B 946E 026D 6456 8359"            /* jЃÿ.õ}k”n.mdVƒY */
+        $"0100 0081 5903 5A4F 556C 966D 0468 9294"            /* ...�Y.ZOUl–m.h’” */
+        $"656C AA6D 0268 87F8 82FF 01BC 6995 6D02"            /* elªm.h‡ø‚ÿ.¼i•m. */
+        $"6C63 5683 5901 0000 8159 035A 5054 6C97"            /* lcVƒY...�Y.ZPTl— */
+        $"6D01 6C68 AD6D 0866 9EF7 FFFF F3B1 6C6B"            /* m.lh­m.fž÷ÿÿó±lk */
+        $"956D 026C 6256 8359 0100 0081 5903 5A50"            /* •m.lbVƒY...�Y.ZP */
+        $"546C CA6D 0667 81A6 9D7A 666C 966D 026C"            /* TlÊm.g�¦�zfl–m.l */
+        $"6256 8359 0100 0081 5903 5A51 536C CB6D"            /* bVƒY...�Y.ZQSlËm */
+        $"0369 6565 6998 6D02 6C62 5783 5901 0000"            /* .ieei˜m.lbWƒY... */
+        $"8159 035A 5152 6AEA 6C02 6B61 5783 5901"            /* �Y.ZQRjêl.kaWƒY. */
+        $"0000 8159 035A 5252 6AEA 6C02 6B61 5783"            /* ..�Y.ZRRjêl.kaWƒ */
+        $"5901 0000 8159 035A 5252 6AEA 6C02 6B61"            /* Y...�Y.ZRRjêl.ka */
+        $"5783 5901 0000 8159 035A 5352 6AEA 6C02"            /* WƒY...�Y.ZSRjêl. */
+        $"6B61 5783 5900 0082 5903 5A54 5168 EA6B"            /* kaWƒY..‚Y.ZTQhêk */
+        $"0269 5E56 8359 0000 8359 0257 4D5E EA63"            /* .i^VƒY..ƒY.WM^êc */
+        $"0260 5756 8359 0100 0082 5902 5A55 53EA"            /* .`WVƒY...‚Y.ZUSê */
+        $"5601 5556 8459 0100 00FB 5901 0000 FB59"            /* V.UV„Y...ûY...ûY */
+        $"0100 00FB 5901 0000 FB59 0100 00FA 5981"            /* ...ûY...ûY...úY� */
+        $"00F9 5982 00F7 5983 00F6 5986 00F3 59FF"            /* .ùY‚.÷Yƒ.öY†.óYÿ */
+        $"00FF 0000 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ...ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00DF 009F 7CD7 00A6 7CD3"            /* .ÿ.ÿ.ÿ.ß.Ÿ|×.¦|Ó */
+        $"0001 7C7C 8000 9D7B 847C D000 037C 7C00"            /* ..||€.�{„|Ð..||. */
+        $"7C9F 7F01 7B7B 837C D000 027B 88A5 9EB0"            /* |Ÿ..{{ƒ|Ð..{ˆ¥ž° */
+        $"03AC 9D81 7B83 7CCD 0004 7C00 81B3 D09E"            /* .¬��{ƒ|Í..|.�³Ðž */
+        $"D302 D0C3 A184 7CCD 0004 7C00 8FCA D79F"            /* Ó.Ðá„|Í..|.�Êן */
+        $"D803 CEB4 837A 827C CD00 037C 0095 CEA0"            /* Ø.δƒz‚|Í..|.•Î  */
+        $"D803 D1B7 847A 827C CC00 047C 7C78 9BD0"            /* Ø.Ñ·„z‚|Ì..||x›Ð */
+        $"A0D7 03D1 B884 7A83 7CCB 0004 7C7C 79A8"            /*  ×.Ѹ„zƒ|Ë..||y¨ */
+        $"D3A0 D703 D2BC 867A B87C 9500 057C 7C00"            /* Ó ×.Ò¼†z¸|•..||. */
+        $"81BD D5A0 D603 D3C3 9278 BA7C 9200 067C"            /* �½Õ Ö.ÓÃ’xº|’..| */
+        $"7C00 799D CED5 A0D6 04D4 CBAC 7D79 BA7C"            /* |.y�ÎÕ Ö.Ôˬ}yº| */
+        $"9000 067C 7C00 7B97 C5D3 A2D5 03D1 C4A3"            /* �..||.{—ÅÓ¢Õ.ÑÄ£ */
+        $"8280 7AB4 7B03 007B 7C7C 8E00 077C 7C00"            /* ‚€z´{..{||Ž..||. */
+        $"81A4 C8D2 D4A2 D505 D4D0 C8B7 A69F B19E"            /* �¤ÈÒÔ¢Õ.ÔÐÈ·¦Ÿ±ž */
+        $"079F 9F9E 9D94 8100 7C8D 0007 7C7C 0081"            /* .ŸŸž�”�.|�..||.� */
+        $"ADCD D3D3 A4D4 03D3 D2D0 CE80 CCB2 CB03"            /* ­ÍÓÓ¤Ô.ÓÒÐ΀̲Ë. */
+        $"C7B9 9500 807C 8900 817C 037A 98C6 CDE2"            /* ǹ•.€|‰.�|.z˜ÆÍâ */
+        $"CE03 CCBE 9B7A 827C 8600 017C 7C80 0002"            /* Î.̾›z‚|†..||€.. */
+        $"7697 B181 B403 B5B5 B4B4 9EB5 01B4 B4B6"            /* v—±�´.µµ´´žµ.´´¶ */
+        $"B506 B4B4 B3AA 9177 7980 0001 7C7C 8400"            /* µ.´´³ª‘wy€..||„. */
+        $"097C 0078 7D87 8B8B 8D94 95E2 960A 9592"            /* Æ|.x}‡‹‹�”•â–•’ */
+        $"8E8C 8B8B 867D 007C 7C82 0009 7C00 7892"            /* ŽŒ‹‹†}.||‚.Æ|.x’ */
+        $"B5C1 C4C5 C6C6 81C7 03C6 C6C7 C79E C601"            /* µÁÄÅÆÆ�Ç.ÆÆÇÇžÆ. */
+        $"C7C7 82C6 01C7 C7AC C683 C70A C6C6 C4C3"            /* ÇÇ‚Æ.ÇǬƃÇÂÆÆÄà */
+        $"C3BD AB8C 7A7C 7C82 0005 7893 C5CE CFD0"            /* ý«Œz||‚..x“ÅÎÏÐ */
+        $"E9CF 08D0 D0CF CEC9 B58B 007C 8000 047C"            /* éÏ.ÐÐÏÎɵ‹.|€..| */
+        $"0080 B9CE F0D0 0CCF C5A7 7E00 7C00 007C"            /* .€¹ÎðÐ.Ïŧ~.|..| */
+        $"008F C5CE B3CF 03D0 CDCF D0B7 CF0A C9B2"            /* .�ÅγÏ.ÐÍÏзÏÂɲ */
+        $"8600 7C00 007C 7894 C6B3 CF05 D0CB BEBA"            /* †.|..|x”ƳÏ.Ð˾º */
+        $"CCD0 B6CF 0ACA B487 007C 007C 7C00 8FC4"            /* ÌжÏÂÊ´‡.|.||.�Ä */
+        $"B4CE 05C9 F2ED B9CC CFB5 CE0B C8B1 8400"            /* ´Î.Éòí¹ÌϵÎ.ȱ„. */
+        $"7C00 7C7C 0089 C0CC B3CD 05CC F3FF E7B9"            /* |.||.‰À̳Í.Ìóÿç¹ */
+        $"CEB5 CD0B C5AC 817B 7C00 7C7C 0085 BCCB"            /* εÍ.Ŭ�{|.||.…¼Ë */
+        $"B3CC 06C9 EAFF FFD8 BDCE B4CC 0BC4 A77D"            /* ³Ì.ÉêÿÿؽδÌ.ħ} */
+        $"7B7C 007C 7C00 81B6 CAB3 CC01 C9DC 80FF"            /* {|.||.�¶Ê³Ì.ÉÜ€ÿ */
+        $"02C6 C4CD B2CC 0DCB C1A3 7D7B 7C00 7C7C"            /* .ÆÄͲÌ.ËÁ£}{|.|| */
+        $"7B7D B1C9 CBB2 CA07 C9CF FBFF FFF1 BACB"            /* {}±É˲Ê.ÉÏûÿÿñºË */
+        $"B2CA 03C9 BE9D 7B83 7C02 7BAB C8B4 CA01"            /* ²Ê.ɾ�{ƒ|.{«È´Ê. */
+        $"C8ED 80FF 02D9 BCCB B1CA 03C9 BC98 7A83"            /* Èí€ÿ.ټ˱Ê.ɼ˜zƒ */
+        $"7C02 7AA5 C6B4 C901 C6DA 80FF 03FD C1C4"            /* |.z¥Æ´É.ÆÚ€ÿ.ýÁÄ */
+        $"CAB0 C903 C7B9 957A 837C 0279 9FC4 B4C8"            /* Ê°É.ǹ•zƒ|.yŸÄ´È */
+        $"02C7 CAF7 80FF 02E8 B8C9 B0C8 03C5 B68F"            /* .ÇÊ÷€ÿ.è¸É°È.Ŷ� */
+        $"7A83 7C02 799A C2B5 C701 C4E4 81FF 02CA"            /* zƒ|.yšÂµÇ.Ää�ÿ.Ê */
+        $"BFC8 AFC7 06C4 B38B 7A7C 7C00 807C 0278"            /* ¿È¯Ç.ij‹z||.€|.x */
+        $"93C0 B1C6 00C7 80C8 02C4 CFFD 80FF 01F2"            /* “À±Æ.Ç€È.ÄÏý€ÿ.ò */
+        $"B8B0 C606 C2AF 897A 7C7C 0080 7C02 798F"            /* ¸°Æ.¯‰z||.€|.y� */
+        $"BEB0 C607 C8C0 B4B2 B6C3 C6ED 81FF 02D4"            /* ¾°Æ.ÈÀ´²¶ÃÆí�ÿ.Ô */
+        $"BBC7 AEC6 06C1 AC84 7A7C 7C00 807C 0279"            /* »Ç®Æ.Á¬„z||.€|.y */
+        $"8BBB AFC5 08C6 B6BA DCE5 D5B3 BAD8 81FF"            /* ‹»¯Å.ƶºÜåÕ³ºØ�ÿ */
+        $"02F9 BBC4 AEC5 06C0 A982 7B7C 7C00 807C"            /* .ù»Ä®Å.À©‚{||.€| */
+        $"027A 85B7 AEC4 02C5 C1CE 81FF 03F7 BAC1"            /* .z…·®Ä.ÅÁÎ�ÿ.÷ºÁ */
+        $"F481 FF02 DCB7 C6AD C40D BDA5 817B 7C7C"            /* ô�ÿ.Ü·Æ­Ä.½¥�{|| */
+        $"0000 7C7C 7A83 B4C3 ADC4 03C3 B3BE E981"            /* ..||zƒ´Ã­Ä.ó¾é� */
+        $"FF02 E8B6 DC81 FF02 FDBE C0AD C40D BCA1"            /* ÿ.è¶Ü�ÿ.ý¾À­Ä.¼¡ */
+        $"7E7B 7C7C 0000 7C7C 7B80 B0C2 ACC3 0CC4"            /* ~{||..||{€°Â¬Ã.Ä */
+        $"B5DD DAAE C4F2 FFFF FAC2 C5F8 81FF 02E2"            /* µÝÚ®ÄòÿÿúÂÅø�ÿ.â */
+        $"B5C4 ACC3 01B9 9D81 7C07 0000 7C7C 7B7C"            /* µÄ¬Ã.¹��|...||{| */
+        $"ABC0 ABC1 0DC2 BCC1 FFFF F7C7 ACD0 FBFC"            /* «À«Á.¼Áÿÿ÷ǬÐûü */
+        $"C7BC E082 FF02 C0BD C2AB C101 B79A 817C"            /* Ǽà‚ÿ.À½Â«Á.·š�| */
+        $"0100 0080 7C02 7BA7 BFAB C102 C2B2 EB81"            /* ...€|.{§¿«Á.²ë� */
+        $"FF07 EDB9 B3D7 C3BF C7FA 81FF 02E6 B3C2"            /* ÿ.í¹³×ÿÇú�ÿ.æ³Â */
+        $"AAC1 03C0 B595 7B80 7C01 0000 807C 027A"            /* ªÁ.Àµ•{€|...€|.z */
+        $"A3BE AAC0 02C1 B6CA 84FF 05DE B8C0 C0BD"            /* £¾ªÀ.Á¶Ê„ÿ.Þ¸ÀÀ½ */
+        $"E382 FF02 C2BA C1A9 C003 BFB2 927A 807C"            /* ã‚ÿ.ºÁ©À.¿²’z€| */
+        $"0100 0080 7C02 789D BCAA BF02 BEB3 F584"            /* ...€|.x�¼ª¿.¾³õ„ */
+        $"FF06 EBBF BEBF BDC9 FC81 FF02 E8B2 C0A9"            /* ÿ.뿾¿½Éü�ÿ.è²À© */
+        $"BF03 BEB0 8F7A 807C 0100 0080 7C02 7898"            /* ¿.¾°�z€|...€|.x˜ */
+        $"BAA9 BE02 BFB5 D984 FF02 FBC7 BC80 BE01"            /* º©¾.¿µÙ„ÿ.ûǼ€¾. */
+        $"BBE7 82FF 02C3 B7BF A8BE 03BC AD8B 7A80"            /* »ç‚ÿ.÷¿¨¾.¼­‹z€ */
+        $"7C01 0000 807C 0278 95B9 A9BD 02BC B3E9"            /* |...€|.x•¹©½.¼³é */
+        $"84FF 01DD B981 BD02 BACB FE81 FF02 EAB0"            /* „ÿ.ݹ�½.ºËþ�ÿ.ê° */
+        $"BEA8 BD03 BAAA 887A 807C 0100 0080 7C02"            /* ¾¨½.ºªˆz€|...€|. */
+        $"7890 B8A8 BD05 BEB2 C1AC C7F6 81FF 02F4"            /* x�¸¨½.¾²Á¬Çö�ÿ.ô */
+        $"C0BC 82BD 01BB EA82 FF02 C4B6 BEA7 BD03"            /* À¼‚½.»ê‚ÿ.Ķ¾§½. */
+        $"BAA8 867A 807C 0100 0080 7C02 788B B5A7"            /* º¨†z€|...€|.x‹µ§ */
+        $"BC0C BDB5 C1FF F2BD AAD5 FCFF FFD3 B983"            /* ¼.½µÁÿò½ªÕüÿÿÓ¹ƒ */
+        $"BC01 B9CC 82FF 02EB AFBD A7BC 03B8 A584"            /* ¼.¹Ì‚ÿ.믽§¼.¸¥„ */
+        $"7B80 7C01 0000 807C 0279 88B3 A8BC 01AE"            /* {€|...€|.yˆ³¨¼.® */
+        $"ED80 FF06 E5B1 B1E6 ECBB BB84 BC01 B9EB"            /* í€ÿ.å±±æì»»„¼.¹ë */
+        $"82FF 02C5 B4BD A6BC 03B7 A381 7B80 7C01"            /* ‚ÿ.Å´½¦¼.·£�{€|. */
+        $"0000 807C 027A 85B1 A6BB 02BC AFCC 82FF"            /* ..€|.z…±¦».¼¯Ì‚ÿ */
+        $"04FE D6AF BBBA 85BB 01B7 CC82 FF02 ECAE"            /* .þÖ¯»º…».·Ì‚ÿ.ì® */
+        $"BCA6 BB03 B5A0 807B 807C 0100 0080 7C03"            /* ¼¦».µ €{€|...€|. */
+        $"7A80 ADB9 A5BA 02B8 B0F7 84FF 01DE B486"            /* z€­¹¥º.¸°÷„ÿ.Þ´† */
+        $"BA02 B9B8 EB82 FF02 C3B2 BBA5 BA03 B39C"            /* º.¹¸ë‚ÿ.ò»¥º.³œ */
+        $"7F7B 807C 0100 0080 7C03 7B7E AAB7 A4B8"            /* .{€|...€|.{~ª·¤¸ */
+        $"02BA ABD8 84FF 02F9 C1B6 87B8 01B5 CC82"            /* .º«Ø„ÿ.ùÁ¶‡¸.µÌ‚ */
+        $"FF02 EBAC B9A5 B803 B199 7D7B 807C 0100"            /* ÿ.묹¥¸.±™}{€|.. */
+        $"0080 7C03 7B7D A7B6 A4B7 02B2 B7FE 84FF"            /* .€|.{}§¶¤·.²·þ„ÿ */
+        $"01D7 B388 B702 B6B6 EB82 FF02 C2B0 B8A4"            /* .׳ˆ·.¶¶ë‚ÿ.°¸¤ */
+        $"B701 AF96 827C 0100 0081 7C02 7BA3 B5A3"            /* ·.¯–‚|...�|.{£µ£ */
+        $"B602 B7A8 E584 FF02 F1B8 B589 B601 B3CA"            /* ¶.·¨å„ÿ.ñ¸µ‰¶.³Ê */
+        $"82FF 02EA AAB7 A4B6 01AD 9382 7C01 0000"            /* ‚ÿ.ꪷ¤¶.­“‚|... */
+        $"817C 0278 9FB4 97B5 0DB4 B5B6 B4B6 B5B4"            /* �|.xŸ´—µ.´µ¶´¶µ´ */
+        $"B6B5 B4B6 B6AD C085 FF11 CCB0 B6B5 B4B6"            /* ¶µ´¶¶­À…ÿ.Ì°¶µ´¶ */
+        $"B5B4 B6B5 B4B6 B4B5 B6B3 B4EB 82FF 0EC0"            /* µ´¶µ´¶´µ¶³´ë‚ÿ.À */
+        $"AFB6 B5B4 B6B4 B4B6 B4B5 B6B4 B5B6 97B5"            /* ¯¶µ´¶´´¶´µ¶´µ¶—µ */
+        $"01AB 9082 7C01 0000 817C 0278 9CB3 95B5"            /* .«�‚|...�|.xœ³•µ */
+        $"0FB6 AFA7 A9AA A7AA AAA7 ABA9 A7AC B1A9"            /* .¶¯§©ª§ªª§«©§¬±© */
+        $"F084 FF12 E9AA A6AA AAA7 ABA9 A7AB A8A8"            /* ð„ÿ.骦ªª§«©§«¨¨ */
+        $"ACA8 A8AB A7A5 C882 FF0F E8A8 B2A8 A8AB"            /* ¬¨¨«§¥È‚ÿ.訲¨¨« */
+        $"A8A8 ACA8 A9AC A7A9 AAAB 95B5 03B4 A98E"            /* ¨¨¬¨©¬§©ª«•µ.´©Ž */
+        $"7B81 7C01 0000 817C 0278 99B2 95B4 0EB3"            /* {�|...�|.x™²•´.³ */
+        $"B7F9 D2C7 FFC1 CEFF BCE1 FABB AACD 84FF"            /* ·ùÒÇÿÁÎÿ¼áú»ªÍ„ÿ */
+        $"14FD BAC6 FFC5 D3FF B7DF F9B7 EBF2 B0F6"            /* .ýºÆÿÅÓÿ·ßù·ëò°ö */
+        $"E6B9 FDDA A7EB 82FF 0FBD AAE6 F8B0 EBF1"            /* æ¹ýÚ§ë‚ÿ.½ªæø°ëñ */
+        $"B5F7 E3B4 FED9 C5D5 AF94 B403 B3A7 8B7B"            /* µ÷ã´þÙÅÕ¯”´.³§‹{ */
+        $"817C 0100 0081 7C02 7794 B195 B30E B1B9"            /* �|...�|.w”±•³.±¹ */
+        $"FFD2 C7FF D3DE FFBA E3FF BDAA F984 FF14"            /* ÿÒÇÿÓÞÿºãÿ½ªù„ÿ. */
+        $"DBA2 DAFF C4D4 FFCA EBFE B4EF FBC4 FEE9"            /* Û¢ÚÿÄÔÿÊëþ´ïûÄþé */
+        $"B6FF EAAB C082 FF0F E4A3 ECFF C5F6 F5B2"            /* ¶ÿê«À‚ÿ.ä£ìÿÅöõ² */
+        $"FBEF C8FF DAC4 DAAE 94B3 03B2 A589 7B81"            /* ûïÈÿÚÄÚ®”³.²¥‰{� */
+        $"7C01 0000 807C 037D 7690 AE95 B104 AFB7"            /* |...€|.}v�®•±.¯· */
+        $"FFE0 D681 FF04 CDEC FCAE D884 FF06 F7AC"            /* ÿàÖ�ÿ.Íìü®Ø„ÿ.÷¬ */
+        $"E0FF FFD4 E180 FF02 FDC9 F380 FF06 EFCA"            /* àÿÿÔá€ÿ.ýÉó€ÿ.ïÊ */
+        $"FFFF FAAE E582 FF01 B6DA 80FF 02F7 C7FB"            /* ÿÿú®å‚ÿ.¶Ú€ÿ.÷Çû */
+        $"80FF 03E5 D6D9 AC94 B103 B0A2 877B 817C"            /* €ÿ.åÖÙ¬”±.°¢‡{�| */
+        $"0100 0081 7C02 768D AC95 B002 AEB7 FB85"            /* ...�|.v�¬•°.®·û… */
+        $"FF01 CDB1 85FF 01C9 B890 FF01 D5B8 82FF"            /* ÿ.ͱ…ÿ.ɸ�ÿ.Õ¸‚ÿ */
+        $"02E0 B3FC 87FF 01D5 AA94 B003 AE9F 857B"            /* .à³ü‡ÿ.Õª”°.®Ÿ…{ */
+        $"817C 0100 0081 7C02 788A AB95 AF02 ADB6"            /* �|...�|.xŠ«•¯.­¶ */
+        $"FB84 FF02 F0A5 E584 FF02 EEA6 EC90 FF02"            /* û„ÿ.ð¥å„ÿ.î¦ì�ÿ. */
+        $"FCAE E281 FF02 FCB4 DB87 FF01 D5A9 94AF"            /* ü®â�ÿ.ü´Û‡ÿ.Õ©”¯ */
+        $"03AC 9D83 7B81 7C01 0000 817C 0278 86A9"            /* .¬�ƒ{�|...�|.x†© */
+        $"95AD 02AB B4FB 84FF 01BE BD85 FF01 BAC3"            /* •­.«´û„ÿ.¾½…ÿ.ºÃ */
+        $"92FF 01D6 B480 FF04 FCD8 A4B3 FB86 FF01"            /* ’ÿ.Ö´€ÿ.üؤ³û†ÿ. */
+        $"D4A7 94AD 03AB 9A81 7B81 7C01 0000 817C"            /* Ô§”­.«š�{�|...�| */
+        $"0278 83A7 95AC 02AA B3FB 83FF 02E5 A3F2"            /* .xƒ§•¬.ª³ûƒÿ.å£ò */
+        $"84FF 02E1 A5F6 92FF 09FD AEDC FBDE B595"            /* „ÿ.á¥ö’ÿÆý®ÜûÞµ• */
+        $"B6A9 D886 FF01 D3A6 94AC 03A9 9880 7B81"            /* ¶©Ø†ÿ.Ó¦”¬.©˜€{� */
+        $"7C01 0000 817C 0278 80A5 95AC 02AA B3FB"            /* |...�|.x€¥•¬.ª³û */
+        $"82FF 02FE B0CB 84FF 02FC ADD0 94FF 09DB"            /* ‚ÿ.þ°Ë„ÿ.ü­Ð”ÿÆÛ */
+        $"A1A8 95A2 D6FF D1AA FA85 FF01 D3A6 94AC"            /* ¡¨•¢ÖÿѪú…ÿ.Ó¦”¬ */
+        $"03A8 967F 7B81 7C01 0000 817C 0279 7FA3"            /* .¨–.{�|...�|.y.£ */
+        $"95AB 02A9 B2FB 82FF 02D7 A7FB 84FF 02D2"            /* •«.©²û‚ÿ.קû„ÿ.Ò */
+        $"AAFD 95FF 08AD B4DD FCFF FFFA A5D3 85FF"            /* ªý•ÿ.­´Ýüÿÿú¥Ó…ÿ */
+        $"01D3 A594 AB03 A694 7E7B 817C 0100 0081"            /* .Ó¥”«.¦”~{�|...� */
+        $"7C02 7A7D A095 A902 A7B1 FB81 FF02 F8A5"            /* |.z} •©.§±û�ÿ.ø¥ */
+        $"DA84 FF02 F4A4 E096 FF01 DCC2 82FF 02D3"            /* Ú„ÿ.ô¤à–ÿ.Ü‚ÿ.Ó */
+        $"A5F8 84FF 01D2 A394 A902 A491 7D82 7C01"            /* ¥ø„ÿ.Ò£”©.¤‘}‚|. */
+        $"0000 817C 027A 7A9E 95A8 08A6 B1EF F3F2"            /* ..�|.zzž•¨.¦±ïóò */
+        $"F2F6 C6B0 85FF 02C5 B4F5 95F2 03F3 F2B5"            /* òöÆ°…ÿ.Å´õ•ò.óòµ */
+        $"E881 FF03 FCA7 CCF6 82F2 02F7 CDA3 94A8"            /* è�ÿ.ü§Ìö‚ò.÷Í£”¨ */
+        $"01A3 8F83 7C01 0000 817C 027B 779C 96A7"            /* .£�ƒ|...�|.{wœ–§ */
+        $"00A8 82AB 019C E984 FF03 E9A6 AAAC 96AB"            /* .¨‚«.œé„ÿ.馪¬–« */
+        $"02AC A6C1 82FF 02D8 A0AC 83AB 00A9 95A7"            /* .¬¦Á‚ÿ.Ø ¬ƒ«.©•§ */
+        $"01A1 8D83 7C01 0000 817C 037B 7699 A595"            /* .¡�ƒ|...�|.{v™¥• */
+        $"A600 A580 A402 A599 C085 FF02 BCA1 A599"            /* ¦.¥€¤.¥™À…ÿ.¼¡¥™ */
+        $"A401 A5E9 81FF 02CB 96A3 83A4 00A5 95A6"            /* ¤.¥é�ÿ.Ë–£ƒ¤.¥•¦ */
+        $"029F 8A7B 827C 0100 0082 7C02 7596 A399"            /* .ŸŠ{‚|...‚|.u–£™ */
+        $"A402 A29F F584 FF01 DDA0 9BA4 09A0 BFFF"            /* ¤.¢Ÿõ„ÿ.Ý ›¤Æ ¿ÿ */
+        $"FFE6 ADAB D299 A59B A402 9D88 7B82 7C01"            /* ÿæ­«Ò™¥›¤.�ˆ{‚|. */
+        $"0000 827C 0276 94A2 98A3 02A4 98D1 84FF"            /* ..‚|.v”¢˜£.¤˜Ñ„ÿ */
+        $"02F9 AFA0 9CA3 09A4 B9A9 A0CB FCFF B599"            /* .ù¯ œ£Æ¤¹© Ëüÿµ™ */
+        $"A49A A302 9C87 7B82 7C01 0000 827C 0275"            /* ¤š£.œ‡{‚|...‚|.u */
+        $"92A2 98A3 02A1 A4F5 84FF 01CF 9E9D A303"            /* ’¢˜£.¡¤õ„ÿ.Ïž�£. */
+        $"A0A9 DEFB 80FF 02F3 9CA0 9AA3 029B 867B"            /*  ©Þû€ÿ.󜠚£.›†{ */
+        $"827C 0100 0081 7C03 7D74 8FA1 97A2 05A3"            /* ‚|...�|.}t�¡—¢.£ */
+        $"9FA0 9ED6 FE81 FF02 F0A6 A09D A202 A0A9"            /* Ÿ žÖþ�ÿ.ð¦ �¢. © */
+        $"F382 FF01 D893 9AA2 0299 837B 827C 0100"            /* ó‚ÿ.Ø“š¢.™ƒ{‚|.. */
+        $"0081 7C03 7D73 8D9F 97A0 069F 9FF1 D697"            /* .�|.}s�Ÿ— .ŸŸñÖ— */
+        $"A6E6 80FF 01C1 9B9F A001 9BD2 83FF 02BB"            /* ¦æ€ÿ.Á›Ÿ .›Òƒÿ.» */
+        $"94A1 98A0 0297 827B 827C 0100 0081 7C03"            /* ”¡˜ .—‚{‚|...�|. */
+        $"7D72 8A9E 979F 0B9D A6FB FFF9 BF91 B6F6"            /* }rŠž—Ÿ.�¦ûÿù¿‘¶ö */
+        $"E69E 9E9F 9F01 9BB4 83FF 03FA A199 A096"            /* æžžŸŸ.›´ƒÿ.ú¡™ – */
+        $"9F03 9E95 807B 827C 0100 0081 7C03 7D72"            /* Ÿ.ž•€{‚|...�|.}r */
+        $"889D 979E 0199 B281 FF04 EFAD 9EA9 9CA0"            /* ˆ�—ž.™²�ÿ.ï­ž©œ  */
+        $"9E02 9D9F EE83 FF01 E492 979E 039D 9480"            /* ž.�Ÿîƒÿ.ä’—ž.�”€ */
+        $"7B82 7C01 0000 817C 037D 7487 9B97 9D01"            /* {‚|...�|.}t‡›—�. */
+        $"96BF 82FF 02FE B697 A29D 0198 D184 FF02"            /* –¿‚ÿ.þ¶—¢�.˜Ñ„ÿ. */
+        $"C191 9E95 9D03 9C92 7F7B 827C 0100 0081"            /* Á‘ž•�.œ’.{‚|...� */
+        $"7C03 7D75 849A 979C 0194 CE81 FF02 F8BD"            /* |.}u„š—œ.”Î�ÿ.ø½ */
+        $"9BA3 9C01 98B4 84FF 02F8 9D99 959C 039B"            /* ›£œ.˜´„ÿ.ø�™•œ.› */
+        $"907E 7B82 7C01 0000 817C 037D 7482 9997"            /* �~{‚|...�|.}t‚™— */
+        $"9B01 94DF 80FF 03EE AD95 9AA3 9B02 9A9D"            /* ›.”߀ÿ.î­•š£›.š� */
+        $"EF84 FF02 CC91 9C94 9B03 9A8F 7C7B 827C"            /* ï„ÿ.Ì‘œ”›.š�|{‚| */
+        $"0100 0081 7C03 7D74 8098 979A 0697 ECFF"            /* ...�|.}t€˜—š.—ìÿ */
+        $"FFE0 A195 A69A 0195 D084 FF02 F098 9994"            /* ÿà¡•¦š.•Ð„ÿ.𘙔 */
+        $"9A02 998D 7B83 7C01 0000 817C 037D 737E"            /* š.™�{ƒ|...�|.}s~ */
+        $"9896 9A06 989F F9FF D099 97A7 9A02 96AD"            /* ˜–š.˜ŸùÿЙ—§š.–­ */
+        $"FD83 FF02 FCA6 9794 9A02 998D 7B83 7C01"            /* ýƒÿ.ü¦—”š.™�{ƒ|. */
+        $"0000 817C 037D 737D 9796 9905 95AD FCBE"            /* ..�|.}s}—–™.•­ü¾ */
+        $"9498 A999 0196 DD83 FF02 F7A3 9794 9902"            /* ”˜©™.–݃ÿ.÷£—”™. */
+        $"988C 7A83 7C01 0000 817C 037D 737B 9696"            /* ˜Œzƒ|...�|.}s{–– */
+        $"9803 95B0 B392 AB98 0294 AAF9 82FF 01CF"            /* ˜.•°³’«˜.”ªù‚ÿ.Ï */
+        $"9595 9802 978A 7A83 7C01 0000 817C 037D"            /* ••˜.—Šzƒ|...�|.} */
+        $"747B 9498 9700 94AD 9708 93B9 F9FF FFF6"            /* t{”˜—.”­—.“¹ùÿÿö */
+        $"C797 9695 9702 9688 7983 7C01 0000 817C"            /* Ç—–•—.–ˆyƒ|...�| */
+        $"037D 7479 93CA 9606 92A4 BEB8 9F91 9596"            /* .}ty“Ê–.’¤¾¸Ÿ‘•– */
+        $"9602 9588 7983 7C01 0000 817C 037D 7478"            /* –.•ˆyƒ|...�|.}tx */
+        $"93CB 9603 9390 9193 9896 0294 8779 837C"            /* “Ë–.“�‘“˜–.”‡yƒ| */
+        $"0100 0081 7C03 7D75 7892 EA95 0293 8679"            /* ...�|.}ux’ê•.“†y */
+        $"837C 0100 0081 7C03 7D75 7892 EA95 0293"            /* ƒ|...�|.}ux’ê•.“ */
+        $"8679 837C 0100 0081 7C03 7D76 7792 EA95"            /* †yƒ|...�|.}vw’ê• */
+        $"0293 8679 837C 0100 0081 7C03 7D76 7792"            /* .“†yƒ|...�|.}vw’ */
+        $"EA95 0293 8579 837C 0000 827C 037D 7776"            /* ê•.“…yƒ|..‚|.}wv */
+        $"8FEA 9402 9182 7883 7C00 0083 7C03 7A70"            /* �ê”.‘‚xƒ|..ƒ|.zp */
+        $"8288 E989 0285 7A79 837C 0100 0082 7C02"            /* ‚ˆé‰.…zyƒ|...‚|. */
+        $"7D78 76EA 7901 7779 847C 0100 00FB 7C01"            /* }xvêy.wy„|...û|. */
+        $"0000 FB7C 0100 00FB 7C01 0000 FB7C 0100"            /* ..û|...û|...û|.. */
+        $"00FA 7C81 00F9 7C82 00F7 7C83 00F6 7C86"            /* .ú|�.ù|‚.÷|ƒ.ö|† */
+        $"00F3 7CFF 00FF 0000 00FF 00FF 00FF 00FF"            /* .ó|ÿ.ÿ...ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00FF 00FF 00FF"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ.ÿ */
+        $"00FF 00FF 00FF 00FF 00FF 00DF 009F 74D7"            /* .ÿ.ÿ.ÿ.ÿ.ÿ.ß.Ÿt× */
+        $"00A6 74D3 0001 7474 8000 9D73 8474 D000"            /* .¦tÓ..tt€.�s„tÐ. */
+        $"0374 7400 749E 7702 7673 7283 74D0 0003"            /* .tt.tžw.vsrƒtÐ.. */
+        $"7381 9FAB 9DAC 03A8 977A 7383 74CD 0004"            /* s�Ÿ«�¬.¨—zsƒtÍ.. */
+        $"7400 79AF CC9E CF03 CCBF 9B73 8374 CD00"            /* t.y¯ÌžÏ.Ì¿›sƒtÍ. */
+        $"0474 0088 C6D2 9FD3 03CA AF7C 7282 74CD"            /* .t.ˆÆÒŸÓ.ʯ|r‚tÍ */
+        $"0003 7400 8EC9 A0D3 03CC B27D 7282 74CC"            /* ..t.ŽÉ Ó.̲}r‚tÌ */
+        $"0004 7474 7094 CBA0 D203 CCB3 7C72 8374"            /* ..ttp”Ë Ò.̳|rƒt */
+        $"CB00 0474 7471 A1CE A0D1 03CC B67F 72B8"            /* Ë..ttq¡Î Ñ.̶.r¸ */
+        $"7495 0005 7474 0078 B7D0 A0D1 03CE BE8B"            /* t•..tt.x·Ð Ñ.ξ‹ */
+        $"70BA 7492 0006 7474 0070 96C9 CFA0 D004"            /* pºt’..tt.p–ÉÏ Ð. */
+        $"CFC6 A675 71BA 7490 0006 7474 0072 8FC0"            /* ÏƦuqºt�..tt.r�À */
+        $"CDA2 CF03 CBBF 9D7A B672 0473 0073 7474"            /* Í¢Ï.Ë¿�z¶r.s.stt */
+        $"8E00 0674 7400 799D C3CD A3CF 04CE CAC3"            /* Ž..tt.y�ÃÍ£Ï.ÎÊà */
+        $"B2A0 B598 0496 8D79 0074 8D00 0774 7400"            /* ² µ˜.–�y.t�..tt. */
+        $"79A8 C8CE CEA4 CF03 CECD CBC9 B5C7 03C3"            /* y¨ÈÎΤÏ.ÎÍËɵÇ.à */
+        $"B58F 0080 7489 0081 7403 7192 C1C8 E2C9"            /* µ�.€t‰.�t.q’ÁÈâÉ */
+        $"03C7 B995 7282 7486 0001 7474 8000 026E"            /* .ǹ•r‚t†..tt€..n */
+        $"91AC E3AF 04AE A58A 6F71 8000 0174 7484"            /* ‘¬ã¯.®¥Šoq€..tt„ */
+        $"0008 7400 7075 8085 8487 8E80 8FAA 9000"            /* ..t.pu€…„‡Ž€�ª�. */
+        $"8FB0 9080 8F09 8B87 8584 847F 7600 7474"            /* �°�€�Æ‹‡…„„.v.tt */
+        $"8200 0774 0070 8BAF BCBF C0E7 C109 C0BF"            /* ‚..t.p‹¯¼¿ÀçÁÆÀ¿ */
+        $"BEBE B8A6 8572 7474 8200 0370 8DC0 C9EE"            /* ¾¾¸¦…rtt‚..p�ÀÉî */
+        $"CA05 C9C4 B185 0074 8000 0474 0078 B4C8"            /* Ê.Éı….t€..t.x´È */
+        $"F0CA 0CC9 BFA1 7600 7400 0074 0088 BFC8"            /* ðÊ.É¿¡v.t..t.ˆ¿È */
+        $"B3C9 03CA C7C9 CAB7 C90A C3AD 7F00 7400"            /* ³É.ÊÇÉÊ·ÉÂí..t. */
+        $"0074 708C C0B3 C805 C9C3 B8B3 C4C9 B6C8"            /* .tpŒÀ³È.Éø³ÄÉ¶È */
+        $"0AC3 AE7F 0074 0074 7400 88BD B4C7 05C2"            /* Âî..t.tt.ˆ½´Ç. */
+        $"F1EC B2C4 C8B5 C70B C1AB 7C00 7400 7474"            /* ñì²ÄȵÇ.Á«|.t.tt */
+        $"0082 BAC6 B3C7 04C6 F2FF E6B3 B6C7 0BC0"            /* .‚ºÆ³Ç.Æòÿ泶Ç.À */
+        $"A67A 7374 0074 7400 7DB5 C5B3 C606 C3E7"            /* ¦zst.tt.}µÅ³Æ.Ãç */
+        $"FFFF D5B6 C8B4 C60B BDA1 7573 7400 7474"            /* ÿÿնȴÆ.½¡ust.tt */
+        $"0079 B0C4 B3C5 01C2 D880 FF02 C0BD C6B2"            /* .y°Ä³Å.ÂØ€ÿ.À½Æ² */
+        $"C50C C4BB 9D75 7374 0074 7473 75AA C2B3"            /* Å.Ä»�ust.ttsuªÂ³ */
+        $"C406 C3C9 FAFF FFF0 B3B3 C403 C3B8 9673"            /* Ä.ÃÉúÿÿð³³Ä.ø–s */
+        $"8474 01A5 C1B4 C301 C1EB 80FF 02D6 B4C5"            /* „t.¥Á´Ã.Áë€ÿ.Ö´Å */
+        $"B1C3 03C2 B591 7283 7402 719E BFB4 C201"            /* ±Ã.µ‘rƒt.qž¿´Â. */
+        $"BFD5 80FF 03FD BBBD C3B0 C203 C0B2 8E72"            /* ¿Õ€ÿ.ý»½Ã°Â.À²Žr */
+        $"8374 0270 99BD B4C1 02C0 C4F6 80FF 02E6"            /* ƒt.p™½´Á.ÀÄö€ÿ.æ */
+        $"B1C2 B0C1 03BE AF87 7283 7402 7193 BBB5"            /* ±Â°Á.¾¯‡rƒt.q“»µ */
+        $"C001 BCE1 81FF 02C6 B7C1 AFC0 06BD AC84"            /* À.¼á�ÿ.Æ·Á¯À.½¬„ */
+        $"7274 7400 8074 0270 8CB9 B1BF 00C0 80C1"            /* rtt.€t.pŒ¹±¿.À€Á */
+        $"02BD CAFD 80FF 01F1 B1B0 BF06 BBA9 8172"            /* .½Êý€ÿ.ñ±°¿.»©�r */
+        $"7474 0080 7402 7088 B7B0 BF07 C1B9 ACAB"            /* tt.€t.pˆ·°¿.Á¹¬« */
+        $"AEBC BEEB 81FF 02D1 B3C0 AEBF 06BA A67C"            /* ®¼¾ë�ÿ.ѳÀ®¿.º¦| */
+        $"7274 7400 8074 0271 83B4 AFBE 08BF AFB4"            /* rtt.€t.qƒ´¯¾.¿¯´ */
+        $"D9E3 D2AD B1D3 81FF 02F8 B4BC AEBE 06B8"            /* ÙãÒ­±Ó�ÿ.ø´¼®¾.¸ */
+        $"A27A 7374 7400 8074 0372 7DB1 BCAE BD01"            /* ¢zstt.€t.r}±¼®½. */
+        $"B9CA 81FF 03F6 B4B9 F381 FF02 D8AF BEAD"            /* ¹Ê�ÿ.ö´¹ó�ÿ.د¾­ */
+        $"BD0D B69F 7973 7474 0000 7474 727A ADBB"            /* ½.¶Ÿystt..ttrz­» */
+        $"ADBC 03BB ABB7 E681 FF02 E6AE D881 FF02"            /* ­¼.»«·æ�ÿ.æ®Ø�ÿ. */
+        $"FDB7 B8AD BC0D B49A 7673 7474 0000 7474"            /* ý·¸­¼.´švstt..tt */
+        $"7378 A9BA ACBB 0CBC ACDB D7A6 BDF0 FFFF"            /* sx©º¬».¼¬Ûצ½ðÿÿ */
+        $"FABA BEF7 81FF 02DF ACBC ACBB 01B2 9781"            /* úº¾÷�ÿ.߬¼¬».²—� */
+        $"7407 0000 7474 7374 A4B8 ABB9 0DBA B3BB"            /* t...ttst¤¸«¹.º³» */
+        $"FFFF F7C2 A4CB FAFC C0B4 DC82 FF02 BAB4"            /* ÿÿ÷¤ËúüÀ´Ü‚ÿ.º´ */
+        $"BAAB B901 B093 8174 0100 0080 7402 729F"            /* º«¹.°“�t...€t.rŸ */
+        $"B6AB B902 BAAA E981 FF07 ECB3 ABD1 BBB6"            /* ¶«¹.ºªé�ÿ.쳫ѻ¶ */
+        $"C0FA 81FF 02E4 AABA AAB9 03B8 AD8E 7380"            /* Àú�ÿ.䪺ª¹.¸­Žs€ */
+        $"7401 0000 8074 0272 9BB6 AAB8 02B9 ADC6"            /* t...€t.r›¶ª¸.¹­Æ */
+        $"84FF 05DC AFB7 B8B4 E082 FF02 BCB1 B9A9"            /* „ÿ.ܯ·¸´à‚ÿ.¼±¹© */
+        $"B803 B6AB 8A72 8074 0100 0080 7402 7095"            /* ¸.¶«Šr€t...€t.p• */
+        $"B4AA B602 B5AB F484 FF06 E9B6 B5B6 B4C2"            /* ´ª¶.µ«ô„ÿ.鶵¶´Â */
+        $"FC81 FF02 E6A9 B7A9 B603 B5A8 8872 8074"            /* ü�ÿ.æ©·©¶.µ¨ˆr€t */
+        $"0100 0080 7402 6F91 B3A9 B602 B7AD D684"            /* ...€t.o‘³©¶.·­Ö„ */
+        $"FF02 FAC0 B480 B601 B3E4 82FF 02BD AFB7"            /* ÿ.úÀ´€¶.³ä‚ÿ.½¯· */
+        $"A8B6 03B4 A584 7280 7401 0000 8074 0270"            /* ¨¶.´¥„r€t...€t.p */
+        $"8DB2 A9B6 02B4 ACE7 84FF 01D9 B181 B602"            /* �²©¶.´¬ç„ÿ.Ù±�¶. */
+        $"B3C5 FE81 FF02 E8A8 B7A8 B603 B3A3 8172"            /* ³Åþ�ÿ.訷¨¶.³£�r */
+        $"8074 0100 0080 7402 7087 B0A8 B505 B6AA"            /* €t...€t.p‡°¨µ.¶ª */
+        $"BDA4 C1F5 81FF 02F3 B8B4 82B5 01B2 E782"            /* ½¤Áõ�ÿ.ó¸´‚µ.²ç‚ */
+        $"FF02 BFAD B6A7 B503 B2A1 7F72 8074 0100"            /* ÿ.¿­¶§µ.²¡.r€t.. */
+        $"0080 7402 7083 ADA7 B40C B5AC BBFF F2B8"            /* .€t.pƒ­§´.µ¬»ÿò¸ */
+        $"A2D0 FBFF FFCE B083 B401 B1C5 82FF 02EA"            /* ¢Ðûÿÿΰƒ´.±Å‚ÿ.ê */
+        $"A7B5 A7B4 03B0 9E7C 7380 7401 0000 8074"            /* §µ§´.°ž|s€t...€t */
+        $"0271 80AB A8B3 01A5 EC80 FF06 E4AA A9E2"            /* .q€«¨³.¥ì€ÿ.䪩â */
+        $"EAB2 B284 B301 B1E8 82FF 02BF ABB4 A6B3"            /* ê²²„³.±è‚ÿ.¿«´¦³ */
+        $"03AE 9B79 7380 7401 0000 8074 0272 7DA8"            /* .®›ys€t...€t.r}¨ */
+        $"A6B2 02B3 A6C8 82FF 04FE D3A8 B2B1 85B2"            /* ¦².³¦È‚ÿ.þÓ¨²±…² */
+        $"01AE C582 FF02 EAA6 B3A6 B203 AC98 7873"            /* .®Å‚ÿ.꦳¦².¬˜xs */
+        $"8074 0100 0080 7403 7278 A5B0 A5B1 02AF"            /* €t...€t.rx¥°¥±.¯ */
+        $"A9F7 84FF 01DA AB86 B102 B0AF E982 FF02"            /* ©÷„ÿ.Ú«†±.°¯é‚ÿ. */
+        $"BEA9 B2A5 B103 AB95 7773 8074 0100 0080"            /* ¾©²¥±.«•ws€t...€ */
+        $"7403 7276 A2AF A4B0 02B1 A2D5 84FF 02F8"            /* t.rv¢¯¤°.±¢Õ„ÿ.ø */
+        $"BAAE 87B0 01AC C682 FF02 EAA4 B1A5 B003"            /* º®‡°.¬Æ‚ÿ.ꤱ¥°. */
+        $"A991 7573 8074 0100 0080 7402 7375 9FA4"            /* ©‘us€t...€t.suŸ¤ */
+        $"AE03 AFA9 B0FE 84FF 01D3 AA88 AE02 ADAD"            /* ®.¯©°þ„ÿ.Óªˆ®.­­ */
+        $"E982 FF02 BCA7 AFA4 AE01 A78E 8274 0100"            /* é‚ÿ.¼§¯¤®.§Ž‚t.. */
+        $"0081 7402 729B ADA3 AE02 AFA0 E384 FF02"            /* .�t.r›­£®.¯ ã„ÿ. */
+        $"F0B0 AD89 AE01 AAC4 82FF 02E9 A2AF A4AE"            /* ð°­‰®.ªÄ‚ÿ.颯¤® */
+        $"01A5 8C82 7401 0000 8174 0270 98AC 97AD"            /* .¥Œ‚t...�t.p˜¬—­ */
+        $"0DAC ADAE ACAE ADAC AEAD ACAE AEA4 BB85"            /* .¬­®¬®­¬®­¬®®¤»… */
+        $"FF11 C7A7 AEAD ACAE ADAC AEAC ACAE ACAD"            /* ÿ.ǧ®­¬®­¬®¬¬®¬­ */
+        $"AEAB ABE9 82FF 0EBB A6AE ADAC AEAC ACAE"            /* ®««é‚ÿ.»¦®­¬®¬¬® */
+        $"ACAD AEAC ADAE 97AD 01A3 8982 7401 0000"            /* ¬­®¬­®—­.£‰‚t... */
+        $"8174 0270 94AA 95AC 0FAD A79F A1A2 9FA2"            /* �t.p”ª•¬.­§Ÿ¡¢Ÿ¢ */
+        $"A29F A2A1 9FA4 A9A1 EF84 FF12 E6A2 9FA2"            /* ¢Ÿ¢¡Ÿ¤©¡ï„ÿ.梟¢ */
+        $"A1A0 A3A1 A0A2 A0A0 A3A0 A0A2 9F9D C282"            /* ¡ £¡ ¢  £  ¢Ÿ�‚ */
+        $"FF10 E6A0 A9A0 A0A2 A0A0 A2A0 A1A3 A0A1"            /* ÿ.æ ©  ¢  ¢ ¡£ ¡ */
+        $"A2A2 AB94 AC03 ABA1 8673 8174 0100 0081"            /* ¢¢«”¬.«¡†s�t...� */
+        $"7402 7091 A995 AB0E A9AF FACE C2FF BCCA"            /* t.p‘©•«.©¯úÎÂÿ¼Ê */
+        $"FFB6 DEFA B4A1 C884 FF14 FDB2 C0FF BFCF"            /* ÿ¶Þú´¡È„ÿ.ý²Àÿ¿Ï */
+        $"FFAF DCFA AFEA F1A8 F5E4 B2FE D79D E982"            /* ÿ¯Üú¯êñ¨õä²þ×�é‚ */
+        $"FF0F B8A1 E4F8 A9EA F0AE F7E0 ACFF D5C0"            /* ÿ.¸¡äø©êð®÷à¬ÿÕÀ */
+        $"D1A5 94AB 03AA 9F84 7381 7401 0000 8174"            /* Ñ¥”«.ªŸ„s�t...�t */
+        $"026F 8CA8 95A9 0EA7 B1FF CEC2 FFD0 DBFF"            /* .oŒ¨•©.§±ÿÎÂÿÐÛÿ */
+        $"B3E0 FFB6 A2F9 84FF 14D7 99D8 FFBE D0FF"            /* ³àÿ¶¢ù„ÿ.×™Øÿ¾Ðÿ */
+        $"C5E9 FFAC EEFA C0FE E7B0 FFE8 A3B9 82FF"            /* Åéÿ¬îúÀþç°ÿ裹‚ÿ */
+        $"0FE2 99EA FFC1 F5F4 ABFB EDC4 FFD7 BED6"            /* .â™êÿÁõô«ûíÄÿ×¾Ö */
+        $"A394 A903 A89C 8173 8174 0100 0080 7403"            /* £”©.¨œ�s�t...€t. */
+        $"756E 88A6 95A8 04A6 B0FF DDD3 81FF 04C9"            /* unˆ¦•¨.¦°ÿÝÓ�ÿ.É */
+        $"EBFB A6D5 84FF 06F6 A3DE FFFF D1DE 80FF"            /* ëû¦Õ„ÿ.ö£ÞÿÿÑÞ€ÿ */
+        $"02FD C4F2 80FF 06EE C6FF FFFA A7E2 82FF"            /* .ýÄò€ÿ.îÆÿÿú§â‚ÿ */
+        $"01B0 D780 FF02 F6C3 FB80 FF03 E3D3 D5A2"            /* .°×€ÿ.öÃû€ÿ.ãÓÕ¢ */
+        $"94A8 03A7 9A7F 7381 7401 0000 8074 0375"            /* ”¨.§š.s�t...€t.u */
+        $"6E85 A495 A702 A5AF FA85 FF01 C7AB 85FF"            /* n…¤•§.¥¯ú…ÿ.Ç«…ÿ */
+        $"01C4 B290 FF01 D1B1 82FF 02DD ACFB 87FF"            /* .IJ�ÿ.ѱ‚ÿ.ݬû‡ÿ */
+        $"01D1 A194 A703 A598 7D73 8174 0100 0081"            /* .Ñ¡”§.¥˜}s�t...� */
+        $"7402 7082 A295 A602 A4AE FB84 FF02 EF9C"            /* t.p‚¢•¦.¤®û„ÿ.ïœ */
+        $"E484 FF02 EC9E EB90 FF02 FCA7 DF81 FF02"            /* ä„ÿ.ìžë�ÿ.ü§ß�ÿ. */
+        $"FCAD D787 FF01 D0A0 94A6 03A3 957B 7381"            /* ü­×‡ÿ.Р”¦.£•{s� */
+        $"7401 0000 8174 0270 7EA1 95A6 02A4 AEFB"            /* t...�t.p~¡•¦.¤®û */
+        $"84FF 01B8 B885 FF01 B4BF 92FF 01D4 AD80"            /* „ÿ.¸¸…ÿ.´¿’ÿ.Ô­€ */
+        $"FF04 FCD4 9CAC FA86 FF01 D0A0 94A6 03A3"            /* ÿ.üÔœ¬ú†ÿ.Р”¦.£ */
+        $"937A 7381 7401 0000 8174 0270 7B9F 95A4"            /* “zs�t...�t.p{Ÿ•¤ */
+        $"02A2 ACFA 83FF 02E3 9BF1 84FF 02DE 9EF5"            /* .¢¬úƒÿ.ã›ñ„ÿ.Þžõ */
+        $"92FF 09FD A8D9 FADB AD8B B1A1 D486 FF01"            /* ’ÿÆý¨ÙúÛ­‹±¡Ô†ÿ. */
+        $"CF9E 94A4 03A1 9178 7381 7401 0000 8174"            /* Ïž”¤.¡‘xs�t...�t */
+        $"0270 779D 95A3 02A1 ACFA 82FF 02FD A9C7"            /* .pw�•£.¡¬ú‚ÿ.ý©Ç */
+        $"84FF 02FC A5CD 94FF 09D9 989F 8B9B D3FF"            /* „ÿ.ü¥Í”ÿÆÙ˜Ÿ‹›Óÿ */
+        $"CDA1 F985 FF01 CF9D 94A3 03A0 8E77 7381"            /* Í¡ù…ÿ.Ï�”£. Žws� */
+        $"7401 0000 8174 0271 779A 95A2 02A0 ABFA"            /* t...�t.qwš•¢. «ú */
+        $"82FF 02D4 A0FB 84FF 02CE A2FD 95FF 08A6"            /* ‚ÿ.Ô û„ÿ.΢ý•ÿ.¦ */
+        $"AEDB FCFF FFFA 9ECF 85FF 01CE 9C94 A203"            /* ®ÛüÿÿúžÏ…ÿ.Îœ”¢. */
+        $"9E8C 7673 8174 0100 0081 7402 7275 9895"            /* žŒvs�t...�t.ru˜• */
+        $"A102 9FAA FA81 FF02 F79D D784 FF02 F29C"            /* ¡.Ÿªú�ÿ.÷�ׄÿ.òœ */
+        $"DE96 FF01 DABD 82FF 02D0 9DF8 84FF 01CE"            /* Þ–ÿ.Ú½‚ÿ.Ð�ø„ÿ.Î */
+        $"9A94 A102 9C8A 7582 7401 0000 8174 0272"            /* š”¡.œŠu‚t...�t.r */
+        $"7196 959F 089D A9EE F2F1 F1F6 C0AA 85FF"            /* q–•Ÿ.�©îòññöÀª…ÿ */
+        $"02C0 ADF5 95F1 03F2 F1AE E681 FF03 FCA0"            /* .À­õ•ñ.òñ®æ�ÿ.ü  */
+        $"C7F5 82F1 02F6 C89A 949F 029A 8775 8274"            /* Çõ‚ñ.öÈš”Ÿ.š‡u‚t */
+        $"0100 0081 7402 736F 9396 9E00 9F82 A201"            /* ...�t.so“–ž.Ÿ‚¢. */
+        $"93E8 84FF 03E8 9EA2 A396 A202 A39D BB82"            /* “è„ÿ.螢£–¢.£�»‚ */
+        $"FF02 D597 A383 A200 A195 9E01 9985 8374"            /* ÿ.Õ—£ƒ¢.¡•ž.™…ƒt */
+        $"0100 0081 7403 736E 929D 959E 009D 809C"            /* ...�t.sn’�•ž.�€œ */
+        $"029D 91BC 84FF 03FE B599 9D99 9C01 9DE7"            /* .�‘¼„ÿ.þµ™�™œ.�ç */
+        $"81FF 02C7 8D9B 839C 009D 959E 0198 8383"            /* �ÿ.Ç�›ƒœ.�•ž.˜ƒƒ */
+        $"7401 0000 8274 016E 8F9A 9C02 9A98 F484"            /* t...‚t.n�šœ.š˜ô„ */
+        $"FF01 DA99 9B9C 0997 B9FF FFE4 A7A6 CF91"            /* ÿ.Ú™›œÆ—¹ÿÿ䧦ϑ */
+        $"9D9B 9C02 9681 7382 7401 0000 8274 026F"            /* �›œ.–�s‚t...‚t.o */
+        $"8C9A 989B 029C 90CF 84FF 02F8 A998 9D9B"            /* Œš˜›.œ�Ï„ÿ.ø©˜�› */
+        $"08B3 A39A C8FC FFB0 919C 9A9B 0294 8073"            /* .³£šÈüÿ°‘œš›.”€s */
+        $"8274 0100 0082 7402 6D8A 9998 9A02 989C"            /* ‚t...‚t.mŠ™˜š.˜œ */
+        $"F484 FF01 CB94 9D9A 0397 A2DD FB80 FF02"            /* ô„ÿ.Ë”�š.—¢Ýû€ÿ. */
+        $"F294 979A 9A02 927E 7382 7401 0000 8174"            /* ò”—šš.’~s‚t...�t */
+        $"0375 6B87 9898 9904 969A 96D2 FE81 FF02"            /* .uk‡˜˜™.–š–Òþ�ÿ. */
+        $"EF9E 979D 9902 97A1 F382 FF02 D68A 9A99"            /* ïž—�™.—¡ó‚ÿ.ÖŠš™ */
+        $"9902 917C 7382 7401 0000 8174 0375 6A85"            /* ™.‘|s‚t...�t.uj… */
+        $"9797 9806 9798 F1D3 8F9F E480 FF01 BB92"            /* ——˜.—˜ñÓ�Ÿä€ÿ.»’ */
+        $"9F98 0192 CF83 FF02 B68A 9998 9802 8F7B"            /* Ÿ˜.’σÿ.¶Š™˜˜.�{ */
+        $"7382 7401 0000 8174 0375 6A82 9597 960B"            /* s‚t...�t.uj‚•—–. */
+        $"939F FBFF F9BB 89B0 F5E4 9595 9F96 0192"            /* “Ÿûÿù»‰°õä••Ÿ–.’ */
+        $"AD83 FF03 FA9B 9097 9796 028D 7973 8274"            /* ­ƒÿ.ú›�——–.�ys‚t */
+        $"0100 0081 7403 756A 8195 9796 0191 AC81"            /* ...�t.uj�•—–.‘¬� */
+        $"FF04 EEA8 97A2 94A0 9602 9597 EC83 FF01"            /* ÿ.¢” –.•—ìƒÿ. */
+        $"E28A 9796 0395 8C78 7382 7401 0000 8174"            /* ⊗–.•Œxs‚t...�t */
+        $"0375 6C7F 9497 9501 8EBB 82FF 02FE B28E"            /* .ul.”—•.Ž»‚ÿ.þ²Ž */
+        $"A295 018F CE84 FF02 BD89 9695 9503 948B"            /* ¢•.�΄ÿ.½‰–••.”‹ */
+        $"7873 8274 0100 0081 7403 756D 7D92 9794"            /* xs‚t...�t.um}’—” */
+        $"018C CB81 FF02 F8B8 93A3 9401 90AE 84FF"            /* .ŒË�ÿ.ø¸“£”.�®„ÿ */
+        $"02F7 9691 9594 0393 8A77 7382 7401 0000"            /* .÷–‘•”.“Šws‚t... */
+        $"8174 0375 6C7B 9197 9301 8CDD 80FF 02ED"            /* �t.ul{‘—“.ŒÝ€ÿ.í */
+        $"A78D A493 0292 96EE 84FF 02C8 8894 9493"            /* §�¤“.’–î„ÿ.Ȉ””“ */
+        $"0392 8875 7382 7401 0000 8174 0375 6C79"            /* .’ˆus‚t...�t.uly */
+        $"9096 9207 9190 EBFF FFDE 9A8D A692 018C"            /* �–’.‘�ëÿÿÞš�¦’.Œ */
+        $"CC84 FF02 EF91 9194 9201 9186 8474 0100"            /* Ì„ÿ.ï‘‘”’.‘†„t.. */
+        $"0081 7403 756B 7790 9692 0690 97F8 FFCC"            /* .�t.ukw�–’.�—øÿÌ */
+        $"918E A792 028E A6FD 83FF 02FC 9F8F 9492"            /* ‘Ž§’.Ž¦ýƒÿ.üŸ�”’ */
+        $"0191 8584 7401 0000 8174 0375 6B75 8E96"            /* .‘…„t...�t.ukuŽ– */
+        $"9005 8BA7 FCBA 8B8E A990 018D DB83 FF02"            /* �.‹§üº‹Ž©�.�Ûƒÿ. */
+        $"F79B 8D94 9002 8F83 7383 7401 0000 8174"            /* ÷›�”�.�ƒsƒt...�t */
+        $"0375 6C74 8E96 9004 8CAA AD89 8FAA 9002"            /* .ultŽ–�.Œª­‰�ª�. */
+        $"8CA3 F982 FF01 CB8C 9590 028F 8373 8374"            /* Œ£ù‚ÿ.ËŒ•�.�ƒsƒt */
+        $"0100 0081 7403 756B 728D 988F 008B AD8F"            /* ...�t.ukr�˜�.‹­� */
+        $"088A B4F9 FFFF F6C3 8E8E 958F 028E 8172"            /* .Š´ùÿÿöÃŽŽ•�.Ž�r */
+        $"8374 0100 0081 7403 756C 718C CA8E 068A"            /* ƒt...�t.ulqŒÊŽ.Š */
+        $"9DBA B398 898D 968E 028D 8072 8374 0100"            /* �º³˜‰�–Ž.�€rƒt.. */
+        $"0081 7403 756C 718B CB8E 038B 8888 8B98"            /* .�t.ulq‹ËŽ.‹ˆˆ‹˜ */
+        $"8E02 8C80 7283 7401 0000 8174 0375 6D71"            /* Ž.Œ€rƒt...�t.umq */
+        $"8BEA 8E02 8C80 7283 7401 0000 8174 0375"            /* ‹êŽ.Œ€rƒt...�t.u */
+        $"6D70 8AEA 8D02 8B7F 7283 7401 0000 8174"            /* mpŠê�.‹.rƒt...�t */
+        $"0375 6E70 8AEA 8D02 8B7E 7283 7401 0000"            /* .unpŠê�.‹~rƒt... */
+        $"8174 0375 6E70 8AEA 8D02 8B7E 7283 7400"            /* �t.unpŠê�.‹~rƒt. */
+        $"0082 7403 756F 6E88 EA8C 0289 7B71 8374"            /* .‚t.uonˆêŒ.‰{qƒt */
+        $"0000 8374 0372 697B 81E9 8202 7E73 7283"            /* ..ƒt.ri{�é‚.~srƒ */
+        $"7401 0000 8274 0475 706E 7172 E671 0372"            /* t...‚t.upnqræq.r */
+        $"7270 7284 7401 0000 FB74 0100 00FB 7401"            /* rpr„t...ût...ût. */
+        $"0000 FB74 0100 00FB 7401 0000 FA74 8100"            /* ..ût...ût...út�. */
+        $"F974 8200 F774 8300 F674 8600 F374 FF00"            /* ùt‚.÷tƒ.öt†.ótÿ. */
+        $"FF00 0000 7438 6D6B 0000 4008 0000 0000"            /* ÿ...t8mk..@..... */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0101 0101 0202 0202 0202 0202 0202 0202"            /* ................ */
+        $"0202 0202 0202 0202 0202 0202 0202 0101"            /* ................ */
+        $"0101 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0102 0202"            /* ................ */
+        $"0304 0505 0606 0606 0606 0606 0606 0606"            /* ................ */
+        $"0606 0606 0606 0606 0606 0606 0606 0505"            /* ................ */
+        $"0503 0302 0100 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0001 0100 0000"            /* ................ */
+        $"0204 0506 0707 0707 0707 0707 0707 0707"            /* ................ */
+        $"0707 0707 0707 0707 0707 0707 0707 0606"            /* ................ */
+        $"090A 0805 0302 0100 0000 0000 0000 0000"            /* ÆÂ.............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0101 001C 2F31"            /* ............../1 */
+        $"3436 383A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A"            /* 468::::::::::::: */
+        $"3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A3A 3A34"            /* :::::::::::::::4 */
+        $"120B 0F0B 0704 0201 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0004 8FF3 FAF9"            /* ............�óúù */
+        $"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9"            /* ùùùùùùùùùùùùùùùù */
+        $"F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 F9F9 FAFA"            /* ùùùùùùùùùùùùùùúú */
+        $"C433 1112 0C07 0402 0100 0000 0000 0000"            /* Ä3.............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0001 0067 FFFF FFFF"            /* ...........gÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFC3 201A 130C 0703 0100 0000 0000 0000"            /* ÿÃ ............. */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0001 00A9 FFFF FFFF"            /* ...........©ÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFF8 4A20 1B11 0A05 0200 0000 0000 0000"            /* ÿøJ ..Â......... */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0002 00B6 FFFF FFFF"            /* ...........¶ÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFB 5928 2216 0D07 0200 0000 0000 0000"            /* ÿûY("........... */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0103 07CC FFFF FFFF"            /* ...........Ìÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFD 6231 291B 1109 0401 0000 0000 0000"            /* ÿýb1)..Æ........ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0201 21F0 FFFF FFFF"            /* ..........!ðÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF 7337 2F21 160D 0704 0303 0303 0303"            /* ÿÿs7/!.......... */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0302 0201 0100"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0001 0500 69FF FFFF FFFF"            /* ..........iÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF 9A38 3628 1C14 0E0A 0909 0909 0909"            /* ÿÿš86(...ÂÆÆÆÆÆÆ */
+        $"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+        $"0909 0909 0909 0909 0909 0909 0909 0909"            /* ÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆÆ */
+        $"0909 0909 0909 0909 0909 0807 0604 0302"            /* ÆÆÆÆÆÆÆÆÆÆ...... */
+        $"0100 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0203 0021 DFFF FFFF FFFF"            /* .........!ßÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF E653 312D 231B 1512 1011 1010 1010"            /* ÿÿæS1-#......... */
+        $"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+        $"1010 1010 1010 1010 1010 1010 1010 1010"            /* ................ */
+        $"1010 1010 1010 1010 1010 0E0C 0A08 0504"            /* ............Â... */
+        $"0301 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0002 0200 34D3 FFFF FFFF FFFF"            /* ........4Óÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFD6 6E40 312A 2522 2121 2121 2121"            /* ÿÿÿÖn@1*%"!!!!!! */
+        $"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+        $"2121 2121 2121 2121 2121 2121 2121 2121"            /* !!!!!!!!!!!!!!!! */
+        $"2121 2121 2121 2121 2120 1E1B 1814 0D00"            /* !!!!!!!!! ...... */
+        $"0203 0100 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0102 006C F4FF FFFF FFFF FFFF"            /* .......lôÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FEE8 DAD9 D9D8 D8D8 D8D8 D8D8"            /* ÿÿÿÿþèÚÙÙØØØØØØØ */
+        $"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+        $"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ØØØØØØØØØØØØØØØØ */
+        $"D8D8 D8D8 D8D8 D8D8 D8D8 D7D7 D6D5 D5A9"            /* ØØØØØØØØØØ××ÖÕÕ© */
+        $"1E00 0200 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0001 0300 71FF FFFF FFFF FFFF FFFF"            /* ......qÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"8500 0402 0100 0000 0000 0000 0000 0000"            /* …............... */
+        $"0001 0203 0317 E1FF FFFF FFFF FFFF FFFF"            /* ......áÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"9E03 0905 0302 0100 0000 0000 0000 0000"            /* ž.Æ............. */
+        $"0201 0000 002C E4E8 E8E9 EAEB ECEC EDED"            /* .....,äèèéêëììíí */
+        $"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+        $"EDED EDED EDED EDED EDED EDED EDED EDED"            /* íííííííííííííííí */
+        $"EDED EDED ECEC ECEC ECEC ECEC ECEC ECEC"            /* ííííìììììììììììì */
+        $"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+        $"ECEC ECEC ECEC ECEC ECEC ECEC ECEC ECEC"            /* ìììììììììììììììì */
+        $"ECEC ECEC ECEC ECEC ECEC ECEB EAE9 E8F4"            /* ìììììììììììëêéèô */
+        $"8E02 0400 0000 0202 0000 0000 0000 0002"            /* Ž............... */
+        $"0012 6297 A3A9 BBBD C0C4 C7CA CCCD CECE"            /* ..b—£©»½ÀÄÇÊÌÍÎÎ */
+        $"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+        $"CECE CECE CECE CECE CECE CECE CECE CECE"            /* ÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎÎ */
+        $"CECE CECE CDCD CCCC CCCC CBCB CBCB CBCB"            /* ÎÎÎÎÍÍÌÌÌÌËËËËËË */
+        $"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+        $"CBCB CBCB CBCB CBCB CBCB CBCB CBCB CBCB"            /* ËËËËËËËËËËËËËËËË */
+        $"CBCB CBCB CBCB CBCB CBCB CBC9 C8C5 C2C0"            /* ËËËËËËËËËËËÉÈÅÂÀ */
+        $"B5A6 A5A1 8236 0002 0100 0000 0000 0100"            /* µ¦¥¡‚6.......... */
+        $"35DC FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 5Üÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFE 8901 0101 0000 0000 001B"            /* ÿÿÿÿÿþ‰......... */
+        $"DFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF73 0002 0000 0001 0082"            /* ÿÿÿÿÿÿÿs.......‚ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFE4 1800 0100 0001 00C0"            /* ÿÿÿÿÿÿÿä.......À */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF 4500 0200 0002 02C6"            /* ÿÿÿÿÿÿÿÿE......Æ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF 4C00 0200 0103 00B3"            /* ÿÿÿÿÿÿÿÿL......³ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFE 3D00 0300 0104 009C"            /* ÿÿÿÿÿÿÿþ=......œ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFF4 2C04 0400 0105 0087"            /* ÿÿÿÿÿÿÿô,......‡ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFE8 2007 0400 0105 0073"            /* ÿÿÿÿÿÿÿè ......s */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFD9 1808 0400 0105 015C"            /* ÿÿÿÿÿÿÿÙ.......\ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFC7 0E0A 0401 0105 034A"            /* ÿÿÿÿÿÿÿÇ.Â.....J */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFB5 0A0A 0402 0105 043C"            /* ÿÿÿÿÿÿÿµÂÂ.....< */
+        $"FBFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFA1 080A 0402 0105 062B"            /* ÿÿÿÿÿÿÿ¡.Â.....+ */
+        $"F2FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* òÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF8E 050A 0402 0104 0720"            /* ÿÿÿÿÿÿÿŽ.Â.....  */
+        $"E7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* çÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF7C 0609 0300 0104 0817"            /* ÿÿÿÿÿÿÿ|.Æ...... */
+        $"D8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Øÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF68 0709 0300 0104 0A0E"            /* ÿÿÿÿÿÿÿh.Æ....Â. */
+        $"C8FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Èÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF55 0809 0300 0104 0A0A"            /* ÿÿÿÿÿÿÿU.Æ....ÂÂ */
+        $"B7FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ·ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FF47 0909 0300 0104 0A07"            /* ÿÿÿÿÿÿÿGÆÆ....Â. */
+        $"A4FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ¤ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF F638 0B08 0300 0004 0A05"            /* ÿÿÿÿÿÿö8......Â. */
+        $"91FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ‘ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF EE2B 0C08 0300 0004 0905"            /* ÿÿÿÿÿÿî+......Æ. */
+        $"81FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* �ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF E224 0D08 0300 0003 0906"            /* ÿÿÿÿÿÿâ$......Æ. */
+        $"71FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* qÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF D51C 0E08 0300 0003 0907"            /* ÿÿÿÿÿÿÕ.......Æ. */
+        $"5EFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ^ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF C714 0F07 0200 0003 0908"            /* ÿÿÿÿÿÿÇ.......Æ. */
+        $"4FFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF B811 0E07 0200 0003 090A"            /* ÿÿÿÿÿÿ¸.......ÆÂ */
+        $"43FD FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* Cýÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF A70E 0F07 0200 0003 080B"            /* ÿÿÿÿÿÿ§......... */
+        $"34F5 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* 4õÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 960C 0E06 0200 0002 080D"            /* ÿÿÿÿÿÿ–......... */
+        $"29EB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* )ëÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 850C 0E07 0200 0003 080E"            /* ÿÿÿÿÿÿ…......... */
+        $"22E0 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* "àÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 760D 0E06 0200 0003 080F"            /* ÿÿÿÿÿÿv......... */
+        $"1BD3 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Óÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 650E 0E06 0200 0002 080F"            /* ÿÿÿÿÿÿe......... */
+        $"14C7 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Çÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 580E 0D06 0200 0002 070F"            /* ÿÿÿÿÿÿX......... */
+        $"11B9 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .¹ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF 4E10 0D06 0100 0002 070F"            /* ÿÿÿÿÿÿN......... */
+        $"10AB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .«ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFF8 4211 0D06 0200 0002 070F"            /* ÿÿÿÿÿøB......... */
+        $"0D9B FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .›ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFF1 3513 0D06 0200 0002 080F"            /* ÿÿÿÿÿñ5......... */
+        $"0C8D FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFE9 2E13 0D05 0100 0002 070F"            /* ÿÿÿÿÿé.......... */
+        $"0D81 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .�ÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFDF 2914 0D06 0100 0002 070F"            /* ÿÿÿÿÿß)......... */
+        $"0E73 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .sÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFD4 2215 0C06 0100 0002 070F"            /* ÿÿÿÿÿÔ"......... */
+        $"0F64 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .dÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFC9 1C16 0C05 0100 0002 070F"            /* ÿÿÿÿÿÉ.......... */
+        $"1058 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Xÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFBD 1A15 0C05 0100 0002 070F"            /* ÿÿÿÿÿ½.......... */
+        $"114F FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Oÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFB2 1815 0C05 0100 0002 070E"            /* ÿÿÿÿÿ².......... */
+        $"1246 FAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .Fúÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFA5 1615 0C05 0100 0002 070E"            /* ÿÿÿÿÿ¥.......... */
+        $"133B F4FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .;ôÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF98 1515 0C05 0100 0002 060E"            /* ÿÿÿÿÿ˜.......... */
+        $"1533 EEFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .3îÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF8D 1515 0B05 0100 0002 070E"            /* ÿÿÿÿÿ�.......... */
+        $"152F E6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ./æÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF82 1615 0B05 0100 0002 070E"            /* ÿÿÿÿÿ‚.......... */
+        $"1629 DDFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .)Ýÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF77 1615 0B05 0100 0002 060E"            /* ÿÿÿÿÿw.......... */
+        $"1624 D5FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Õÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF6B 1715 0B05 0100 0002 060E"            /* ÿÿÿÿÿk.......... */
+        $"1720 CCFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Ìÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF61 1815 0B05 0100 0002 060E"            /* ÿÿÿÿÿa.......... */
+        $"181D C3FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Ãÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FF5B 1914 0B05 0100 0002 060E"            /* ÿÿÿÿÿ[.......... */
+        $"181C BAFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..ºÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FE54 1A14 0B05 0100 0002 070E"            /* ÿÿÿÿþT.......... */
+        $"181B B0FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..°ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF F94C 1B15 0B04 0100 0002 060E"            /* ÿÿÿÿùL.......... */
+        $"181A A6FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..¦ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF F544 1C15 0B05 0100 0002 070E"            /* ÿÿÿÿõD.......... */
+        $"1819 9DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..�ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF F13D 1D14 0B04 0100 0002 060E"            /* ÿÿÿÿñ=.......... */
+        $"1819 95FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..•ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF EB3A 1D14 0B05 0100 0002 070E"            /* ÿÿÿÿë:.......... */
+        $"1819 8EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..Žÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF E537 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿå7.......... */
+        $"181A 86FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..†ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF DF34 1E14 0B05 0100 0002 070E"            /* ÿÿÿÿß4.......... */
+        $"181B 7EFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..~ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF D930 1F15 0B05 0100 0002 070E"            /* ÿÿÿÿÙ0.......... */
+        $"181B 78FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..xÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF D32D 1F15 0B05 0100 0002 070F"            /* ÿÿÿÿÓ-.......... */
+        $"191C 71FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..qÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF CE29 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÎ) ......... */
+        $"191D 6AFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..jÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF C828 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÈ( ......... */
+        $"191D 65FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..eÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF C328 2015 0B05 0100 0002 070F"            /* ÿÿÿÿÃ( ......... */
+        $"191E 61FF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..aÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF BE28 2115 0B05 0100 0002 070F"            /* ÿÿÿÿ¾(!......... */
+        $"191F 5DFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ..]ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF B827 2115 0C05 0100 0002 070F"            /* ÿÿÿÿ¸'!......... */
+        $"1920 5AFE FFFF FFFF FFFF FFFF FFFF FFFF"            /* . Zþÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF B427 2115 0C05 0100 0003 0710"            /* ÿÿÿÿ´'!......... */
+        $"1A21 58FD FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Xýÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF B026 2115 0C05 0100 0003 0810"            /* ÿÿÿÿ°&!......... */
+        $"1A21 55FB FFFF FFFF FFFF FFFF FFFF FFFF"            /* .!Uûÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF AC26 2116 0C05 0200 0003 0810"            /* ÿÿÿÿ¬&!......... */
+        $"1A22 52F9 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ."Rùÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF A826 2215 0C05 0100 0003 0810"            /* ÿÿÿÿ¨&"......... */
+        $"1A23 4FF7 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .#O÷ÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF A426 2316 0D06 0200 0003 0811"            /* ÿÿÿÿ¤&#......... */
+        $"1B24 4DF6 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .$Möÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF A126 2316 0D06 0200 0003 0911"            /* ÿÿÿÿ¡&#.......Æ. */
+        $"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 9F26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿŸ&#.......Æ. */
+        $"1C25 4CF5 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .%Lõÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 9E26 2317 0D06 0200 0003 0912"            /* ÿÿÿÿž&#.......Æ. */
+        $"1C26 4BF4 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Kôÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 9D27 2317 0D06 0200 0004 0912"            /* ÿÿÿÿ�'#.......Æ. */
+        $"1C26 4AF3 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Jóÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 9C27 2417 0D06 0200 0104 0912"            /* ÿÿÿÿœ'$.......Æ. */
+        $"1C26 47F2 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .&Gòÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 9A27 2417 0D06 0200 0103 0911"            /* ÿÿÿÿš'$.......Æ. */
+        $"1B27 37D1 FFFF FFFF FFFF FFFF FFFF FFFF"            /* .'7Ñÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
+        $"FFFF FFFF 7329 2316 0D06 0200 0003 0810"            /* ÿÿÿÿs)#......... */
+        $"1A27 2F59 B7C6 C6C7 C7C7 C7C7 C7C7 C7C7"            /* .'/Y·ÆÆÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7 C7C7"            /* ÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇÇ */
+        $"C7C5 C689 372D 2015 0C06 0200 0003 070E"            /* ÇÅƉ7- ......... */
+        $"1723 3037 3C46 4C4F 5050 5050 5050 5050"            /* .#07<FLOPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"5050 5050 5050 5050 5050 5050 5050 5050"            /* PPPPPPPPPPPPPPPP */
+        $"4D49 4138 352A 1D13 0A05 0100 0003 060C"            /* MIA85*..Â....... */
+        $"141E 2934 3D44 494C 4D4E 4E4E 4E4E 4E4E"            /* ..)4=DILMNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E"            /* NNNNNNNNNNNNNNNN */
+        $"4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4E 4E4D"            /* NNNNNNNNNNNNNNNM */
+        $"4B46 4039 2F24 1910 0904 0100 0002 050A"            /* KF@9/$..Æ...... */
+        $"1018 212B 3339 3D40 4142 4242 4242 4242"            /* ..!+39=@ABBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4242"            /* BBBBBBBBBBBBBBBB */
+        $"4242 4242 4242 4242 4242 4242 4242 4140"            /* BBBBBBBBBBBBBBA@ */
+        $"3F3B 352F 261D 140D 0703 0100 0002 0407"            /* ?;5/&........... */
+        $"0C12 1920 272C 2F32 3233 3333 3333 3333"            /* ... ',/223333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3333"            /* 3333333333333333 */
+        $"3333 3333 3333 3333 3333 3333 3333 3332"            /* 3333333333333332 */
+        $"302D 2924 1D16 0F09 0502 0100 0001 0305"            /* 0-)$...Æ........ */
+        $"080D 1217 1C1F 2223 2425 2525 2525 2525"            /* ......"#$%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2525"            /* %%%%%%%%%%%%%%%% */
+        $"2525 2525 2525 2525 2525 2525 2525 2524"            /* %%%%%%%%%%%%%%%$ */
+        $"2221 1E19 1510 0B07 0402 0000 0000 0103"            /* "!.............. */
+        $"0609 0C10 1315 1718 1919 1919 1919 1919"            /* .Æ.............. */
+        $"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+        $"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+        $"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+        $"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+        $"1919 1919 1919 1919 1919 1919 1919 1919"            /* ................ */
+        $"1919 1919 1919 1919 1919 1919 1919 1918"            /* ................ */
+        $"1716 1411 0E0A 0704 0201 0000 0000 0002"            /* .....Â.......... */
+        $"0305 0709 0B0D 0E0F 0F0F 0F0F 0F0F 0F0F"            /* ...Æ............ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F 0F0F"            /* ................ */
+        $"0F0D 0C0A 0806 0402 0100 0000 0000 0001"            /* ...Â............ */
+        $"0103 0304 0607 0708 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0808 0808 0808 0808 0808 0808 0808 0808"            /* ................ */
+        $"0707 0605 0403 0201 0000 0000 0000 0000"            /* ................ */
+        $"0001 0102 0202 0203 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0303 0303 0303 0303 0303 0303 0303 0303"            /* ................ */
+        $"0202 0202 0201 0100 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+        $"0000 0000 0000 0000 0000 0000 6963 3038"            /* ............ic08 */
+        $"0000 5CBD 0000 000C 6A50 2020 0D0A 870A"            /* ..\½....jP  .‡ */
+        $"0000 0014 6674 7970 6A70 3220 0000 0000"            /* ....ftypjp2 .... */
+        $"6A70 3220 0000 004F 6A70 3268 0000 0016"            /* jp2 ...Ojp2h.... */
+        $"6968 6472 0000 0100 0000 0100 0004 0707"            /* ihdr............ */
+        $"0100 0000 000F 636F 6C72 0100 0000 0000"            /* ......colr...... */
+        $"1000 0000 2263 6465 6600 0400 0000 0000"            /* ...."cdef....... */
+        $"0100 0300 0100 0000 0100 0000 0200 0200"            /* ................ */
+        $"0000 0300 0000 006A 7032 63FF 4FFF 5100"            /* .......jp2cÿOÿQ. */
+        $"3200 0000 0001 0000 0001 0000 0000 0000"            /* 2............... */
+        $"0000 0000 0001 0000 0001 0000 0000 0000"            /* ................ */
+        $"0000 0000 0407 0101 0701 0107 0101 0701"            /* ................ */
+        $"01FF 5200 0C00 0000 0101 0504 0400 01FF"            /* .ÿR............ÿ */
+        $"5C00 1320 5058 5860 5858 6058 5860 5858"            /* \.. PXX`XX`XX`XX */
+        $"5850 5058 FF64 0011 0001 4B61 6B61 6475"            /* XPPXÿd....Kakadu */
+        $"2D76 352E 322E 31FF 9000 0A00 0000 005B"            /* -v5.2.1ÿ�.Â....[ */
+        $"D000 01FF 93CF C100 1507 F18D 1991 E793"            /* Ð..ÿ“ÏÁ...ñ�.‘ç“ */
+        $"D8B4 6B7C 459C 4F68 E4BF E0FF 0D3D C2DF"            /* Ø´k|EœOhä¿àÿ.=Âß */
+        $"FC16 8F7F 6C3A 7FEA ACD5 8632 D1AD 37A6"            /* ü.�.l:.ê¬Õ†2Ñ­7¦ */
+        $"22E3 4753 734F 3BFA 0372 1596 A8F1 7183"            /* "ãGSsO;ú.r.–¨ñqƒ */
+        $"2F17 0A65 C5C2 6A8E C0F9 1000 39CE 9180"            /* /.ÂeÅÂjŽÀù..9Α€ */
+        $"AE4A F551 B521 2839 FEE4 4D31 9F98 9F17"            /* ®JõQµ!(9þäM1Ÿ˜Ÿ. */
+        $"29F2 C91D 3B35 397E 15A1 8246 C3EA 3107"            /* )òÉ.;59~.¡‚FÃê1. */
+        $"5630 A744 5105 404A C843 0AE4 304B 4FE9"            /* V0§DQ.@JÈCÂä0KOé */
+        $"81E4 4C91 DF64 6885 8D23 6517 B254 DE23"            /* �äL‘ßdh…�#e.²TÞ# */
+        $"6101 3C94 9245 923D 4F4C 0F02 784C F319"            /* a.<”’E’=OL..xLó. */
+        $"CFC0 FC11 7EC2 D9C4 3907 5FDC 553A F1E1"            /* ÏÀü.~ÂÙÄ9._ÜU:ñá */
+        $"F2BC 6420 59D8 7D25 F42A 5BA5 8E8E 7166"            /* ò¼d YØ}%ô*[¥ŽŽqf */
+        $"AD5D 5C91 CC75 1452 ACDA 64CA 3249 CCE3"            /* ­]\‘Ìu.R¬ÚdÊ2IÌã */
+        $"6874 83E2 633E 64E7 8159 4AA2 FD3C 638D"            /* htƒâc>dç�YJ¢ý<c� */
+        $"F978 C3ED 328F C0F2 1F81 A80C BB81 9421"            /* ùxÃí2�Àò.�¨.»�”! */
+        $"980D F457 0EA7 7782 676F 2AB3 EE8F 99C2"            /* ˜.ôW.§w‚go*³î�™Â */
+        $"2221 9D95 8C80 C3A8 91F3 4C08 6A03 DE45"            /* "!�•Œ€Ã¨‘óL.j.ÞE */
+        $"A985 9B7B 9ED3 A9A4 D929 A97F A125 FE22"            /* ©…›{žÓ©¤Ù)©.¡%þ" */
+        $"A893 77F3 EF0F C15C 3969 A153 3A7C 3110"            /* ¨“wóï.Á\9i¡S:|1. */
+        $"7A9C 9227 D2F6 BCA8 1A04 0219 8F36 21B7"            /* zœ’'Òö¼¨....�6!· */
+        $"B37C 2AB6 678A 1675 BA9E 03B4 53BA 33B9"            /* ³|*¶gŠ.uºž.´Sº3¹ */
+        $"06AD 96D8 BDBC BFC8 5134 C040 7EBA B756"            /* .­–ؽ¼¿ÈQ4À@~º·V */
+        $"E619 DC67 BC83 BB39 AA42 65E1 5BBC 45B4"            /* æ.Üg¼ƒ»9ªBeá[¼E´ */
+        $"ECB6 E6ED D098 3C9F E17B 876D A039 553E"            /* ì¶æíИ<Ÿá{‡m 9U> */
+        $"5CF9 2D3F 6F47 4854 7085 62C1 C65D C07C"            /* \ù-?oGHTp…bÁÆ]À| */
+        $"86A0 3E43 500F 90D0 4787 8CE8 726C 5109"            /* † >CP.�ÐG‡ŒèrlQÆ */
+        $"FD68 8099 E8FE 2A66 2F02 78F5 C78B 6A34"            /* ýh€™èþ*f/.xõÇ‹j4 */
+        $"0A9E 25FE 0DE3 E3C8 BD7B 3530 98D5 CF03"            /* ž%þ.ããȽ{50˜ÕÏ. */
+        $"CE64 A57D 620C 87C5 65B4 7BE1 34BC 3058"            /* Îd¥}b.‡Åe´{á4¼0X */
+        $"572A 9EBF 5E0C 5A01 80A3 B334 DF5A E1B8"            /* W*ž¿^.Z.€£³4ßZḠ*/
+        $"08C3 5C30 2CC4 C1F5 1341 F516 40FA 8A00"            /* .Ã\0,ÄÁõ.Aõ.@úŠ. */
+        $"477D B516 AD2F 4DD3 BE8C 58F0 7C77 A236"            /* G}µ.­/MÓ¾ŒXð|w¢6 */
+        $"DD43 6611 D582 F050 DC31 59D0 194D A6FD"            /* ÝCf.Õ‚ðPÜ1YÐ.M¦ý */
+        $"652E FA16 4BA7 25FE 0DE3 E3D9 B950 06E2"            /* e.ú.K§%þ.ããÙ¹P.â */
+        $"3A8A DA86 827A 4C68 5798 55FC FD46 A583"            /* :ŠÚ†‚zLhW˜UüýF¥ƒ */
+        $"064D 8FB0 29D9 8DAD 53CC 5229 B675 ACAB"            /* .M�°)Ù�­SÌR)¶u¬« */
+        $"8EED 34BC 2F12 142E 446C 0DF7 0BC3 D6E7"            /* Ží4¼/...Dl.÷.ÃÖç */
+        $"A086 8D72 6AE7 9270 B97C D981 C7F1 C38A"            /*  †�rjç’p¹|Ù�ÇñÊ */
+        $"47EE E585 FC19 FCE3 668C C7E0 471F 813C"            /* Gîå…ü.üãfŒÇàG.�< */
+        $"3F02 0005 B422 0345 FC66 9A91 446D DDCA"            /* ?...´".Eüfš‘DmÝÊ */
+        $"449B CCDB 8E8F A0B8 3942 A8FC 6409 F7F3"            /* D›ÌÛŽ� ¸9B¨üdÆ÷ó */
+        $"ED01 353A 2B01 1B0C 2939 619B 9890 94E7"            /* í.5:+...)9a›˜�”ç */
+        $"5FDA 75F2 7323 BF3A 7AED 757E 42D6 C336"            /* _Úuòs#¿:zíu~BÖÃ6 */
+        $"E74E 6B5F 2D43 4780 CA1C C462 6507 4801"            /* çNk_-CG€Ê.Äbe.H. */
+        $"EDEF 5B2A 7297 8FC6 1E13 E7FA 56B5 4279"            /* íï[*r—�Æ..çúVµBy */
+        $"5BB4 B307 F4DE E273 4FC3 E9B1 72C3 EDA2"            /* [´³.ôÞâsOÃé±rÃí¢ */
+        $"A3F0 A9E0 FB5D C018 B35C 8B45 CD63 99FE"            /* £ð©àû]À.³\‹EÍc™þ */
+        $"11FB 8993 21D1 BA8B 69EB 5CB9 F258 468F"            /* .û‰“!Ѻ‹ië\¹òXF� */
+        $"73D4 6804 C6E6 045E AE54 954C D0E5 D836"            /* sÔh.Ææ.^®T•LÐåØ6 */
+        $"EA0D DB9A 2806 36FA B3E9 5973 789D 6591"            /* ê.Ûš(.6ú³éYsx�e‘ */
+        $"1EC2 F271 E9E2 5681 C542 A2FC F4EF 8111"            /* .ÂòqéâV�ÅB¢üôï�. */
+        $"59D5 FC91 9749 52A3 EA37 B239 4939 8625"            /* YÕü‘—IR£ê7²9I9†% */
+        $"F248 18D2 075A 80A1 8005 9ED2 437F C705"            /* òH.Ò.Z€¡€.žÒC.Ç. */
+        $"2BFD 308C F1F0 E1BC 8FDA F5D5 50D9 9770"            /* +ý0Œñðá¼�ÚõÕPÙ—p */
+        $"7EF5 213F 91F6 5B8B 189D EE67 70EF F40A"            /* ~õ!?‘ö[‹.�îgpïô */
+        $"2E24 C54B F37D 4941 FCD2 7779 5C8B 59CC"            /* .$ÅKó}IAüÒwy\‹YÌ */
+        $"F284 3377 A496 0399 6F17 47AC B5EA 3A84"            /* ò„3w¤–.™o.G¬µê:„ */
+        $"844E DC13 D058 BE9F 1BBE 8CE0 E615 D2E1"            /* „NÜ.ÐX¾Ÿ.¾Œàæ.Òá */
+        $"88A5 9DA6 9FB4 4EDE B804 ED14 A7EA 54E0"            /* ˆ¥�¦Ÿ´NÞ¸.í.§êTà */
+        $"5A87 311B 5E69 70F5 EDA3 2E78 8862 7603"            /* Z‡1.^ipõí£.xˆbv. */
+        $"7761 094D 4A69 5AB0 A9BB 3F4F 92BE 205B"            /* waÆMJiZ°©»?O’¾ [ */
+        $"A226 24D5 C8B2 CCF7 E064 31C7 E727 6E2C"            /* ¢&$ÕȲÌ÷àd1Çç'n, */
+        $"D6A1 347F 41CD 5F70 E1C0 1AFC 4FBC 81A9"            /* Ö¡4.AÍ_páÀ.üO¼�© */
+        $"A884 F03A CD84 B581 1F03 A523 838B 8038"            /* ¨„ð:Í„µ�..¥#ƒ‹€8 */
+        $"02F4 6DE8 98FC EDD6 B331 21F7 4AC5 A31E"            /* .ômè˜üíÖ³1!÷JÅ£. */
+        $"9EB4 E770 D465 386E 18A6 D1BE EF6D B008"            /* ž´çpÔe8n.¦Ñ¾ïm°. */
+        $"63E6 1066 1374 4D10 3270 8C7F F297 F91D"            /* cæ.f.tM.2pŒ.ò—ù. */
+        $"DA61 677B 29FD A878 B122 E33C 17E3 8ED1"            /* Úag{)ý¨x±"ã<.ãŽÑ */
+        $"FB8E 4407 8B82 32AD 1B50 09DF BDA8 C80E"            /* ûŽD.‹‚2­.PÆß½¨È. */
+        $"7E28 ED9D A005 4297 B9C1 8D66 CA77 C41D"            /* ~(í� .B—¹Á�fÊwÄ. */
+        $"41C5 E3B3 F94D 96E5 1308 7C59 1EB8 0871"            /* AÅã³ùM–å..|Y.¸.q */
+        $"C7A4 FED7 47F2 F800 6889 A21D 1FF4 9E93"            /* Ǥþ×Gòø.h‰¢..ôž“ */
+        $"1321 7377 D96E 86F5 A0CB EB17 C77A 81C0"            /* .!swÙn†õ Ëë.Çz�À */
+        $"7C8D A01F 0E91 00F9 1D00 94FD 4D32 E5DB"            /* |� ..‘.ù..”ýM2åÛ */
+        $"0482 DEB8 CF1C 792A EA3B DECA 4470 4898"            /* .‚Þ¸Ï.y*ê;ÞÊDpH˜ */
+        $"81C0 5457 FE66 63DD CAF3 0B98 08E1 DC3F"            /* �ÀTWþfcÝÊó.˜.áÜ? */
+        $"CF68 7F31 9BEE 73EF A3A5 8D57 8969 EEC3"            /* Ïh.1›îs�W‰iîà */
+        $"0F13 3ED9 390D FC4C B37F C4F7 01E4 B115"            /* ..>Ù9.üL³.Ä÷.ä±. */
+        $"E9F9 9526 00FA 10D0 0D64 4CC5 8481 D231"            /* éù•&.ú.Ð.dLÅ„�Ò1 */
+        $"DE6D 483E 8046 7F58 5BD3 1FFC CF82 297A"            /* ÞmH>€F.X[Ó.üÏ‚)z */
+        $"88A1 7E78 0668 3222 9E8B A287 30A3 DB10"            /* ˆ¡~x.h2"ž‹¢‡0£Û. */
+        $"A77F A842 87FC 164E 92B8 96DF 4920 EEC2"            /* §.¨B‡ü.N’¸–ßI î */
+        $"47B6 83F1 F68F 9309 63CE FAAC 3C8F 9FCF"            /* G¶ƒñö�“ÆcÎú¬<�ŸÏ */
+        $"A166 9621 ADC0 0ABB 7F1A 7E3C A4AD 3755"            /* ¡f–!­À»..~<¤­7U */
+        $"E2D8 E26D CAD1 6F24 F808 BC0D E94B EEBC"            /* âØâmÊÑo$ø.¼.éKî¼ */
+        $"D601 C1F5 30C1 F53B C0FA 97C0 90E6 901B"            /* Ö.Áõ0Áõ;Àú—À�æ�. */
+        $"71C2 1EAB 8A4C 52A4 4431 058C DFB9 4148"            /* qÂ.«ŠLR¤D1.Œß¹AH */
+        $"185C 1E93 01C6 82D3 C81B 6398 8173 189D"            /* .\.“.Æ‚ÓÈ.c˜�s.� */
+        $"F73C 4887 5155 0C95 0088 4C69 0A27 3F39"            /* ÷<H‡QU.•.ˆLiÂ'?9 */
+        $"8CCA 32D8 1FD7 A3F4 CDD8 6275 5E7E 3619"            /* ŒÊ2Ø.×£ôÍØbu^~6. */
+        $"8D18 68C9 D2C7 0FCB 18EA FB01 5A68 4A52"            /* �.hÉÒÇ.Ë.êû.ZhJR */
+        $"3C08 5313 5ED2 9B7D 31B5 953C 2F92 22F7"            /* <.S.^Ò›}1µ•</’"÷ */
+        $"3764 04E8 A9A6 C747 8DFD 9730 01DD 82E1"            /* 7d.試ÇG�ý—0.Ý‚á */
+        $"B08A FD72 7C33 A9BF AFEA 7188 AC4B 2B45"            /* °Šýr|3©¿¯êqˆ¬K+E */
+        $"BBB2 7826 6704 5864 9BAF 91FC 6BD3 E9D7"            /* »²x&g.Xd›¯‘ükÓé× */
+        $"0E30 E428 0FB2 4836 F94F 7CB9 3723 72A2"            /* .0ä(.²H6ùO|¹7#r¢ */
+        $"AB4C C0EB ED8F 823B B8D6 C4A6 E4B5 B41C"            /* «LÀëí�‚;¸ÖĦ䵴. */
+        $"B0FC 0171 880F E77C 1EF8 9645 A8B4 969A"            /* °ü.qˆ.ç|.ø–E¨´–š */
+        $"5420 86B9 71CE 0DE5 7A40 B41A DD85 6B30"            /* T †¹qÎ.åz@´.Ý…k0 */
+        $"F02A 3B61 92B4 7A95 269E BF9F DDB3 9FB7"            /* ð*;a’´z•&ž¿ŸÝ³Ÿ· */
+        $"746B 1514 C89D 391B F835 73B8 0F1C 2567"            /* tk..È�9.ø5s¸..%g */
+        $"A0C2 6B37 DFCE 5F4C 1DCD FD79 5CDA A8FF"            /*  Âk7ßÎ_L.Íýy\Ú¨ÿ */
+        $"0603 9014 308F AEB3 EDB7 D721 1709 3897"            /* ..�.0�®³í·×!.Æ8— */
+        $"D3AB 181E 53BE 4025 3492 41C2 5EC7 BFC0"            /* Ó«..S¾@%4’AÂ^Ç¿À */
+        $"EA12 19D0 6158 530B A57B 8A2B 8DFF 18AF"            /* ê..ÐaXS.¥{Š+�ÿ.¯ */
+        $"7651 65CF CD26 3F05 987E 0760 9C3C E3A6"            /* vQeÏÍ&?.˜~.`œ<㦠*/
+        $"86C0 DAB4 C6ED 7F19 8034 85FE DA7E 7963"            /* †ÀÚ´Æí..€4…þÚ~yc */
+        $"AFF2 9CBE 6AAA B6BB B2D3 6F41 BB45 B1EB"            /* ¯òœ¾jª¶»²ÓoA»E±ë */
+        $"9CC2 8803 907A 5CE1 F2D9 AF69 FF22 7DE8"            /* œÂˆ.�z\áòÙ¯iÿ"}è */
+        $"D328 C2A1 0F97 2EE2 9575 E0E6 A665 B85A"            /* Ó(¡.—.â•uàæ¦e¸Z */
+        $"C5D7 6FA0 FE24 BC68 9D74 6CEB C4F9 615C"            /* Å×o þ$¼h�tlëÄùa\ */
+        $"4F34 48B3 7A64 2540 B64F EFBE 8D0F E427"            /* O4H³zd%@¶Oï¾�.ä' */
+        $"4CCA 6DB3 83AC C5F6 EE52 7A43 8172 41E4"            /* LÊm³ƒ¬ÅöîRzC�rAä */
+        $"2CE3 DF2F 1496 97DE 6AD1 2FFF 7E52 D993"            /* ,ãß/.–—ÞjÑ/ÿ~RÙ“ */
+        $"8AF9 AAA3 B192 0991 BFAE 4829 001E 963B"            /* Šùª£±’Æ‘¿®H)..–; */
+        $"019C 8A5D 78E8 6A56 F78C B81A F4D0 6312"            /* .œŠ]xèjV÷Œ¸.ôÐc. */
+        $"C0C4 A9BF 7CA5 75D9 9C23 F3EA 4F39 B325"            /* ÀÄ©¿|¥uÙœ#óêO9³% */
+        $"F6DE 6EF4 7D48 A279 8EA9 5395 0FBC C63F"            /* öÞnô}H¢yŽ©S•.¼Æ? */
+        $"679F CE93 2206 ECA9 079C 2BB7 D094 6A7B"            /* gŸÎ“".ì©.œ+·Ð”j{ */
+        $"1077 277F 88A6 21AE 84C3 EDD4 38FC 36B2"            /* .w'.ˆ¦!®„ÃíÔ8ü6² */
+        $"1F86 8F00 8F56 8825 7713 9061 800A A4CD"            /* .†�.�Vˆ%w.�a€Â¤Í */
+        $"E3D3 0F3C B0AC 0C87 E368 8544 F251 5C39"            /* ãÓ.<°¬.‡ãh…DòQ\9 */
+        $"7D90 1BEF 7805 D624 7380 0A19 E093 3058"            /* }�.ïx.Ö$s€Â.à“0X */
+        $"1C90 467F 5C70 4932 3947 4A95 A450 36C8"            /* .�F.\pI29GJ•¤P6È */
+        $"D4D5 CA85 9922 FA12 D0D8 96CA 9A2F 40A2"            /* ÔÕÊ…™"ú.ÐØ–Êš/@¢ */
+        $"F105 054F 8C56 C164 85B5 C4E6 3EAB D76A"            /* ñ..OŒVÁd…µÄæ>«×j */
+        $"A227 4F09 072C 4682 9B0F 995C 7551 94E7"            /* ¢'OÆ.,F‚›.™\uQ”ç */
+        $"419A 0098 0283 19E8 0489 687B 4F66 B74C"            /* Aš.˜.ƒ.è.‰h{Of·L */
+        $"7F59 C07A A552 B04D 628F E401 E55C A4ED"            /* .YÀz¥R°Mb�ä.å\¤í */
+        $"390F C34D 81BB 9F88 0C50 F50F 9FBD A377"            /* 9.ÃM�»Ÿˆ.Põ.Ÿ½£w */
+        $"F538 3F9C E243 FF47 D346 87F2 444B C479"            /* õ8?œâCÿGÓF‡òDKÄy */
+        $"F6B3 1C76 5125 F487 0FAF 294A DA20 EC56"            /* ö³.vQ%ô‡.¯)JÚ ìV */
+        $"07AB DE07 14C2 1721 F3E0 D687 1F67 039D"            /* .«Þ..Â.!óàÖ‡.g.� */
+        $"461F 0D82 9CAA B2D4 DFC6 6AA5 D31E 4D01"            /* F..‚œª²ÔßÆj¥Ó.M. */
+        $"5AC2 B2BD FD97 7D6E 00D1 7ADF 377C 15A7"            /* Z²½ý—}n.Ñzß7|.§ */
+        $"9681 C7B2 8168 D706 425B 35EF 7298 C053"            /* –�Dz�h×.B[5ïr˜ÀS */
+        $"E198 B5E2 B835 712B 1AD8 BA77 CF86 83A3"            /* ᘵâ¸5q+.غwφƒ£ */
+        $"B0B9 C5E6 F37A A3DE D93B 8EC8 132F A52A"            /* °¹Åæóz£ÞÙ;ŽÈ./¥* */
+        $"AB20 E166 F719 7130 6482 5BE2 605B D78E"            /* « áf÷.q0d‚[â`[׎ */
+        $"672D 7AE6 3906 DA75 0E3D 1962 8A60 9294"            /* g-zæ9.Úu.=.bŠ`’” */
+        $"1FC8 C0F3 216D 815D 4DDE 5DDE D8AB 3F9C"            /* .ÈÀó!m�]MÞ]ÞØ«?œ */
+        $"7F9F 24B3 7BBF CCB9 2F80 19B6 70AE 1B3D"            /* .Ÿ$³{¿Ì¹/€.¶p®.= */
+        $"C71A 1F7C 81D2 639F 0D03 24EA D4B1 D351"            /* Ç..|�ÒcŸ..$êÔ±ÓQ */
+        $"DD10 FBD5 EA3F 4957 A7ED 04C6 384D C10F"            /* Ý.ûÕê?IW§í.Æ8MÁ. */
+        $"8A55 0C03 694F 0D18 70D8 0AC3 33C0 17D1"            /* ŠU..iO..pØÂÃ3À.Ñ */
+        $"73BB E85F 5204 090F FDFE 8AC5 9AD6 22D5"            /* s»è_R.Æ.ýþŠÅšÖ"Õ */
+        $"CA31 A6DE EF44 D910 B34A 0E59 7866 536F"            /* Ê1¦ÞïDÙ.³J.YxfSo */
+        $"9B0B A341 3AB8 C06C C64F 3F86 8160 DFB9"            /* ›.£A:¸ÀlÆO?†�`ß¹ */
+        $"A709 59D8 88C3 3316 9FFA F83F 5120 E40E"            /* §ÆY؈Ã3.Ÿúø?Q ä. */
+        $"4DEA C88F C418 37F6 4C0B 7606 9632 EEC5"            /* MêÈ�Ä.7öL.v.–2îÅ */
+        $"6380 FB25 A69F AAE2 0888 B722 008F 35CB"            /* c€û%¦Ÿªâ.ˆ·".�5Ë */
+        $"F6A7 90BF D0DB 6367 A14B 5A86 EE98 FD18"            /* ö§�¿ÐÛcg¡KZ†î˜ý. */
+        $"A629 1BAB 3BE2 920D E99D BEC2 88B4 F909"            /* ¦).«;â’.é�¾Âˆ´ùÆ */
+        $"66B1 535D 3940 AF78 8200 0C46 142A EA2A"            /* f±S]9@¯x‚..F.*ê* */
+        $"A991 95E8 FD2B D30B 0E4A 76E2 A97B FAA7"            /* ©‘•èý+Ó..Jvâ©{ú§ */
+        $"97E2 9B30 54FA 5E97 962A 7E83 5711 A707"            /* —â›0Tú^—–*~ƒW.§. */
+        $"2A21 3729 2046 9C41 8282 A161 E5F6 AB24"            /* *!7) FœA‚‚¡aåö«$ */
+        $"3324 74CF 1AF6 C935 D884 0008 DC18 663C"            /* 3$tÏ.öÉ5Ø„..Ü.f< */
+        $"3A00 25E4 92D7 8F23 4C07 3C63 DB6E 4924"            /* :.%ä’×�#L.<cÛnI$ */
+        $"7362 34C9 2F1D 105B 97E2 03BF 648F C21C"            /* sb4É/..[—â.¿d�Â. */
+        $"C6AC 3657 2C72 ADAA 2889 0623 6A5D ACEC"            /* Ƭ6W,r­ª(‰.#j]¬ì */
+        $"3210 738F 51F5 CC65 9EA9 7AD3 95CB B265"            /* 2.s�QõÌež©zӕ˲e */
+        $"D54E 6E1D E2A7 2673 E6C2 C247 2FFD C10E"            /* ÕNn.â§&sæÂÂG/ýÁ. */
+        $"5FC5 C1E1 2511 5C8F 6063 92AB E4B9 8212"            /* _ÅÁá%.\�`c’«ä¹‚. */
+        $"3643 6D53 2492 3E58 3E71 15E3 A3B7 AB2A"            /* 6CmS$’>X>q.㣷«* */
+        $"A998 FE5A 74DB 537A CE3D CD46 49B6 DB6D"            /* ©˜þZtÛSzÎ=ÍFI¶Ûm */
+        $"B6DB 6DB2 8EE9 1D6F 6480 8613 D8D2 7D8F"            /* ¶Ûm²Žé.od€†.ØÒ}� */
+        $"5615 3EAB B25B 722D ECB8 ED12 70F2 BA06"            /* V.>«²[r-ì¸í.pòº. */
+        $"E5A2 45C1 547C F861 A7D5 8E1C 08BC 346B"            /* å¢EÁT|øa§ÕŽ..¼4k */
+        $"2730 C670 2FD8 F159 6ABE 2092 ED98 AC34"            /* '0Æp/ØñYj¾ ’혬4 */
+        $"B4CA 8565 90CF 0034 6E68 F777 9672 F29D"            /* ´Ê…e�Ï.4nh÷w–rò� */
+        $"4621 6E73 9C90 5C3D A8DB F5B0 CACF A63E"            /* F!nsœ�\=¨Ûõ°ÊϦ> */
+        $"861E 8B9E F490 8E15 69BC A01D EF59 E898"            /* †.‹žô�Ž.i¼ .ïYè˜ */
+        $"7040 B817 5AA9 BFB1 09A0 FE74 D2F7 BEA8"            /* p@¸.Z©¿±Æ þtÒ÷¾¨ */
+        $"A4F3 FEAC 38A4 409E B504 9CC9 EAA3 533B"            /* ¤óþ¬8¤@žµ.œÉê£S; */
+        $"153D F710 FC9E 2055 A395 C374 2AF9 E7C5"            /* .=÷.üž U£•Ãt*ùçÅ */
+        $"E1E8 7F74 3CDB D568 B606 A9D5 B7AE E207"            /* áè.t<ÛÕh¶.©Õ·®â. */
+        $"947E 2E65 1C27 336D 927A 4F86 5422 0E04"            /* ”~.e.'3m’zO†T".. */
+        $"42C7 668A 9403 EAB7 21A3 C9F1 18BC 5380"            /* BÇfŠ”.ê·!£Éñ.¼S€ */
+        $"BED7 07B5 F9B1 B798 8727 D54A 7A6E E493"            /* ¾×.µù±·˜‡'ÕJznä“ */
+        $"5271 F27D 7C35 DCEE D0BC CB31 C1FB 879F"            /* Rqò}|5ÜîмË1Áû‡Ÿ */
+        $"E074 9EB9 D7BE C9ED D2C8 BD00 C7FC D05B"            /* àtž¹×¾ÉíÒȽ.ÇüÐ[ */
+        $"2B2C 9647 A924 9F22 A06D 62B4 A946 77B7"            /* +,–G©$Ÿ" mb´©Fw· */
+        $"AD6D 60EE C841 997D A7E8 7AD2 AFA8 EEC4"            /* ­m`îÈA™}§èzÒ¯¨îÄ */
+        $"D61F FC06 FD7A E761 AA33 0F74 A08F 8E5B"            /* Ö.ü.ýzçaª3.t �Ž[ */
+        $"B7C0 7C9A 1201 F0F5 6403 E4D0 60D8 92D9"            /* ·À|š..ðõd.äÐ`Ø’Ù */
+        $"84ED 064F 1B29 D7A7 1D77 F4B3 61D6 2651"            /* „í.O.)ק.wô³aÖ&Q */
+        $"329E 2CA5 53B4 956D 1061 3A3A A73B FC8E"            /* 2ž,¥S´•m.a::§;üŽ */
+        $"DD3C 60C9 F855 32FB 3C04 6287 50F7 6BB3"            /* Ý<`ÉøU2û<.b‡P÷k³ */
+        $"B84A 05A6 3145 A832 3BBC CA56 115B 9D7F"            /* ¸J.¦1E¨2;¼ÊV.[�. */
+        $"8ADB 5660 429D 1FF6 4E6D 4899 EFDA 592F"            /* ŠÛV`B�.öNmH™ïÚY/ */
+        $"19DC 9790 802A 1C17 2250 ADEC 0312 2C23"            /* .Ü—�€*.."P­ì..,# */
+        $"223B 1EC8 482C 6E26 DD67 528F 7CDC 1841"            /* ";.ÈH,n&ÝgR�|Ü.A */
+        $"DBCB CF9E 6D26 B564 4FD4 0AB5 DA0B ADE2"            /* ÛËÏžm&µdOÔµÚ.­â */
+        $"C129 D895 00FF 105B 0D0B F4DB 286A B347"            /* Á)Ø•.ÿ.[..ôÛ(j³G */
+        $"A261 30A9 0A9B 7A0D 585B 3991 3217 6FF7"            /* ¢a0©Â›z.X[9‘2.o÷ */
+        $"A368 D6A8 E862 161A 3584 613E 04D9 DBCB"            /* £hÖ¨èb..5„a>.ÙÛË */
+        $"4D96 66A3 B736 F802 D67A 309F 04E6 AFD8"            /* M–f£·6ø.Öz0Ÿ.æ¯Ø */
+        $"888E A8A5 4461 F1F0 1B6B 2DC4 0DFE C676"            /* ˆŽ¨¥Dañð.k-Ä.þÆv */
+        $"8D4E 3750 C3E6 C233 EFC5 368B 6113 5B53"            /* �N7PÃæÂ3ïÅ6‹a.[S */
+        $"08E0 C259 1B88 AA0C 74B0 862E 1024 BB3F"            /* .àÂY.ˆª.t°†..$»? */
+        $"2816 B320 715C 5DFA 9FF0 CBC3 6A85 777A"            /* (.³ q\]úŸðËÃj…wz */
+        $"23CB F89B D813 6706 313E 2CF5 A163 0848"            /* #Ëø›Ø.g.1>,õ¡c.H */
+        $"94C9 3288 B556 53DD 2A45 2302 F28E 7ED1"            /* ”É2ˆµVSÝ*E#.òŽ~Ñ */
+        $"B5A0 67C8 53BB 4CE4 45D9 317F 92AB B13B"            /* µ gÈS»LäEÙ1.’«±; */
+        $"7246 F6DE 5348 49C9 42A1 CA62 64B0 209E"            /* rFöÞSHIÉB¡Êbd° ž */
+        $"43F2 DF7C 9BBC 097F C94A EA52 8D01 ADEF"            /* Còß|›¼Æ.ÉJêR�.­ï */
+        $"5241 7C9B 2876 75F4 D748 AF9D 6FBB 3306"            /* RA|›(vuô×H¯�o»3. */
+        $"0AD1 3953 6C99 5BB7 F1F5 1C1F BCE7 CA83"            /* ÂÑ9Sl™[·ñõ..¼çʃ */
+        $"08C1 6811 FBC5 AE18 343C C6F5 E515 F9CF"            /* .Áh.ûÅ®.4<Æõå.ùÏ */
+        $"FE48 C6E9 956E 6712 DDCA D62C 7F37 6DFE"            /* þHÆé•ng.ÝÊÖ,.7mþ */
+        $"2465 A8EE 1BAF E106 CA62 101F 0144 31DC"            /* $e¨î.¯á.Êb...D1Ü */
+        $"029E ED0F 9E47 F22E 0C17 0D31 E60B 1662"            /* .ží.žGò....1æ..b */
+        $"C1F5 5C90 7D5A 6D03 EAB6 C0C8 1653 E821"            /* Áõ\�}Zm.ê¶ÀÈ.Sè! */
+        $"5860 ED0B C711 39E5 E5C8 268D 2246 E3FB"            /* X`í.Ç.9ååÈ&�"Fãû */
+        $"68A4 3B12 A487 350D FE94 3722 65AC 949B"            /* h¤;.¤‡5.þ”7"e¬”› */
+        $"2526 7CD5 0E28 E093 CFE8 314C BE18 5B60"            /* %&|Õ.(à“Ïè1L¾.[` */
+        $"827E 154B 9609 2536 F890 A361 BA29 8211"            /* ‚~.K–Æ%6ø�£aº)‚. */
+        $"AF42 BEC6 1BCB CE6D 2910 8083 C890 D7FF"            /* ¯B¾Æ.ËÎm).€ƒÈ�×ÿ */
+        $"6F04 CEF4 F47C 0D92 00BD D90F 4095 0A48"            /* o.Îôô|.’.½Ù.@•ÂH */
+        $"4DC6 210C 351D 34A5 5FDA E576 1E1B 1684"            /* MÆ!.5.4¥_Úåv...„ */
+        $"F2A0 B30A 589C 1DBC 4831 E906 0D67 0CDD"            /* ò ³ÂXœ.¼H1é..g.Ý */
+        $"876B 994F 6D66 47DD AF40 7158 4385 738E"            /* ‡k™OmfGݯ@qXC…sŽ */
+        $"82F8 E637 9B5C 7389 0AA5 2A04 D105 5E88"            /* ‚øæ7›\s‰Â¥*.Ñ.^ˆ */
+        $"C2A2 2943 E125 6C2F 0AD1 1E5C AF1F CFF6"            /* ¢)Cá%l/ÂÑ.\¯.Ïö */
+        $"B39B C799 0F39 6151 6625 BB66 C3C3 418B"            /* ³›Ç™.9aQf%»fÃÃA‹ */
+        $"90A4 F6F7 BD30 7A04 88E6 0F8A 3F0B FF2C"            /* �¤ö÷½0z.ˆæ.Š?.ÿ, */
+        $"D18B 1D88 1442 EB54 A6FC D226 251A 015D"            /* Ñ‹.ˆ.BëT¦üÒ&%..] */
+        $"4DA8 32CA 371B 86EB 4E89 1415 9A41 6AD2"            /* M¨2Ê7.†ëN‰..šAjÒ */
+        $"1F0F 7656 41E5 B874 72E7 5F88 ABDA 28D7"            /* ..vVAå¸trç_ˆ«Ú(× */
+        $"37D5 EE40 567F F751 2591 01A3 03B9 EFCD"            /* 7Õî@V.÷Q%‘.£.¹ïÍ */
+        $"E0A8 8CC8 8C8E 0945 3036 453A 1787 59C4"            /* ਌ȌŽÆE06E:.‡YÄ */
+        $"B99C 02D2 D5F6 1B5E E34C 551E 8C43 9A20"            /* ¹œ.ÒÕö.^ãLU.ŒCš  */
+        $"981D 0B44 C6D1 E6AA 2B92 5F33 8016 C4F1"            /* ˜..DÆÑæª+’_3€.Äñ */
+        $"7AA6 E605 4676 A533 1D38 6ADA 9BC6 2C13"            /* z¦æ.Fv¥3.8jÚ›Æ,. */
+        $"385A 3DCE 7E2E B9A1 81BB 27C6 AFF8 FF5D"            /* 8Z=Î~.¹¡�»'Ưøÿ] */
+        $"A511 4C25 DC70 082C B597 3EC4 004C D4B8"            /* ¥.L%Üp.,µ—>Ä.LÔ¸ */
+        $"BE6A B79D EF70 2610 B57B FEFE 6ACC 9EEE"            /* ¾j·�ïp&.µ{þþjÌžî */
+        $"B94A 73A8 4B30 C207 7391 789E C0FE 6992"            /* ¹Js¨K0Â.s‘xžÀþi’ */
+        $"AB13 E2AA FF53 4B22 A338 0EA3 B476 D732"            /* «.âªÿSK"£8.£´v×2 */
+        $"EDA3 2009 3422 B4AA 64DE 26C3 5894 D6DD"            /* í£ Æ4"´ªdÞ&ÃX”ÖÝ */
+        $"F7A9 5A3B 6F31 5D2C EC22 1FAC 928B 647F"            /* ÷©Z;o1],ì".¬’‹d. */
+        $"1600 A961 11C3 FD11 E594 81F9 E0AC 20D4"            /* ..©a.Ãý.å”�ùà¬ Ô */
+        $"0DCA 9CE0 FF14 3BE3 3010 00E1 9DFE F0C8"            /* .Êœàÿ.;ã0..á�þðÈ */
+        $"70E7 D3A5 A7F9 884E 6941 CBCB FEBE 0C27"            /* pçÓ¥§ùˆNiAËËþ¾.' */
+        $"B3F5 BAA4 3068 BFC1 DB20 1E5F 9E83 BF7D"            /* ³õº¤0h¿ÁÛ ._žƒ¿} */
+        $"8EA3 8FB0 F355 FF02 DED2 5CC8 2B4D 4DA5"            /* Ž£�°óUÿ.ÞÒ\È+MM¥ */
+        $"8122 C96A CDAB B130 2D35 B73E 2EE9 0AA9"            /* �"ÉjÍ«±0-5·>.é© */
+        $"7DB8 B81D 7B0A 776B DFF3 2B02 1F6A EF5B"            /* }¸¸.{Âwkßó+..jï[ */
+        $"E6A6 177F D8C0 1C3B A88C 2154 18F3 BFB3"            /* æ¦..ØÀ.;¨Œ!T.ó¿³ */
+        $"F7EF 1249 860B F87F 60D6 AE06 B5B2 7824"            /* ÷ï.I†.ø.`Ö®.µ²x$ */
+        $"E601 91D7 1436 80CF 054C 9691 1321 B299"            /* æ.‘×.6€Ï.L–‘.!²™ */
+        $"11F3 2BA3 51F6 447E 1BC0 28CB 666B 9BA0"            /* .ó+£QöD~.À(Ëfk›  */
+        $"425A E39B 066C 1B7C 340B 950A BDCC E05D"            /* BZã›.l.|4.•Â½Ìà] */
+        $"C8DC 568C BDC6 54E9 0AA2 2D89 6E22 37E4"            /* ÈÜVŒ½ÆTé¢-‰n"7ä */
+        $"3508 39CC EE8F 8EE6 F926 626B E33F 4A06"            /* 5.9Ìî�Žæù&bkã?J. */
+        $"4CD1 AE16 9063 3119 5554 58CA BB53 4A73"            /* LѮ.�c1.UTXʻSJs */
+        $"AA2B 2A71 B86B 3E95 BED6 D9D2 9D59 3E60"            /* ª+*q¸k>•¾ÖÙÒ�Y>` */
+        $"C5D1 FA4C E6A7 880F 30D8 A679 6467 697E"            /* ÅÑúL槈.0ئydgi~ */
+        $"F327 EAA4 E0D1 01F9 9B74 AAA1 6CDD 7DA7"            /* ó'ê¤àÑ.ù›tª¡lÝ}§ */
+        $"D2AB C9CB 63D6 D3DF C778 C6ED 71A5 0571"            /* Ò«ÉËcÖÓßÇxÆíq¥.q */
+        $"C7E1 4EC7 E16C 43F0 75B1 3C9E 91EA AAAC"            /* ÇáNÇálCðu±<ž‘ꪬ */
+        $"9A2E A47E 8DF0 873E 2275 3F71 F986 DF3D"            /* š.¤~�ð‡>"u?qù†ß= */
+        $"DBE5 1F4C 0D83 C3F5 F2D4 5A7C 0BFB E4FC"            /* Ûå.L.ƒÃõòÔZ|.ûäü */
+        $"C83E D8A4 FAF4 F589 09F2 4909 40AA 2AA8"            /* È>ؤúôõ‰ÆòIÆ@ª*¨ */
+        $"C190 BE4D D484 1408 6EAD 722F 6BA6 7502"            /* Á�¾MÔ„..n­r/k¦u. */
+        $"A53F 1B9A BE86 841A FC60 53F3 8AE9 2E4C"            /* ¥?.š¾†„.ü`SóŠé.L */
+        $"4B8E 1D09 F47C 3BAA CFB7 80DE 6A41 F007"            /* KŽ.Æô|;ªÏ·€ÞjAð. */
+        $"80A3 413A C568 5C02 6166 E8AF 9B6C EF86"            /* €£A:Åh\.af诛lï† */
+        $"F178 273B A803 89E9 520A ACFC 0E98 6198"            /* ñx';¨.‰éR¬ü.˜a˜ */
+        $"6ECE D094 76D1 8AF8 1035 D0C8 B9E5 ECC9"            /* nÎДvÑŠø.5ÐȹåìÉ */
+        $"08E6 748A F28B B0E0 F9AB 71B4 7971 9626"            /* .ætŠò‹°àù«q´yq–& */
+        $"5397 5D5A 31CB 5F9E 7C98 8300 72B1 2C67"            /* S—]Z1Ë_ž|˜ƒ.r±,g */
+        $"A38D 0C02 C603 C0C2 2000 E528 0CAA 9472"            /* £�..Æ.À .å(.ª”r */
+        $"3115 8C05 0EE6 3F33 3F6D B6DB 64C7 AAB2"            /* 1.Œ..æ?3?m¶ÛdǪ² */
+        $"94EA DD85 D3DF F14E FF3F D3A2 778B 3749"            /* ”êÝ…ÓßñNÿ?Ó¢w‹7I */
+        $"B31B 6DB6 C5B6 5311 C782 3FCF 2880 6695"            /* ³.m¶Å¶S.Ç‚?Ï(€f• */
+        $"085A 35C2 3938 420E 8705 50BD 51C3 BD21"            /* .Z5Â98B.‡.P½Qý! */
+        $"41B9 C3ED 3A76 367F 40F5 DA53 3618 DF7A"            /* A¹Ãí:v6.@õÚS6.ßz */
+        $"EE11 B2D6 D9AD 4351 7D8F BC5A 7217 9352"            /* î.²ÖÙ­CQ}�¼Zr.“R */
+        $"D43F 54B9 F618 3E0E 5FF8 1599 CD00 5489"            /* Ô?T¹ö.>._ø.™Í.T‰ */
+        $"459D 1B65 0538 7A92 D8EC 6AD5 E756 776E"            /* E�.e.8z’ØìjÕçVwn */
+        $"5B66 A07C 36D6 A4B0 2E00 21E0 ABFC 2AB8"            /* [f |6Ö¤°..!à«ü*¸ */
+        $"F387 5784 0DB9 1978 67FE DEFF 0CCC CCCC"            /* ó‡W„.¹.xgþÞÿ.ÌÌÌ */
+        $"CCCC CCCC CCCC CCD3 5F84 850A F245 C370"            /* ÌÌÌÌÌÌÌÓ_„…ÂòEÃp */
+        $"786E 76C5 56A5 8C9B FC7F 6869 3085 EB26"            /* xnvÅV¥Œ›ü.hi0…ë& */
+        $"6162 A234 8BF4 868D 0BA5 77FA 56D2 31FD"            /* ab¢4‹ô†�.¥wúVÒ1ý */
+        $"7436 0147 944C 2AAE C8C1 DE46 2A3A 2449"            /* t6.G”L*®ÈÁÞF*:$I */
+        $"EAD0 8E9E FF0B 129F 7F9C 1436 A6BC 10E6"            /* êÐŽžÿ..Ÿ.œ.6¦¼.æ */
+        $"3116 7A98 5FF6 97E9 FC84 7136 FEA5 C122"            /* 1.z˜_ö—éü„q6þ¥Á" */
+        $"E58F 44D6 D7A4 0AD3 E9B4 7C91 B833 1F91"            /* å�DÖפÂÓé´|‘¸3.‘ */
+        $"5F0F D8F7 8A80 6560 B332 081A C68D 0FF9"            /* _.Ø÷Š€e`³2..Æ�.ù */
+        $"899F 2CC7 E1D6 FC7E 1DEB C3ED EA04 F55D"            /* ‰Ÿ,ÇáÖü~.ëÃíê.õ] */
+        $"017D B775 48A1 A844 EAB2 8E3A 5FF2 20AF"            /* .}·uH¡¨D겎:_ò ¯ */
+        $"6231 D1B0 D4D9 D308 999B 09F2 95B1 7071"            /* b1Ñ°ÔÙÓ.™›Æò•±pq */
+        $"F57C 1F1E 7960 4639 6A62 5BC6 9E5A D45D"            /* õ|..y`F9jb[ÆžZÔ] */
+        $"F339 9597 BF1B 62EB D128 B3D8 9BD3 52BF"            /* ó9•—¿.bëÑ(³Ø›ÓR¿ */
+        $"0703 43F9 E1C7 940E EA41 F4B1 75E4 891F"            /* ..CùáÇ”.êAô±uä‰. */
+        $"09A4 D439 7DFF 6AB7 EB4F 1253 A9C0 8BBE"            /* ƤÔ9}ÿj·ëO.S©À‹¾ */
+        $"40A0 3CE6 965D F886 A9EF 7E69 712D 41C2"            /* @ <æ–]ø†©ï~iq-A */
+        $"0062 6917 5D06 6548 9FD6 1470 4A0C 8545"            /* .bi.].eHŸÖ.pJ.…E */
+        $"8417 6C73 0C2D DF44 0E4A D5F9 7443 D629"            /* „.ls.-ßD.JÕùtCÖ) */
+        $"E62D DE53 CCFA EAEA E08A F0E1 9D37 9616"            /* æ-ÞSÌúêêàŠðá�7–. */
+        $"C0DA 1FD4 6A42 6CE6 1D10 AB6A 911A 19D2"            /* ÀÚ.ÔjBlæ..«j‘..Ò */
+        $"47A0 4AC5 6A3C 12FF 0FE8 3AFB 7DFD 3D27"            /* G JÅj<.ÿ.è:û}ý=' */
+        $"42C6 E2BA 6DDE D1ED 21CE 1EA0 F444 055B"            /* BÆâºmÞÑí!Î. ôD.[ */
+        $"122A 41EE D8C1 144C B39C 0EEA 014E 7448"            /* .*AîØÁ.L³œ.ê.NtH */
+        $"0B72 7C2C 92B6 0CAC 3CB5 ADA7 8BF8 0C56"            /* .r|,’¶.¬<µ­§‹ø.V */
+        $"1DD5 B763 907F 6B60 8A85 ED4A F87D FBDC"            /* .Õ·c�.k`Š…íJø}ûÜ */
+        $"391D 822B CBF5 7266 0E6B B2D4 32DE 606C"            /* 9.‚+Ëõrf.k²Ô2Þ`l */
+        $"014E 64BF F969 E3A5 C8E4 09EC B205 6391"            /* .Nd¿ùiã¥ÈäÆì².c‘ */
+        $"3081 96F5 9A80 0599 50D2 38FF 635B 9C35"            /* 0�–õš€.™PÒ8ÿc[œ5 */
+        $"97CF A325 D94F B8E1 A794 EABC DA8A 7CC3"            /* —Ï£%ÙO¸á§”ê¼ÚŠ|à */
+        $"8713 2EBB 1EA6 69B0 9A72 A93D 874A 1F30"            /* ‡..».¦i°šr©=‡J.0 */
+        $"4C7B B341 B8CF F61E 7CEE 60CC E9B0 6D85"            /* L{³A¸Ïö.|î`Ìé°m… */
+        $"4F96 977D F85D F85A 08AF 46EF F259 FD70"            /* O–—}ø]øZ.¯FïòYýp */
+        $"E364 C54D 1F3D C951 B1DD 2CB4 8B94 9350"            /* ãdÅM.=ÉQ±Ý,´‹”“P */
+        $"8FFC CD4E D39E 2FF5 DC65 9DB7 2133 6E97"            /* �üÍNÓž/õÜe�·!3n— */
+        $"9705 2AA6 2625 534E B2A2 D775 FCFA 60E0"            /* —.*¦&%SN²¢×uüú`à */
+        $"4929 3681 2E72 5087 F3CD FB3A 6386 36A2"            /* I)6�.rP‡óÍû:c†6¢ */
+        $"5E62 8705 57E4 8441 1986 1487 E88F C834"            /* ^b‡.Wä„A.†.‡è�È4 */
+        $"C59D D57C CCA2 D56F 3889 44AC 0E4D 0E88"            /* Å�Õ|Ì¢Õo8‰D¬.M.ˆ */
+        $"2592 A50A F98D DF1D 17F2 78BD D4AB FDB4"            /* %’¥Âù�ß..òx½Ô«ý´ */
+        $"4249 FBDE 3E56 BE58 B587 88B4 8D75 299F"            /* BIûÞ>V¾Xµ‡ˆ´�u)Ÿ */
+        $"4C92 6D9A 6B17 6153 9A65 4770 E0EC BBEF"            /* L’mšk.aSšeGpàì»ï */
+        $"2F91 8C35 8FFA 04AF 880C D9B6 204A D65E"            /* /‘Œ5�ú.¯ˆ.Ù¶ JÖ^ */
+        $"68DD DBE7 63BC E1C5 CCDD E994 3796 10EF"            /* hÝÛçc¼áÅÌÝé”7–.ï */
+        $"354D C0E7 7A72 E57E EFAC 7C75 E4CE F47F"            /* 5MÀçzrå~ï¬|uäÎô. */
+        $"2E82 A8D0 6401 3CC4 1ACC 4513 1211 DCC9"            /* .‚¨Ðd.<Ä.ÌE...ÜÉ */
+        $"BD7A 47CA F093 83C7 38EB 866D 1ED5 AC6C"            /* ½zGÊð“ƒÇ8ë†m.Õ¬l */
+        $"FF01 C348 CFA1 2532 DAD5 2BDD 8CCC 71C1"            /* ÿ.ÃHÏ¡%2ÚÕ+ÝŒÌqÁ */
+        $"1208 75AA 308B 4796 A89E 0EAF AB67 422A"            /* ..uª0‹G–¨ž.¯«gB* */
+        $"AA43 8162 68BC 9878 8578 419C AB2E 9518"            /* ªC�bh¼˜x…xAœ«.•. */
+        $"A9E0 4298 DB46 36D7 ADD0 DE21 DC41 AEA7"            /* ©àB˜ÛF6×­ÐÞ!ÜA®§ */
+        $"A05D 795D AB14 E247 6750 3EA8 0A31 5A06"            /*  ]y]«.âGgP>¨Â1Z. */
+        $"FAEC AD07 ECF7 C636 A068 22AA E179 7613"            /* úì­.ì÷Æ6 h"ªáyv. */
+        $"30F9 831C 0AFA 38C0 E20B 96A9 464E B57A"            /* 0ùƒ.Âú8Àâ.–©FNµz */
+        $"5AF3 D612 DC70 2A8D 1D09 C7C9 967F 7F7B"            /* ZóÖ.Üp*�.ÆÇÉ–..{ */
+        $"F47F 4017 A722 9853 37C2 DE55 34CF 104E"            /* ô.@.§"˜S7ÂÞU4Ï.N */
+        $"9DD3 35DF DEE2 589C FAF1 07DE 1803 86B1"            /* �Ó5ßÞâXœúñ.Þ..†± */
+        $"2DE6 6B46 FC45 F24E 8718 3B6E D557 8008"            /* -ækFüEòN‡.;nÕW€. */
+        $"FF3B 8EC2 28BD 6146 3EF6 A0FB 0BCA 37C1"            /* ÿ;ŽÂ(½aF>ö û.Ê7Á */
+        $"749B 49F2 F419 9EC5 DC0A A6DE 0CFC 1BD2"            /* t›Iòô.žÅܦÞ.ü.Ò */
+        $"AAF5 4920 1AB3 842A 1813 606E 97CD 0EC2"            /* ªõI .³„*..`n—Í. */
+        $"50D4 84CD F427 569F 776D 940A A6F7 68D7"            /* PÔ„Íô'VŸwm”¦÷h× */
+        $"2A18 4C6D 2056 D254 1226 7F3C 1ED0 7AB8"            /* *.Lm VÒT.&.<.Ðz¸ */
+        $"BEFE 2050 50E6 C5FB 173C 1857 FF7F 86D9"            /* ¾þ PPæÅû.<.Wÿ.†Ù */
+        $"6CE3 E235 1AFA CBB4 D2BE 4E64 9713 B880"            /* lãâ5.úË´Ò¾Nd—.¸€ */
+        $"0C41 2E14 401B D14F 5BA4 AD20 7060 C05E"            /* .A..@.ÑO[¤­ p`À^ */
+        $"2011 000E C557 2951 009C A584 6178 50E8"            /*  ...ÅW)Q.œ¥„axPè */
+        $"6E0D 922F BFF7 EC41 A907 0D2B EF09 3CE0"            /* n.’/¿÷ìA©..+ïÆ<à */
+        $"6344 B3D6 742A 0448 042D 44C3 390B 089B"            /* cD³Öt*.H.-DÃ9..› */
+        $"B0FF 2877 1C62 BE1E AC48 09B0 4667 19BC"            /* °ÿ(w.b¾.¬HÆ°Fg.¼ */
+        $"319D 1FEA ABB5 1EE9 02D8 C845 A20C 2E3F"            /* 1�.ꫵ.é.ØÈE¢..? */
+        $"7010 FA38 E2A0 1F01 2933 0557 19BD 9DCD"            /* p.ú8â ..)3.W.½�Í */
+        $"5486 F044 5838 C953 CC32 2DF8 6A04 30ED"            /* T†ðDX8ÉSÌ2-øj.0í */
+        $"2C42 0A7D 1B38 7F94 4936 5908 39F1 424F"            /* ,BÂ}.8.”I6Y.9ñBO */
+        $"2BFF 7F46 F53E 11D3 DA1E 41B4 67AB 296E"            /* +ÿ.Fõ>.ÓÚ.A´g«)n */
+        $"0B59 6213 9E16 1568 8787 ED75 8822 A102"            /* .Yb.ž..h‡‡íuˆ"¡. */
+        $"DAAC D7D6 FA63 ED91 52D2 E98C 6EEB ABBB"            /* Ú¬×Öúcí‘RÒéŒnë«» */
+        $"5465 7C7C 0CEB 3016 0CC6 5793 D7FF 7FFB"            /* Te||.ë0..ÆW“×ÿ.û */
+        $"34E7 7BDE 794E 6D8C 392D 051A 478B 4AD7"            /* 4ç{ÞyNmŒ9-..G‹J× */
+        $"028C 3119 EDCA 833C 2F1B A23A 5C69 908F"            /* .Œ1.íʃ</.¢:\i�� */
+        $"6F17 C143 83FF 31A8 709D 7BFA B0E4 A884"            /* o.ÁCƒÿ1¨p�{ú°ä¨„ */
+        $"E3DC 88CC DF54 C132 6671 A0D0 B4C3 7721"            /* ã܈ÌßTÁ2fq Ð´Ãw! */
+        $"B5F0 84FF 0FDA 1588 5865 1B6B 94E3 9B46"            /* µð„ÿ.Ú.ˆXe.k”ã›F */
+        $"5CA1 7767 09F4 3448 2242 114C 2705 2C38"            /* \¡wgÆô4H"B.L'.,8 */
+        $"4565 F286 ABC2 AFF5 809D 0C5B BB5E 009C"            /* Eeò†«Â¯õ€�.[»^.œ */
+        $"FCBA BC4C 84FF 45EF F42B 3F8E DEE0 A531"            /* üº¼L„ÿEïô+?ŽÞà¥1 */
+        $"DBBB 2113 7C30 8BB7 76FF 7E55 E6BC 012B"            /* Û»!.|0‹·vÿ~Uæ¼.+ */
+        $"EBDE EF62 0981 DCE1 AC6E 5AD7 D8AD 0560"            /* ëÞïbÆ�Üá¬nZ×Ø­.` */
+        $"5B36 3A62 5B57 3E03 75AC 25FB B396 1086"            /* [6:b[W>.u¬%û³–.† */
+        $"5EF0 4C11 ACE0 90D2 6568 EB55 75AB FF24"            /* ^ðL.¬à�ÒehëUu«ÿ$ */
+        $"54B8 0E77 3110 5C67 3138 8369 5BEA 3458"            /* T¸.w1.\g18ƒi[ê4X */
+        $"7FFE 6000 9940 0044 18C6 1A34 14B6 9CD2"            /* .þ`.™@.D.Æ.4.¶œÒ */
+        $"C039 2A00 00CC 8F27 9EFE FF80 1CAA 8000"            /* À9*..Ì�'žþÿ€.ª€. */
+        $"0000 0000 D9B1 C1D0 BFE1 D01D 2DD4 E3DF"            /* ....Ù±ÁпáÐ.-Ôãß */
+        $"949B 6DB6 DB6D B83D 6B98 82BC 446D 0CB3"            /* ”›m¶Ûm¸=k˜‚¼Dm.³ */
+        $"55A5 C140 D9E5 5E98 37AF 0E38 4474 B8DC"            /* U¥Á@Ùå^˜7¯.8Dt¸Ü */
+        $"FCFA B14E BD14 730B DAA0 4B18 1B4D 81E7"            /* üú±N½.s.Ú K..M�ç */
+        $"B8A8 26E7 EFB0 8272 4619 2A00 0000 0000"            /* ¸¨&çï°‚rF.*..... */
+        $"0000 0000 0000 060D CD91 05BE 3A07 80DE"            /* ........Í‘.¾:.€Þ */
+        $"29D6 2680 7867 5359 9411 F430 48D9 A22D"            /* )Ö&€xgSY”.ô0HÙ¢- */
+        $"DF74 0855 C0C4 C5AA D3F4 FC40 5815 C5FC"            /* ßt.UÀÄŪÓôü@X.Åü */
+        $"B741 3001 FF7F FDC6 00B8 F1BA FEC9 B662"            /* ·A0.ÿ.ýÆ.¸ñºþɶb */
+        $"4973 2EE9 5029 E237 296D D4A4 04DE 4DB9"            /* Is.éP)â7)mÔ¤.ÞM¹ */
+        $"5305 FD42 9A82 6842 EF09 9DA2 201D C6EF"            /* S.ýBš‚hBïÆ�¢ .Æï */
+        $"4078 4FC3 038C B201 A1C0 0791 7B09 CF18"            /* @xOÃ.Œ².¡À.‘{ÆÏ. */
+        $"D61B DABD 0409 372B F69D 3CF8 E2E1 31A1"            /* Ö.Ú½.Æ7+ö�<øâá1¡ */
+        $"023B B0FD 60B3 3933 16F2 C716 9259 82F8"            /* .;°ý`³93.òÇ.’Y‚ø */
+        $"77BB 3A47 46D2 D998 7AA1 01E1 DF78 8000"            /* w»:GFÒÙ˜z¡.áßx€. */
+        $"0000 0001 D8FD 4FB2 C620 0000 005A CD78"            /* ....ØýO²Æ ...ZÍx */
+        $"B755 53CD E910 3B50 96A8 4000 0000 0003"            /* ·USÍé.;P–¨@..... */
+        $"FD6F 5DD1 31D8 A087 6BC5 09F3 E81E B49F"            /* ýo]Ñ1Ø ‡kÅÆóè.´Ÿ */
+        $"5A88 0DB9 2492 4924 9234 EE49 0E46 EE5B"            /* Zˆ.¹$’I$’4îI.Fî[ */
+        $"8D2A E866 7AD0 1F3C 936D 50EF 6EF5 FDE7"            /* �*èfzÐ.<“mPïnõýç */
+        $"BFFE 6EFF 82AD 0EDF 556D B01D C573 CA68"            /* ¿þnÿ‚­.ßUm°.ÅsÊh */
+        $"985A F307 82C5 D933 4C26 B9EE EEF7 D4C6"            /* ˜Zó.‚ÅÙ3L&¹îî÷ÔÆ */
+        $"BFB5 4130 F610 4AFE 602E 3723 0C95 0000"            /* ¿µA0ö.Jþ`.7#.•.. */
+        $"0000 0000 0000 0000 0002 7F7E DE44 DDEB"            /* ...........~ÞDÝë */
+        $"B8B1 0AB8 BA80 7F79 D59C 851A 0244 B8D1"            /* ¸±Â¸º€.yÕœ…..D¸Ñ */
+        $"6B92 AB1A 4997 5556 C0C7 5935 05AD B380"            /* k’«.I—UVÀÇY5.­³€ */
+        $"318D A387 1E5F 1523 0170 B5DB D9FA 0E80"            /* 1�£‡._.#.pµÛÙú.€ */
+        $"7342 6634 1E36 FB10 615A 1862 FF53 1545"            /* sBf4.6û.aZ.bÿS.E */
+        $"C795 B42C 8282 534C 3AFD D370 7621 820E"            /* Ç•´,‚‚SL:ýÓpv!‚. */
+        $"9EDA AF3A 476B 3537 E327 52DE 4A99 73D1"            /* žÚ¯:Gk57ã'RÞJ™sÑ */
+        $"0718 7C16 82D5 99A5 32DD 0E83 9C4F 60F8"            /* ..|.‚Õ™¥2Ý.ƒœO`ø */
+        $"0743 325D 2056 84FF 06BC C6BB 338C 64CF"            /* .C2] V„ÿ.¼Æ»3ŒdÏ */
+        $"B7B9 C4C7 9800 E4DA EE0A 6636 DEE8 B8F8"            /* ·¹Äǘ.äÚîÂf6Þè¸ø */
+        $"739E 1EBD 408C C620 9790 A337 E987 2E54"            /* sž.½@ŒÆ —�£7é‡.T */
+        $"DD4A E501 C0BF 44E6 E8EF ACCF 028F 253C"            /* ÝJå.À¿Dæèï¬Ï.�%< */
+        $"F466 FA92 BEE6 A066 F4B6 5B41 CA80 3567"            /* ôfú’¾æ fô¶[AÊ€5g */
+        $"A079 E31D CEE9 CD64 0AED 265D E591 B98C"            /*  yã.ÎéÍdÂí&]呹Œ */
+        $"DF22 C203 3C43 E1D8 5D64 CA99 E6C7 EF30"            /* ß"Â.<CáØ]dÊ™æÇï0 */
+        $"68AF F4C9 97D5 F961 48CF 954C 2832 33A3"            /* h¯ôÉ—ÕùaHÏ•L(23£ */
+        $"0088 1417 0D84 DDE1 23FA C81D 487D C9AB"            /* .ˆ...„Ýá#úÈ.H}É« */
+        $"F239 ABB4 24E0 6694 291C 885C 23CE F212"            /* ò9«´$àf”).ˆ\#Îò. */
+        $"29F4 5656 7DD1 182A 2C11 AAEF 7534 24EE"            /* )ôVV}Ñ.*,.ªïu4$î */
+        $"9886 347F 28AD 6952 0A82 E9A4 6AA9 9390"            /* ˜†4.(­iR‚é¤j©“� */
+        $"06A8 EF47 527A EDF2 894B 5234 A900 82B1"            /* .¨ïGRzíò‰KR4©.‚± */
+        $"724D 791B 676C BC97 B3A5 94F7 137E FE8D"            /* rMy.gl¼—³¥”÷.~þ� */
+        $"50F5 C1EE 0C5B 1F3D CEF4 DD64 709C 095B"            /* PõÁî.[.=ÎôÝdpœÆ[ */
+        $"A51A B239 3EC3 C9BA 39EC DBE2 FB9A 3C6F"            /* ¥.²9>Ãɺ9ìÛâûš<o */
+        $"BBC4 DE3E C5AF 0043 DC2D AE64 C0A7 2039"            /* »ÄÞ>ů.CÜ-®dÀ§ 9 */
+        $"A6C9 6079 72D6 0BC7 C501 A3A4 5EF4 A060"            /* ¦É`yrÖ.ÇÅ.£¤^ô ` */
+        $"C46E FCB9 1958 AD83 1176 0776 81C2 13C2"            /* Änü¹.X­ƒ.v.v�Â. */
+        $"DF08 4A76 137F DC5C 4867 0493 EE96 8373"            /* ß.Jv..Ü\Hg.“î–ƒs */
+        $"4644 13A4 F789 39FF 813B D226 575A 5A18"            /* FD.¤÷‰9ÿ�;Ò&WZZ. */
+        $"3AF5 4B88 2747 3D47 681F 9670 0069 DD02"            /* :õKˆ'G=Gh.–p.iÝ. */
+        $"4252 ADB0 D6FB F1F1 1432 C24B D920 7290"            /* BR­°Öûññ.2ÂKÙ r� */
+        $"3709 3D60 15D9 0C49 23EC 77F8 F791 F132"            /* 7Æ=`.Ù.I#ìwø÷‘ñ2 */
+        $"046E 0D05 9AFA 210A 9992 29D9 7AA6 F18E"            /* .n..šú!™’)Ùz¦ñŽ */
+        $"E245 75E0 018F BCEB 8D1B C2D0 083E 985F"            /* âEuà.�¼ë�.ÂÐ.>˜_ */
+        $"B791 554D F5F5 AD71 E064 75E6 1F3A D463"            /* ·‘UMõõ­qàduæ.:Ôc */
+        $"9A59 0A43 3457 BD7C 44A7 5C5E 9D19 C5D8"            /* šYÂC4W½|D§\^�.ÅØ */
+        $"5880 C2CC 5DF0 2964 C0FD ABA1 004B 008D"            /* X€ÂÌ]ð)dÀý«¡.K.� */
+        $"5205 7F2E 0843 E484 2D37 9C34 2425 7AFF"            /* R....Cä„-7œ4$%zÿ */
+        $"7021 D907 B6E1 F5E5 02C3 F3DD 44C8 2252"            /* p!Ù.¶áõå.ÃóÝDÈ"R */
+        $"0649 3C1A 1A80 449A 64D1 1720 76D6 4987"            /* .I<..€DšdÑ. vÖI‡ */
+        $"B4B1 E749 E899 BF69 5B35 F925 2EE6 6CE6"            /* ´±çI虿i[5ù%.ælæ */
+        $"B4FD CEB3 54C0 7C9D 4380 F93B 5701 F274"            /* ´ýγTÀ|�C€ù;W.òt */
+        $"C4F3 CC20 F972 1FD1 56B3 911D 2995 5FC9"            /* ÄóÌ ùr.ÑV³‘.)•_É */
+        $"1F35 BAE0 9AC7 3082 1372 C1D5 4B23 D79E"            /* .5ºàšÇ0‚.rÁÕK#מ */
+        $"EF63 A93F 8E74 26FB AC68 CDBE BD3E 9720"            /* ïc©?Žt&û¬h;½>—  */
+        $"DF71 956D 5D26 559E 2795 2F1B F798 7821"            /* ßq•m]&Už'•/.÷˜x! */
+        $"F3CB 1E6F 2351 11BD 0EFF 19B2 40A2 1C7F"            /* óË.o#Q.½.ÿ.²@¢.. */
+        $"267D D302 F6AE 5410 1E96 40DC 386E CB7B"            /* &}Ó.ö®T..–@Ü8nË{ */
+        $"7EA3 5CF7 46BA 8758 D0EE 12B3 34DF 46FE"            /* ~£\÷Fº‡XÐî.³4ßFþ */
+        $"517B E0F8 7E28 83A5 E93A C06D 7C3F 254B"            /* Q{àø~(ƒ¥é:Àm|?%K */
+        $"53DF 91ED F6AB FD0A 53A0 5257 F9B8 E8B7"            /* Sß‘íö«ýÂS RWù¸è· */
+        $"5A14 6036 C6DA E3FE C29D 799F 8B43 46D6"            /* Z.`6ÆÚãþÂ�yŸ‹CFÖ */
+        $"94DF 1954 073C 7C30 40F4 A00D 93D4 AADF"            /* ”ß.T.<|0@ô .“ﻧ */
+        $"4839 EF36 F92A 3758 97CE 955A 3521 3CB5"            /* H9ï6ù*7X—ΕZ5!<µ */
+        $"8269 30A7 2A93 6A40 07BE DCC3 50B6 C86B"            /* ‚i0§*“j@.¾ÜÃP¶Èk */
+        $"CE9A AF28 3B80 4FE6 873C DB8E A29C 15DC"            /* Κ¯(;€Oæ‡<ÛŽ¢œ.Ü */
+        $"81A8 F841 4F77 6237 7267 55C4 1289 2DA1"            /* �¨øAOwb7rgUÄ.‰-¡ */
+        $"8392 424A 398F 9FA7 8DBE 2CC6 44E9 A005"            /* ƒ’BJ9�Ÿ§�¾,ÆDé . */
+        $"0E57 6638 ADDD 9F15 D32E 13A9 F752 67BA"            /* .Wf8­ÝŸ.Ó..©÷Rgº */
+        $"9F1D 753C 0023 2BC1 2C48 19AF FF28 66E6"            /* Ÿ.u<.#+Á,H.¯ÿ(fæ */
+        $"0A05 1D62 536F C372 7DEC 5069 B44D AFD4"            /* Â..bSoÃr}ìPi´M¯Ô */
+        $"BE3C 9C16 161E 95B4 89E7 B034 4524 E373"            /* ¾<œ...•´‰ç°4E$ãs */
+        $"D4A2 2F82 F1BB 8F20 7861 0F95 7CDF C184"            /* Ô¢/‚ñ»� xa.•|ßÁ„ */
+        $"5B65 6015 001B F6BD 5D52 D4BC 3A42 FD56"            /* [e`...ö½]RÔ¼:BýV */
+        $"D48F 3358 7432 09BD FF19 625D 3A11 13DA"            /* Ô�3Xt2ƽÿ.b]:..Ú */
+        $"F222 12E8 5A1B 12BF 9B3B A234 A367 8FB6"            /* ò".èZ..¿›;¢4£g�¶ */
+        $"4BF2 EE99 DB11 5D13 7021 71B4 2280 A1BC"            /* Kòî™Û.].p!q´"€¡¼ */
+        $"2AEF ECB5 D7EC 047C 0860 9676 78B1 CA76"            /* *ïìµ×ì.|.`–vx±Êv */
+        $"9AFB C995 D4EB 900A AD98 6423 E572 B68C"            /* šûÉ•Ôë�­˜d#år¶Œ */
+        $"A271 A30B D157 8E95 8250 29BB 0323 E26C"            /* ¢q£.ÑWŽ•‚P)».#âl */
+        $"9223 91C7 0CD4 F0B0 442E 1BD3 1473 C699"            /* ’#‘Ç.Ôð°D..Ó.sÆ™ */
+        $"2D1C 8791 C699 920E 72C0 0D3E F6E9 9E2B"            /* -.‡‘Æ™’.rÀ.>öéž+ */
+        $"60B6 A87F 6CBE 146C 1224 90FC BF7B C6A9"            /* `¶¨.l¾.l.$�ü¿{Æ© */
+        $"090E 3EAD C89D 5065 414B 3A1C F271 9327"            /* Æ.>­È�PeAK:.òq“' */
+        $"D490 CD2B FBB3 BEFF 768D 4601 635B A746"            /* Ô�Í+û³¾ÿv�F.c[§F */
+        $"8A4B 0981 8B8F EA85 D255 2113 8792 CC76"            /* ŠKÆ�‹�ê…ÒU!.‡’Ìv */
+        $"DE84 B950 C5F4 A4C1 D4EF 7D52 CC74 CCEE"            /* Þ„¹PÅô¤ÁÔï}RÌtÌî */
+        $"B40E B94F 9467 15CA 1DE0 3557 BF09 D787"            /* ´.¹O”g.Ê.à5W¿Æׇ */
+        $"ED66 345A E153 B4DC EF7C 2952 3161 5A99"            /* íf4ZáS´Üï|)R1aZ™ */
+        $"A193 D5EB 40F5 1300 65FA 8DFD 621A AE94"            /* ¡“Õë@õ..eú�ýb.®” */
+        $"30CD 6D25 A0FC 942E 37AC 52C8 CEAD 2D1F"            /* 0Ím% ü”.7¬RÈέ-. */
+        $"87D5 D078 F173 F5AD 7A56 DD1B 10C3 F9BF"            /* ‡ÕÐxñsõ­zVÝ..Ãù¿ */
+        $"69C1 9E6B E021 A0C7 84BF D87A 8AA8 327C"            /* iÁžkà! Ç„¿ØzŠ¨2| */
+        $"7D48 0D97 E584 FF7F AE07 2001 BF6C 2691"            /* }H.—å„ÿ.®. .¿l&‘ */
+        $"3032 E118 8741 42AD 7709 3086 8488 F9D3"            /* 02á.‡AB­wÆ0†„ˆùÓ */
+        $"0353 D79E 2E21 8F21 46CC 005C DA8A 0229"            /* .Sמ.!�!FÌ.\ÚŠ.) */
+        $"A56B A72A C69E FCF7 7558 5D72 0050 2BDE"            /* ¥k§*Æžü÷uX]r.P+Þ */
+        $"0F36 E4F0 C744 89FC 37F0 7ECA F488 FE8C"            /* .6äðÇD‰ü7ð~ÊôˆþŒ */
+        $"1B6B 0158 B34D 1EA6 9B1F 154E FF79 01D4"            /* .k.X³M.¦›..Nÿy.Ô */
+        $"725F D9CF D9BF CCFF 439D 8F5C A92D D20D"            /* r_ÙÏÙ¿ÌÿC��\©-Ò. */
+        $"0613 88F8 5C1C B6BD 07B9 9078 151D 8353"            /* ..ˆø\.¶½.¹�x..ƒS */
+        $"0E68 8495 D521 92D8 E92D CF9B 10E6 ABDC"            /* .h„•Õ!’Øé-Ï›.æ«Ü */
+        $"53D9 DFB2 F2AF F964 14E3 74D6 3D64 01E2"            /* SÙß²ò¯ùd.ãtÖ=d.â */
+        $"FAFB 2D0B D303 DCF7 7718 E6CF 30DB 3FAE"            /* úû-.Ó.Ü÷w.æÏ0Û?® */
+        $"2873 3339 54A3 1E48 04D2 FDF2 E863 6201"            /* (s39T£.H.Òýòècb. */
+        $"01D1 182C 4C2A D85D AE26 DE15 9796 494C"            /* .Ñ.,L*Ø]®&Þ.—–IL */
+        $"82EA B4C0 2D3C 3D3E 1732 2ACA AC27 B7DB"            /* ‚ê´À-<=>.2*ʬ'·Û */
+        $"5CED 6F9D 3EDB FF04 5E83 BE60 1636 AE2C"            /* \ío�>Ûÿ.^ƒ¾`.6®, */
+        $"754D 2928 7128 ACFD 15E8 C1A0 30A5 1063"            /* uM)(q(¬ý.èÁ 0¥.c */
+        $"1E6F 10F7 A946 B9B4 D921 5DB3 113F 332E"            /* .o.÷©F¹´Ù!]³.?3. */
+        $"61B8 AB3D 2F87 E081 C9D9 32B7 1060 785A"            /* a¸«=/‡à�ÉÙ2·.`xZ */
+        $"EFDD F472 0283 E235 4D42 E903 A06B 51CB"            /* ïÝôr.ƒâ5MBé. kQË */
+        $"39DC A412 A492 918E 235E F57C E4CE 4E0F"            /* 9ܤ.¤’‘Ž#^õ|äÎN. */
+        $"6BE6 7036 FA8A 7B2C 21FE 60B1 6FCA 7654"            /* kæp6úŠ{,!þ`±oÊvT */
+        $"C9FD DCDF E497 B2A6 D6D5 87ED 9D3B 5B86"            /* ÉýÜßä—²¦ÖÕ‡í�;[† */
+        $"DA51 6B5B AE3E 520B 1DB3 5A6B 2B4D A777"            /* ÚQk[®>R..³Zk+M§w */
+        $"4F13 A04C 7D4F 819B 1FEB 086D 5F34 6643"            /* O. L}O�›.ë.m_4fC */
+        $"0208 693A D70C 55B2 7A07 BC27 3A41 B739"            /* ..i:×.U²z.¼':A·9 */
+        $"C1F5 7425 07D5 D74C 1F56 F680 F1C4 B0CB"            /* Áõt%.Õ×L.Vö€ñÄ°Ë */
+        $"F3E0 DE80 53FC 256D EFD0 6B64 028C EC70"            /* óàÞ€Sü%mïÐkd.Œìp */
+        $"4973 06D4 242C DAAA 8373 DFAC B0C9 14A1"            /* Is.Ô$,Úªƒs߬°É.¡ */
+        $"BFBC 0BB4 E250 919E 3D2B B388 3A89 FB02"            /* ¿¼.´âP‘ž=+³ˆ:‰û. */
+        $"9796 86E6 20F8 C26C 8120 349C 757A 6875"            /* —–†æ øÂl� 4œuzhu */
+        $"F63E AE68 84C3 03A3 6F64 F9EE F892 2CF8"            /* ö>®h„Ã.£odùîø’,ø */
+        $"61C1 B13A E941 0D67 DA36 4C05 9565 DC85"            /* aÁ±:éA.gÚ6L.•eÜ… */
+        $"D7F8 6EB9 D903 D428 F59A 3EBF C73E 5E95"            /* ×øn¹Ù.Ô(õš>¿Ç>^• */
+        $"764D 15FB 98F2 BECE 0FC8 EA3C 4E51 E1DD"            /* vM.û˜ò¾Î.Èê<NQáÝ */
+        $"5253 CE7A 2D16 8527 AF8E 9A17 757A A42F"            /* RSÎz-.…'¯Žš.uz¤/ */
+        $"6CA9 6BB3 7787 D84F 8E20 EA1F FB2D 15E3"            /* l©k³w‡ØOŽ ê.û-.ã */
+        $"0D2C 45A8 8C80 7DA1 89DB 5F46 F3FB 2871"            /* .,E¨Œ€}¡‰Û_Fóû(q */
+        $"539E 8CCA 5C03 EF20 B6B5 4956 EB82 172C"            /* SžŒÊ\.ï ¶µIVë‚., */
+        $"AB28 0D6D 4DF9 1F61 6F8D 61FE E962 778D"            /* «(.mMù.ao�aþébw� */
+        $"0C8E EC55 3BDC EC81 C9D1 E7D5 A811 C69A"            /* .ŽìU;Üì�ÉÑçÕ¨.Æš */
+        $"6186 BC2C 75B4 DD3D C207 1151 4C3B 4175"            /* a†¼,u´Ý=Â..QL;Au */
+        $"942E 2ACF D3C7 7122 9D89 31B3 0918 EDC0"            /* ”.*ÏÓÇq"�‰1³Æ.íÀ */
+        $"9D45 75D8 DE61 5036 6D9F 3373 4827 7ADE"            /* �EuØÞaP6mŸ3sH'zÞ */
+        $"1BD1 16E8 8905 37D4 D811 1077 B359 0FF6"            /* .Ñ.è‰.7ÔØ..w³Y.ö */
+        $"0460 F360 20A5 B532 3418 142A B432 C2E9"            /* .`ó` ¥µ24..*´2Âé */
+        $"A0D6 DB04 317D 28F3 C893 AAE3 19B1 5742"            /*  ÖÛ.1}(óÈ“ªã.±WB */
+        $"7BF6 615C 0EAC F35E 0CD4 B142 A289 5458"            /* {öa\.¬ó^.Ô±B¢‰TX */
+        $"D699 1584 46FF 7174 758F B1F8 F540 F427"            /* Ö™.„Fÿqtu�±øõ@ô' */
+        $"A496 8795 E66B 3DDC FB80 D0B8 9411 7240"            /* ¤–‡•æk=Üû€Ð¸”.r@ */
+        $"0374 54DC B2CA C982 BD5E FD06 4B02 5E8D"            /* .tTܲÊÉ‚½^ý.K.^� */
+        $"A958 79AA 5BE6 B5A2 76C3 7C23 0D45 6768"            /* ©Xyª[æµ¢vÃ|#.Egh */
+        $"D726 8259 FD2E E5CE 9B70 0600 22E7 82A3"            /* ×&‚Yý.åΛp.."ç‚£ */
+        $"8E14 9626 C4EC EED9 E7D8 13C9 623F 3DEB"            /* Ž.–&ÄìîÙçØ.Éb?=ë */
+        $"357B E617 A43A C9D4 328A C30A FF45 71BA"            /* 5{æ.¤:ÉÔ2ŠÃÂÿEqº */
+        $"1F8B 3945 8E06 0CF0 4749 0840 6F5A EDDB"            /* .‹9EŽ..ðGI.@oZíÛ */
+        $"29AC E877 27BD 6C8C A131 8A1C 9228 0FC5"            /* )¬èw'½lŒ¡1Š.’(.Å */
+        $"A029 D1A1 324D EFCE EB3F 2B92 150D FB8C"            /*  )Ñ¡2MïÎë?+’..ûŒ */
+        $"5399 1ABD D375 08BF 8F3F E788 684D 3064"            /* S™.½Óu.¿�?çˆhM0d */
+        $"70B4 A733 4AB6 239A DC03 724F C8B8 F1BB"            /* p´§3J¶#šÜ.rOȸñ» */
+        $"8F1F A795 FF18 8256 0050 FF74 EDF1 3D05"            /* �.§•ÿ.‚V.Pÿtíñ=. */
+        $"6CB0 E566 9272 E493 C085 3D06 3116 4ECE"            /* l°åf’rä“À…=.1.NÎ */
+        $"402D 329F 4BBB 2598 A7CF BEE1 333D 9019"            /* @-2ŸK»%˜§Ï¾á3=�. */
+        $"61BB 1A29 2616 E907 2CD6 F64C 456F 9881"            /* a».)&.é.,ÖöLEo˜� */
+        $"725B 5C38 A40D 60D3 6B4F FDF1 87D7 4786"            /* r[\8¤.`ÓkOýñ‡×G† */
+        $"29BF CAEB 223A 044D 0F61 FDE6 0A3E 7727"            /* )¿Êë":.M.aýæÂ>w' */
+        $"DDEE 0A95 231F 04AC B6EF D134 C09D 1540"            /* Ýî•#..¬¶ïÑ4À�.@ */
+        $"0E94 57E2 8418 C208 1F26 7396 96A0 D08F"            /* .”Wâ„.Â..&s–– Ð� */
+        $"0CC0 40C8 C596 39BA 0CAE A6ED F8E8 7D6B"            /* .À@ÈÅ–9º.®¦íøè}k */
+        $"A76C 391B 6113 555F 62E0 6E14 5D27 E7BC"            /* §l9.a.U_bàn.]'ç¼ */
+        $"EDB7 D038 DED2 7BEE FC9D 6211 241E 0795"            /* í·Ð8ÞÒ{îü�b.$..• */
+        $"9CDE 1607 B4C7 828E 24D2 4E9F FCA0 36EA"            /* œÞ..´Ç‚Ž$ÒNŸü 6ê */
+        $"004C C960 1680 01CE 7FF6 A201 EDAB 1ADF"            /* .LÉ`.€.Î.ö¢.í«.ß */
+        $"80D8 4524 390C 23DD EA8E 062C 5DDB 3C57"            /* €ØE$9.#ÝêŽ.,]Û<W */
+        $"BAEC 18E5 1ECE 91D7 A40E 08ED 23EA 55B6"            /* ºì.å.Αפ..í#êU¶ */
+        $"AA2C F48A 7B0E 8CAE 90DD 5840 41FF 7F4C"            /* ª,ôŠ{.Œ®�ÝX@Aÿ.L */
+        $"47AD E774 87C4 9AB1 9CAD E633 DECD 3E36"            /* G­çt‡Äš±œ­æ3ÞÍ>6 */
+        $"00C2 0E05 134F 4802 3846 3575 1902 676D"            /* .Â...OH.8F5u..gm */
+        $"1006 D8AE 0D5F 1934 78F6 0721 F3C4 1000"            /* ..Ø®._.4xö.!óÄ.. */
+        $"8991 FA85 45B5 37A9 5A0C 54EE 014B 297B"            /* ‰‘ú…Eµ7©Z.Tî.K){ */
+        $"52F2 5ADD 7422 C97B EAA9 D291 45A7 A44A"            /* RòZÝt"É{ê©Ò‘E§¤J */
+        $"40FE AE73 5086 C7D3 85FD D734 67F2 8909"            /* @þ®sP†ÇÓ…ý×4gò‰Æ */
+        $"506D 36D8 2361 990C 802F A59E B603 9C94"            /* Pm6Ø#a™.€/¥ž¶.œ” */
+        $"F7BD AED9 8518 8651 DFFE 3D0E E920 E874"            /* ÷½®Ù….†Qßþ=.é èt */
+        $"FEB0 EE3C 3242 C249 4704 EEA8 9EFA DC61"            /* þ°î<2BÂIG.úÜa */
+        $"49C6 929E 2A9D 51CD FE0A FF02 3DDB 01EC"            /* IÆ’ž*�QÍþÂÿ.=Û.ì */
+        $"80E8 630A B0C8 C9FC 7693 C60B 07E8 5D2F"            /* €èc°ÈÉüv“Æ..è]/ */
+        $"B97A 9F04 444E C836 DD68 FF12 EC9C 7E4F"            /* ¹zŸ.DNÈ6Ýhÿ.ìœ~O */
+        $"3CE9 83A8 191A 1E61 05F8 90FF 67E8 011A"            /* <部...a.ø�ÿgè.. */
+        $"71EA 3EE8 AFBD 6328 ED84 9807 788D F3BC"            /* qê>诽c(턘.x�ó¼ */
+        $"2FA0 A210 7FFF 1D02 2519 4EC7 2A80 7FD0"            /* / ¢..ÿ..%.NÇ*€.Ð */
+        $"2064 A8F4 CC78 5EC8 88AF F1AB 868B 9F8D"            /*  d¨ôÌx^Ȉ¯ñ«†‹Ÿ� */
+        $"883E 3FDA D188 FBB7 3AFC 0C72 E01A CEF3"            /* ˆ>?Úшû·:ü.rà.Îó */
+        $"21E1 1718 4FDB 9A43 3767 424A 639B DFFE"            /* !á..OÛšC7gBJc›ßþ */
+        $"CA5F 7BA9 8F82 3EA6 6D4E 6986 6945 80DE"            /* Ê_{©�‚>¦mNi†iE€Þ */
+        $"8274 4927 166A 6062 DF1D 0A72 F23B FA5A"            /* ‚tI'.j`bß.Ârò;úZ */
+        $"4DE4 5D19 54FC 488B 5237 FF5F 7B81 62C5"            /* Mä].TüH‹R7ÿ_{�bÅ */
+        $"F6B7 B580 3016 11B6 22CF 63B8 428A D39A"            /* ö·µ€0..¶"Ïc¸BŠÓš */
+        $"5AC3 80FF 7310 8386 FF54 F361 304F 3BB5"            /* ZÀÿs.ƒ†ÿTóa0O;µ */
+        $"A7EB 0419 7DFB 6E56 20A8 3670 9018 9CB3"            /* §ë..}ûnV ¨6p�.œ³ */
+        $"4B35 7082 32A7 E917 9CF8 FF7F FF80 0A6C"            /* K5p‚2§é.œøÿ.ÿ€Âl */
+        $"A48C 447E 3ECF 411D 89E4 F923 373B DCBE"            /* ¤ŒD~>ÏA.‰äù#7;ܾ */
+        $"2CE8 6580 0F87 1A23 1D93 62AE 48EF DEB8"            /* ,èe€.‡.#.“b®HïÞ¸ */
+        $"5DE8 DB68 1CA3 8D4B D3FE A476 7B3D ACAA"            /* ]èÛh.£�KÓþ¤v{=¬ª */
+        $"284F 83EB 428F A201 D122 CB1A CCB2 C1FE"            /* (OƒëB�¢.Ñ"Ë.̲Áþ */
+        $"367F 60D3 155D 8C00 22D8 ED33 D56B 1DE2"            /* 6.`Ó.]Œ."Øí3Õk.â */
+        $"98B0 A4A9 E041 2BF1 AA58 E78D 47E5 929F"            /* ˜°¤©àA+ñªXç�Gå’Ÿ */
+        $"85DA 699E C45A 0064 B931 CF2B 4169 44F0"            /* …ÚižÄZ.d¹1Ï+AiDð */
+        $"4B4F 083B 3D7C B2B2 D87B 785E 91A8 C614"            /* KO.;=|²²Ø{x^‘¨Æ. */
+        $"6EE6 A63C C8A7 B9E3 839D E245 4128 3BF9"            /* næ¦<ȧ¹ãƒ�âEA(;ù */
+        $"98CD 0C23 72EB E3A9 D21F 1BC2 4E13 274B"            /* ˜Í.#rëã©Ò..ÂN.'K */
+        $"19C8 CB39 5E7A D218 FBDB 0C42 51A1 1203"            /* .ÈË9^zÒ.ûÛ.BQ¡.. */
+        $"C0EB CDC2 9249 E461 1DE4 3DB6 FDFE 1334"            /* ÀëÍÂ’Iäa.ä=¶ýþ.4 */
+        $"1952 8231 CD71 A170 C55B 1FD0 6706 57F0"            /* .R‚1Íq¡pÅ[.Ðg.Wð */
+        $"282D 09A2 0893 A5BA 0314 43DD 32AF 3478"            /* (-Æ¢.“¥º..CÝ2¯4x */
+        $"EF6C 15F0 55C9 6A47 ECFE 3F3F 4DB4 5ED8"            /* ïl.ðUÉjGìþ??M´^Ø */
+        $"EFF8 8CA5 71F9 6669 078C 550C 943A 7046"            /* ïøŒ¥qùfi.ŒU.”:pF */
+        $"C031 6CE2 4681 4177 2913 CFE7 D857 C62A"            /* À1lâF�Aw).ÏçØWÆ* */
+        $"4652 88E2 8830 DF42 9C3D 2D76 E710 A8F1"            /* FRˆâˆ0ßBœ=-vç.¨ñ */
+        $"3626 45F2 55CC 008C EAB8 B891 A5F3 1AD2"            /* 6&EòUÌ.Œê¸¸‘¥ó.Ò */
+        $"AB11 6C48 3F18 40C0 51F0 DB88 0BD1 168C"            /* «.lH?.@ÀQðÛˆ.Ñ.Œ */
+        $"2E54 2DA6 CC60 BB05 4700 2C4E 179B 271B"            /* .T-¦Ì`».G.,N.›'. */
+        $"688C 1EE9 4D9A C781 8108 296B FE4F 028A"            /* hŒ.éMšÇ��.)kþO.Š */
+        $"63D6 6EDF 6FEB FC17 BDFE 7A70 B48E D94E"            /* cÖnßoëü.½þzp´ŽÙN */
+        $"D985 3384 1BD2 B4C9 5213 B0D1 041B 876C"            /* Ù…3„.Ò´ÉR.°Ñ..‡l */
+        $"131C 4A9C 947B A79C A466 9779 E7C9 D2E1"            /* ..Jœ”{§œ¤f—yçÉÒá */
+        $"4E9F 0509 30E0 1115 E5C7 CAED 197B 818A"            /* NŸ.Æ0à..åÇÊí.{�Š */
+        $"324D 8F8E ED44 BF44 5340 D647 1776 B983"            /* 2M�ŽíD¿DS@ÖG.v¹ƒ */
+        $"6D8C 88B1 6976 F7EB AFDB 6638 CAD3 F275"            /* mŒˆ±iv÷ë¯Ûf8ÊÓòu */
+        $"D93A 6CD3 9D6E C617 3969 D8E5 3059 947B"            /* Ù:lÓ�nÆ.9iØå0Y”{ */
+        $"6AFA 0E9B A19C 24C9 E1DC 089D 3545 89E4"            /* jú.›¡œ$ÉáÜ.�5E‰ä */
+        $"E860 FB54 068C B464 EE9B 66B7 F267 34CF"            /* è`ûT.Œ´dî›f·òg4Ï */
+        $"1276 C6B2 47E6 8284 300B D1A9 1409 0C93"            /* .vƲGæ‚„0.Ñ©.Æ.“ */
+        $"E36A 8095 409A 7352 FF7A 0F50 A5E2 E678"            /* ãj€•@šsRÿz.P¥âæx */
+        $"C195 0898 E51E EB15 8D7A E918 29A6 D5CE"            /* Á•.˜å.ë.�zé.)¦ÕÎ */
+        $"4DBC 978B 2CAA 9BA7 8727 EA1C 1C7A 6CC2"            /* M¼—‹,ª›§‡'ê..zl */
+        $"D172 DDF5 4BD4 9C69 607B 609F AEC8 FD84"            /* ÑrÝõKÔœi`{`Ÿ®Èý„ */
+        $"1DDA A076 C7E1 A7B1 F86C BC7E 1720 EB83"            /* .Ú vÇ᧱øl¼~. ëƒ */
+        $"095B F1C8 7239 10FD 6A26 D10E 534B E257"            /* Æ[ñÈr9.ýj&Ñ.SKâW */
+        $"B691 5D92 6949 E7D8 7470 AA8C 421F F945"            /* ¶‘]’iIçØtpªŒB.ùE */
+        $"99F6 9492 B806 E264 47B0 4EF5 6206 734E"            /* ™ö”’¸.âdG°Nõb.sN */
+        $"944B 102F A688 23A4 EAB0 CCEA 0017 0156"            /* ”K./¦ˆ#¤ê°Ìê...V */
+        $"A8C9 2A3F FF49 4137 E23A 09D0 97BB 0E5F"            /* ¨É*?ÿIA7â:ÆЗ»._ */
+        $"E2A2 2247 4980 6A20 B443 3E0B 0465 B9EF"            /* â¢"GI€j ´C>..e¹ï */
+        $"C490 B954 3AEA ABB7 3D53 111D 8897 551C"            /* Ä�¹T:ê«·=S..ˆ—U. */
+        $"B865 1EA2 33F2 AD50 D488 1D6D 9733 27F3"            /* ¸e.¢3ò­PÔˆ.m—3'ó */
+        $"78AC C946 FB3C 4D2F 6580 1B3A 3368 3D54"            /* x¬ÉFû<M/e€.:3h=T */
+        $"55DF 6B52 1A54 9010 C4D2 12C8 D497 9CDB"            /* UßkR.T�.ÄÒ.ÈÔ—œÛ */
+        $"173A 0609 66F1 C6C0 FD02 47A0 B2E2 D2E6"            /* .:.ÆfñÆÀý.G ²âÒæ */
+        $"096E F870 0776 4898 2F2B 84CF BA83 D656"            /* Ænøp.vH˜/+„ϺƒÖV */
+        $"7F77 79FF 0F1D 2A6E 03C6 4D0F E3EF D23B"            /* .wyÿ..*n.ÆM.ãïÒ; */
+        $"6F82 5F72 6701 98DF 5A63 DA7B 0ABC 75E2"            /* o‚_rg.˜ßZcÚ{¼uâ */
+        $"382D 0D93 3C8C 5308 19EA EF8D 7922 CD36"            /* 8-.“<ŒS..êï�y"Í6 */
+        $"ED21 EB4D 3D77 5A8A 1380 E238 22E5 84AA"            /* í!ëM=wZŠ.€â8"優 */
+        $"4488 7DCE 91A0 CB4B 67FA 74AF EA3D 1C8E"            /* Dˆ}Α ËKgút¯ê=.Ž */
+        $"9279 611D FD02 D08F D952 B05D 2C11 B545"            /* ’ya.ý.Ð�ÙR°],.µE */
+        $"5F17 FF5C 1E9C 6A77 DA2F A474 B20C F5A2"            /* _.ÿ\.œjwÚ/¤t².õ¢ */
+        $"B2D4 176F 97E4 CE9E B576 C3E0 0F3D ECB9"            /* ²Ô.o—äΞµvÃà.=ì¹ */
+        $"7B35 DEBB 5ABA 9738 36F8 524D 74D8 08FF"            /* {5Þ»Zº—86øRMtØ.ÿ */
+        $"29A7 9B08 5B43 7C17 FB53 234E 4806 B0C3"            /* )§›.[C|.ûS#NH.°Ã */
+        $"AF3A FF38 CCAF FEAA C60F D103 32AC 7D7F"            /* ¯:ÿ8̯þªÆ.Ñ.2¬}. */
+        $"D2B8 51C1 7B7D 56FD 7CFB D2B5 C55B 7C7D"            /* Ò¸QÁ{}Vý|ûÒµÅ[|} */
+        $"7D30 10C2 4181 3358 5DD6 4625 4FFC EA30"            /* }0.ÂA�3X]ÖF%Oüê0 */
+        $"3402 194F 6D0B 53D8 3C64 54AE E8DA 7874"            /* 4..Om.SØ<dT®èÚxt */
+        $"7FF1 DE25 3147 0AF0 D5B6 7BF7 88DD 5199"            /* .ñÞ%1GÂðÕ¶{÷ˆÝQ™ */
+        $"611E 526D B6DB 6DB6 DB69 9C6E 7A40 821D"            /* a.Rm¶Ûm¶Ûiœnz@‚. */
+        $"4416 6952 04BB 9C0A F19B 2C62 E698 A4F5"            /* D.iR.»œÂñ›,b昤õ */
+        $"9B83 3C59 8217 0000 0034 8080 DB92 4924"            /* ›ƒ<Y‚....4€€Û’I$ */
+        $"9249 247D 32D0 9B20 73FF 7E44 A49A 44BB"            /* ’I$}2Л sÿ~D¤šD» */
+        $"EB45 3E31 A4A0 C0CC BBC0 B29E 7771 4FDE"            /* ëE>1¤ ÀÌ»À²žwqOÞ */
+        $"1679 23F1 DE12 5574 68E3 60A1 9C00 CBEC"            /* .y#ñÞ.Uthã`¡œ.Ëì */
+        $"9C44 9009 0000 08DE 28C3 2776 AAA2 829A"            /* œD�Æ...Þ(Ã'vª¢‚š */
+        $"05E0 47E9 0001 48A9 672C 0775 EE58 F075"            /* .àGé..H©g,.uîXðu */
+        $"7458 B48A 5455 DB33 3524 BE73 1D7C E223"            /* tX´ŠTUÛ35$¾s.|â# */
+        $"4EC4 732C EC4B 128D 341C 790C 00A2 1309"            /* NÄs,ìK.�4.y..¢.Æ */
+        $"2D0B 5EA7 B07B C82C 976B 68C2 642A F095"            /* -.^§°{È,—khÂd*ð• */
+        $"A1C4 010E C94E D8A9 34BB FD3E 2B2F 92EC"            /* ¡Ä..ÉNØ©4»ý>+/’ì */
+        $"30E1 A7B3 040B C920 3FFF 7FA1 317B 90F7"            /* 0᧳..É ?ÿ.¡1{�÷ */
+        $"C744 40B8 8325 4036 82FB 0C6C D800 19C4"            /* ÇD@¸ƒ%@6‚û.lØ..Ä */
+        $"2631 C4B8 3160 8649 2492 4924 9248 A747"            /* &1ĸ1`†I$’I$’H§G */
+        $"3D41 A17D 23A6 9AC7 9000 0000 0000 0000"            /* =A¡}#¦šÇ�....... */
+        $"0000 0019 1A70 8823 BB21 7C62 4556 F257"            /* .....pˆ#»!|bEVòW */
+        $"62C0 CF0B 72EE F37E 64EC 43C2 AE04 9F58"            /* bÀÏ.rîó~dìC®.ŸX */
+        $"94DC E128 91EC BAA2 DADD 57A7 D5F7 1972"            /* ”Üá(‘캢ÚÝW§Õ÷.r */
+        $"7543 9A9A 0DB3 C3FD 42E0 19A3 8F45 7FDF"            /* uCšš.³ÃýBà.£�E.ß */
+        $"CEB1 A7E5 8A09 5B4A F9E6 294B C5DC 80C9"            /* α§åŠÆ[Jùæ)KÅÜ€É */
+        $"9AEE 0729 374F 04FD 79D6 7170 D940 14F0"            /* šî.)7O.ýyÖqpÙ@.ð */
+        $"830F 0B71 50E7 3C76 97AF 0F71 A32D DC5A"            /* ƒ..qPç<v—¯.q£-ÜZ */
+        $"28A9 FE90 6CC0 9484 30D1 FCCD 4991 0758"            /* (©þ�lÀ”„0ÑüÍI‘.X */
+        $"BE36 B1DE 3A2E B6F8 2756 C568 2A7F D038"            /* ¾6±Þ:.¶ø'VÅh*.Ð8 */
+        $"2397 6E8F 32E0 C1AC 3736 32A3 C18E 13C4"            /* #—n�2àÁ¬762£ÁŽ.Ä */
+        $"D298 8703 F9AF E24B A630 0627 6E63 ED70"            /* Ò˜‡.ù¯âK¦0.'ncíp */
+        $"0662 A833 6515 7225 C79D 8C1F 7410 45BF"            /* .b¨3e.r%Ç�Œ.t.E¿ */
+        $"5019 F088 7C6C 43FC AE88 B794 5847 505F"            /* P.ðˆ|lCü®ˆ·”XGP_ */
+        $"2B73 6E58 E20E 18A2 01B4 DF7F F5BD D4BC"            /* +snXâ..¢.´ß.õ½Ô¼ */
+        $"B259 706B 754E 9740 BBF2 54FC FCB8 B293"            /* ²YpkuN—@»òTüü¸²“ */
+        $"4CEA 3670 D04B 8C42 B7C2 314D 1F53 956B"            /* Lê6pÐKŒB·Â1M.S•k */
+        $"CB14 9D05 8288 E7F0 D4FF 70AE EFB7 A10B"            /* Ë.�.‚ˆçðÔÿp®ï·¡. */
+        $"EDDE 3CFE 1B9D 7DBA 7B7D BD13 DF6F 45B8"            /* íÞ<þ.�}º{}½.ßoE¸ */
+        $"FE1A 077D B444 FAB6 46FB 75FC E8AB DECC"            /* þ..}´Dú¶Fûuüè«ÞÌ */
+        $"AF0D 6C8A C695 8734 8A7A 5A21 F65D 05F6"            /* ¯.lŠÆ•‡4ŠzZ!ö].ö */
+        $"A417 27AC 998E 3646 07A8 0055 19DC B524"            /* ¤.'¬™Ž6F.¨.U.ܵ$ */
+        $"D2F2 842C DF9F BECA C26B C9C9 D0FD CA3B"            /* Òò„,ߟ¾ÊÂkÉÉÐýÊ; */
+        $"DB1B 3F81 F6A7 4465 001E 5552 4D0D 3BF3"            /* Û.?�ö§De..URM.;ó */
+        $"0140 A2E9 7D63 8456 F9C7 665D F7FC 2DBF"            /* .@¢é}c„VùÇf]÷ü-¿ */
+        $"1B41 0667 7939 1B16 4997 5584 3CFE 81B9"            /* .A.gy9..I—U„<þ�¹ */
+        $"C4A8 B346 EC6D E726 2560 5CB8 8B84 7699"            /* Ĩ³Fìmç&%`\¸‹„v™ */
+        $"3999 2CA0 91D9 A05A C96C 660C 267B 74A0"            /* 9™, ‘Ù ZÉlf.&{t  */
+        $"B935 73EB D464 D860 2694 7584 A4D4 DC52"            /* ¹5sëÔdØ`&”u„¤ÔÜR */
+        $"D136 D49A 1BEA 53F5 AE2F C19E 44E9 BA0A"            /* Ñ6Ôš.êSõ®/ÁžDéºÂ */
+        $"5D83 6587 7792 3DCB 449A B33E 4632 A395"            /* ]ƒe‡w’=ËDš³>F2£• */
+        $"57A3 0EC0 B3A3 969D 9DF0 6ACC 859F FF7F"            /* W£.À³£–��ðjÌ…Ÿÿ. */
+        $"FF27 DAA0 AF8E 216C E5D8 874A 530F 555E"            /* ÿ'Ú ¯Ž!lå؇JS.U^ */
+        $"AF3F E231 5BAF F7B6 8E73 5742 2717 4031"            /* ¯?â1[¯÷¶ŽsWB'.@1 */
+        $"175D 5FDA F402 B756 AEAE 7E7E BFEE CE68"            /* .]_Úô.·V®®~~¿îÎh */
+        $"7878 870D 01C2 C2A4 61D5 64E3 E195 B914"            /* xx‡..¤aÕdãᕹ. */
+        $"A45F FF52 DC14 F5E9 E037 65E3 5477 62A5"            /* ¤_ÿRÜ.õéà7eãTwb¥ */
+        $"3EEC CA32 6558 5965 8B6E 3F13 9DB2 1361"            /* >ìÊ2eXYe‹n?.�².a */
+        $"8426 9FD7 B329 4E75 FF1D 9B78 9735 4B1B"            /* „&Ÿ×³)Nuÿ.›x—5K. */
+        $"D80E 1781 192F 6777 8F94 F6A2 5016 726D"            /* Ø..�./gw�”ö¢P.rm */
+        $"1E0D D2CB 6F87 B3C6 09A2 1FE3 915E 8943"            /* ..ÒËo‡³ÆÆ¢.ã‘^‰C */
+        $"FE6C 6743 4733 D5BC A9DD 5338 C9E1 AF50"            /* þlgCG3Õ¼©ÝS8Éá¯P */
+        $"3634 C26C 0C1F 94E7 50B2 4310 DD62 4F09"            /* 64Âl..”çP²C.ÝbOÆ */
+        $"ABCD 7821 8B7B 7B87 2EEA 25A1 9D3C 55CC"            /* «Íx!‹{{‡.ê%¡�<UÌ */
+        $"0644 1B14 3456 2E32 C013 815C 66C7 0526"            /* .D..4V.2À.�\fÇ.& */
+        $"E24D CE15 B8FB 5D8B 0506 E30A 1D6A E2ED"            /* âMÎ.¸û]‹..ãÂ.jâí */
+        $"6145 D124 0EC9 1FAB 4E50 06C2 9DA5 8F6C"            /* aEÑ$.É.«NP.Â�¥�l */
+        $"C072 D11E BFEE DFE6 F6C7 12F4 E89C 35B7"            /* ÀrÑ.¿îßæöÇ.ôèœ5· */
+        $"097E 2E25 393F CEA3 03C6 D3C7 DED5 3882"            /* Æ~.%9?Σ.ÆÓÇÞÕ8‚ */
+        $"ED26 A3FD 9130 95B5 F3FA D31A 691F 8E09"            /* í&£ý‘0•µóúÓ.i.ŽÆ */
+        $"BFA8 7D7B 85BD B179 5C20 2855 1268 F9AF"            /* ¿¨}{…½±y\ (U.hù¯ */
+        $"553D 939E 6FC6 C67E 4611 F88C BBD4 773C"            /* U=“žoÆÆ~F.øŒ»Ôw< */
+        $"5F16 D598 D5C5 E649 B66E FD8D A2D7 9807"            /* _.Õ˜ÕÅæI¶ný�¢×˜. */
+        $"EDA2 4621 2CF5 DDE3 C078 6455 1C29 3A07"            /* í¢F!,õÝãÀxdU.):. */
+        $"E992 C5DE 8D33 041B 83C6 56F6 7C95 168E"            /* é’ÅÞ�3..ƒÆVö|•.Ž */
+        $"6127 40D2 DE11 CFF2 3379 DC22 20E3 5E1B"            /* a'@ÒÞ.Ïò3yÜ" ã^. */
+        $"DE83 DBB5 5B8A 8572 3DF2 2890 DC56 BE6E"            /* ÞƒÛµ[Š…r=ò(�ÜV¾n */
+        $"D15F 9396 ECD4 725F 2E18 7616 394A 64C3"            /* Ñ_“–ìÔr_..v.9Jdà */
+        $"FDAA E6F2 3D6D 46BC B270 5B8F ACB4 9CAE"            /* ýªæò=mF¼²p[�¬´œ® */
+        $"0D0D 3F29 6A02 1E92 347A E406 A52D 111A"            /* ..?)j..’4zä.¥-.. */
+        $"2E79 0340 1D82 C861 0C40 1963 3397 A4FD"            /* .y.@.‚Èa.@.c3—¤ý */
+        $"A998 0B63 E30A 7AA3 A5BC 8A8E 9CD0 4795"            /* ©˜.cãÂz£¥¼ŠŽœÐG• */
+        $"7538 7FB2 EC9A 952C CE29 C80F 369C 4E8D"            /* u8.²ìš•,Î)È.6œN� */
+        $"8000 1C55 D5F3 E2AD 812E 4FAA AC2C D9BB"            /* €..UÕóâ­�.Oª¬,Ù» */
+        $"F4CD 5568 5643 826F 3A38 91BD 6F70 92D3"            /* ôÍUhVC‚o:8‘½op’Ó */
+        $"23EC DB91 0FC4 C3BB 7542 023B 85F0 36C3"            /* #ìÛ‘.ÄûuB.;…ð6à */
+        $"8BF6 F6F8 4E77 EEE5 851F 219A CF99 7D9E"            /* ‹ööøNwîå….!šÏ™}ž */
+        $"856D A687 BC63 8E39 0407 B007 D184 10BD"            /* …m¦‡¼cŽ9..°.Ñ„.½ */
+        $"D9EF ACB1 B75A 46FA F95E 42DF 377B E2F7"            /* Ùבּ·ZFúù^Bß7{â÷ */
+        $"BEF2 357A 861C F486 B3F7 57E1 D39B 095B"            /* ¾ò5z†.ô†³÷WáÓ›Æ[ */
+        $"40C0 925C 0CA1 7885 CFEA 48B7 33E9 E8DE"            /* @À’\.¡x…ÏêH·3éèÞ */
+        $"D178 1E15 91D1 F6C5 BC87 CB7E CCC6 DEDE"            /* Ñx..‘Ñöż‡Ë~ÌÆÞÞ */
+        $"B017 A4C1 0B0F DD17 660E CB97 C098 C773"            /* °.¤Á..Ý.f.Ë—À˜Çs */
+        $"8A0A F4DB 59BD A218 055E 5348 05D8 B304"            /* ŠÂôÛY½¢..^SH.س. */
+        $"9F23 E1B1 0754 6DA2 FF33 34CB 2B12 7114"            /* Ÿ#á±.Tm¢ÿ34Ë+.q. */
+        $"62D2 4CA8 8091 CD34 8467 2752 B77A AA5B"            /* bÒL¨€‘Í4„g'R·zª[ */
+        $"15FC 2E56 7A29 9351 B6A4 AEE5 B56D 354D"            /* .ü.Vz)“Q¶¤®åµm5M */
+        $"3ED2 FA71 25E9 F887 B187 BADB B11B 2E01"            /* >Òúq%éø‡±‡ºÛ±... */
+        $"93B3 4206 45ED 7238 3F80 1441 50CA CCBA"            /* “³B.Eír8?€.APÊ̺ */
+        $"EF59 3BC5 4236 2ABF 9150 7335 49C5 0216"            /* ïY;ÅB6*¿‘Ps5IÅ.. */
+        $"F97B D5A5 1EF5 A69D 8B34 C25B 73E1 DA52"            /* ù{Õ¥.õ¦�‹4Â[sáÚR */
+        $"79E5 9EB1 9CB1 0952 B3F5 E221 D426 4759"            /* yåž±œ±ÆR³õâ!Ô&GY */
+        $"D5CF 2D18 CC2A 270A 859D F10C 8108 52FF"            /* ÕÏ-.Ì*'Â…�ñ.�.Rÿ */
+        $"2A7D D39E EFFD 568C 2DB3 7BD5 62D0 2403"            /* *}ÓžïýVŒ-³{ÕbÐ$. */
+        $"69D1 A4B6 2D24 E485 973D F6A5 E6DC 1DB5"            /* iѤ¶-$ä…—=ö¥æÜ.µ */
+        $"BF0B E185 5592 E3A0 6046 E050 5151 9546"            /* ¿.á…U’ã `FàPQQ•F */
+        $"17F7 0CF6 222F 17E0 40E5 3EF5 74EE BAB6"            /* .÷.ö"/.à@å>õt */
+        $"55BD 76C1 DD80 39C8 BAE0 37B8 398A B370"            /* U½vÁÝ€9Ⱥà7¸9Š³p */
+        $"D400 0C29 5DC9 94FF 069B 36E2 CD79 195F"            /* Ô..)]É”ÿ.›6âÍy._ */
+        $"5B9B 1237 1F18 C560 C901 F9A4 184B 7570"            /* [›.7..Å`É.ù¤.Kup */
+        $"433E 75BE 0297 C641 7D9B 7092 8D64 96F5"            /* C>u¾.—ÆA}›p’�d–õ */
+        $"D70C 9B66 71D3 09B1 F635 0FC3 0B49 7D6E"            /* ×.›fqÓƱö5.Ã.I}n */
+        $"660C 8E1D 0257 672B 97EE C2A5 7B84 729E"            /* f.Ž..Wg+—îÂ¥{„rž */
+        $"6516 585E 354F 2E22 88A7 A515 B945 3745"            /* e.X^5O."ˆ§¥.¹E7E */
+        $"F6A5 5CB2 E212 10AD AB6F 07F5 FDA3 09EB"            /* ö¥\²â..­«o.õý£Æë */
+        $"A053 313B 9A8E 757D E132 D483 DC78 0882"            /*  S1;šŽu}á2ÔƒÜx.‚ */
+        $"A63C 95E0 036C 4626 F66B 5F6C 39A1 9401"            /* ¦<•à.lF&ök_l9¡”. */
+        $"7276 4DCE 4487 7D8C 12A3 B713 9139 AC0A"            /* rvMÎD‡}Œ.£·.‘9¬Â */
+        $"18AD 4DFD 2A3D 69E7 E76E 593C 8DAB FD56"            /* .­Mý*=iççnY<�«ýV */
+        $"F959 BA6B FBA3 2853 D610 4DB0 7A30 3A09"            /* ùYºkû£(SÖ.M°z0:Æ */
+        $"916B DFF7 B3B4 F8D3 9619 0FD9 8FBC FC6B"            /* ‘kß÷³´øÓ–..Ù�¼ük */
+        $"D73D ABD2 4C41 6AD0 6584 AF19 3074 AF6E"            /* ×=«ÒLAjÐe„¯.0t¯n */
+        $"369C BEB1 76D5 D311 6172 F157 D522 DDED"            /* 6œ¾±vÕÓ.arñWÕ"Ýí */
+        $"D4ED 0230 0BB5 E881 0E6B 9C4F 111F 4F6E"            /* Ôí.0.µè�.kœO..On */
+        $"7CAD 4745 7BBF DA70 A9C4 051E FDEA 206C"            /* |­GE{¿Úp©Ä..ýê l */
+        $"9983 0E2D 4A4A A4DE 82E9 DAAF 5748 37AE"            /* ™ƒ.-JJ¤Þ‚éÚ¯WH7® */
+        $"4046 DCCB 0D1A 80DA 1804 20E2 F7CF AD69"            /* @FÜË..€Ú.. â÷Ï­i */
+        $"F9D8 5106 D02D 16E9 4437 9560 B618 1126"            /* ùØQ.Ð-.éD7•`¶..& */
+        $"95A2 4B23 89C4 78EE 898E D80C 8E49 5201"            /* •¢K#‰ÄxØ.ŽIR. */
+        $"2095 ABAF 9CA5 0F8E CB22 00D4 4289 59B3"            /*  •«¯œ¥.ŽË".ÔB‰Y³ */
+        $"1835 1395 8AE5 3A88 7185 E7DD 57F3 4CE4"            /* .5.•Šå:ˆq…çÝWóLä */
+        $"1465 C878 6B72 7146 2AF1 F053 5B31 7697"            /* .eÈxkrqF*ñðS[1v— */
+        $"7300 A777 3919 099E BD1C 79C3 24C4 A355"            /* s.§w9.Æž½.yÃ$Ä£U */
+        $"0C88 C727 1831 D498 E513 47A5 F25F DDBE"            /* .ˆÇ'.1Ô˜å.G¥ò_ݾ */
+        $"46E7 40B5 EBCC 080F 6915 3FDF EDB9 A9B1"            /* Fç@µëÌ..i.?ßí¹©± */
+        $"39ED D794 60E1 A5A2 0EEC 7A09 46BF 201E"            /* 9í×”`ᥢ.ìzÆF¿ . */
+        $"311F EEEE 88EF C6C1 C10D E238 50C9 7F01"            /* 1.îîˆïÆÁÁ.â8PÉ.. */
+        $"DFF1 17BA D8F4 0017 47E7 75F2 4D82 679E"            /* ßñ.ºØô..GçuòM‚gž */
+        $"6867 60A4 6222 77B9 319B 186D FCB3 168A"            /* hg`¤b"w¹1›.mü³.Š */
+        $"EAF3 C227 1082 D7ED 2C70 E619 8676 0186"            /* êóÂ'.‚×í,pæ.†v.† */
+        $"8C23 5DE5 D4A0 61CB CDE4 AED5 E008 6F3C"            /* Œ#]åÔ aËÍä®Õà.o< */
+        $"D894 AC14 6FEC 5D4C C2FF 3A6C 512F E475"            /* Ø”¬.oì]LÂÿ:lQ/äu */
+        $"FCB8 DFA4 EB46 2DF4 E133 5858 364B 54E1"            /* ü¸ß¤ëF-ôá3XX6KTá */
+        $"A6E1 5D0C 157E D987 DF95 B1FB 3723 4F2F"            /* ¦á]..~هߕ±û7#O/ */
+        $"C9BF C6D4 D979 412E D0EB B285 8DFF 7CAC"            /* É¿ÆÔÙyA.Ðë²…�ÿ|¬ */
+        $"F1BF 1825 8B89 9992 3848 C666 4184 4906"            /* ñ¿.%‹‰™’8HÆfA„I. */
+        $"0D61 6B58 9355 A5D9 C940 B6F2 6918 82E1"            /* .akX“U¥ÙÉ@¶òi.‚á */
+        $"FF7D 4F5F FE94 5208 650B B780 0D2B DD4F"            /* ÿ}O_þ”R.e.·€.+ÝO */
+        $"5874 3627 2353 6328 06B9 908C 6C95 D898"            /* Xt6'#Sc(.¹�Œl•Ø˜ */
+        $"8C24 1D0F 641B 7763 CFBE E88A BB05 8639"            /* Œ$..d.wcϾ芻.†9 */
+        $"D91C 4A38 3A3F 75C6 61BD BFED CA10 2A73"            /* Ù.J8:?uÆa½¿íÊ.*s */
+        $"E3C5 E85C BF5B 0346 2105 4286 300D D812"            /* ãÅè\¿[.F!.B†0.Ø. */
+        $"8BE4 DAE4 292B A765 338E 7E42 50F1 8046"            /* ‹äÚä)+§e3Ž~BPñ€F */
+        $"3FDC 1A85 4616 61E5 7321 18D9 5AB9 8903"            /* ?Ü.…F.aås!.ÙZ¹‰. */
+        $"90BD 6F89 E7D0 35D1 0AA3 BBAE 3CF8 A7B7"            /* �½o‰çÐ5Ñ£»®<ø§· */
+        $"73C8 8B94 B409 16EC 60A6 E819 BCA7 BA66"            /* sÈ‹”´Æ.ì`¦è.¼§ºf */
+        $"2245 524C 718C 635D E4F7 ACA0 02C3 E0A7"            /* "ERLqŒc]ä÷¬ .Ãৠ*/
+        $"B542 0FF5 7029 FF4D 1D88 E3B3 D657 802B"            /* µB.õp)ÿM.ˆã³ÖW€+ */
+        $"8068 9BD4 B17F 9A6B CC1C 4B53 246F 81E5"            /* €h›Ô±.škÌ.KS$o�å */
+        $"9168 48EC 4B44 3FFF 7B8B 5777 5677 134E"            /* ‘hHìKD?ÿ{‹WwVw.N */
+        $"1B8E 8C91 429F CE85 86EF 62B4 71AF EAE7"            /* .ŽŒ‘BŸÎ…†ïb´q¯êç */
+        $"E333 7BD3 2825 7230 C950 0000 1B8D 8BA6"            /* ã3{Ó(%r0ÉP...�‹¦ */
+        $"04C1 56DC 30F0 619E DD6C D196 C91E 1ED4"            /* .ÁVÜ0ðažÝlÑ–É..Ô */
+        $"1285 94A8 F775 05A9 3440 78FF 7E52 8833"            /* .…”¨÷u.©4@xÿ~Rˆ3 */
+        $"E8A1 A4E4 4580 38DD ADE1 3BD5 AD19 74E6"            /* 衤äE€8Ý­á;Õ­.tæ */
+        $"EEA1 B4B1 0B0B 9BE9 08EC DB78 E6AA 37E5"            /* î¡´±..›é.ìÛxæª7å */
+        $"AD06 72A6 51FC 0004 4737 BF1A 89FF 7E11"            /* ­.r¦Qü..G7¿.‰ÿ~. */
+        $"0A68 EAD7 BDA5 4D5B 2C8D 0C7A 952E 2190"            /* Âhê×½¥M[,�.z•.!� */
+        $"8451 1B38 CEFD 2835 5ADD BDA2 01C2 A3D6"            /* „Q.8Îý(5Zݽ¢.壅 */
+        $"6046 4BD8 41DF D8B6 D9B1 1F96 5FF8 CC56"            /* `FKØAßضٱ.–_øÌV */
+        $"A63B 6E14 5035 26D6 946D 1F59 4D17 5507"            /* ¦;n.P5&Ö”m.YM.U. */
+        $"85F7 2DAF A737 4E30 9097 2E2E DAF8 37D1"            /* …÷-¯§7N0�—..Úø7Ñ */
+        $"D987 4E59 ABFD CDF3 AAC3 30D1 8616 FAB3"            /* Ù‡NY«ýÍóªÃ0ц.ú³ */
+        $"2914 92AA 6913 C36F 66DA 4B0B 18FE DD55"            /* ).’ªi.ÃofÚK..þÝU */
+        $"1D2A 3F00 D80C 2423 D923 95C6 E11D 0069"            /* .*?.Ø.$#Ù#•Æá..i */
+        $"B5C9 0803 0907 B950 13DF 48EC F794 3D36"            /* µÉ..Æ.¹P.ßHì÷”=6 */
+        $"5249 2492 4924 9249 2489 9EF6 DC36 9A6B"            /* RI$’I$’I$‰žöÜ6šk */
+        $"1751 415E A37F 47EC A4EA 67AC A222 733C"            /* .QA^£.Gì¤êg¬¢"s< */
+        $"467D 1FFE C727 E6AA 6E99 C584 A87E DFFF"            /* F}.þÇ'æªn™Å„¨~ßÿ */
+        $"7FC3 7592 8204 71A2 6088 C38B 6E65 868E"            /* .Ãu’‚.q¢`ˆÃ‹ne†Ž */
+        $"5A3F FF7F F919 4069 CF10 A302 5125 525C"            /* Z?ÿ.ù.@iÏ.£.Q%R\ */
+        $"A443 88AF 4104 7807 1410 84BA E955 76E8"            /* ¤Cˆ¯A.x...„ºéUvè */
+        $"5F35 B612 A668 5694 9249 2492 4924 9249"            /* _5¶.¦hV”’I$’I$’I */
+        $"2492 4924 4C25 1941 A4EB 1996 7A28 19C1"            /* $’I$L%.A¤ë.–z(.Á */
+        $"A1B0 01D7 ACB2 3F83 42DC D154 27C9 F11F"            /* ¡°.׬²?ƒBÜÑT'Éñ. */
+        $"FC46 90B1 89C4 F78A 4C6F 5C2A 833D 8425"            /* üF�±‰Ä÷ŠLo\*ƒ=„% */
+        $"D837 CA14 E4C7 7F8A 9833 99B7 E589 1376"            /* Ø7Ê.äÇ.Š˜3™·å‰.v */
+        $"C867 FF1D 200A 4C9B 624E 68E3 11AE C8AF"            /* Ègÿ. ÂL›bNhã.®È¯ */
+        $"1723 C741 CEAC 16CE C548 72FF 15CD 3E67"            /* .#ÇAά.ÎÅHrÿ.Í>g */
+        $"AF2C 323F 0FD0 6752 4973 55BD CC10 05B4"            /* ¯,2?.ÐgRIsU½Ì..´ */
+        $"AB3F 9302 00C3 EE70 1BA4 B650 FAB2 5821"            /* «?“..Ãîp.¤¶Pú²X! */
+        $"3856 3872 1B02 7D70 F1F9 0B28 A9DC CAE7"            /* 8V8r..}pñù.(©ÜÊç */
+        $"D9E7 6252 A768 A7DE 0FB1 FCB1 F54B 98C4"            /* ÙçbR§h§Þ.±ü±õK˜Ä */
+        $"7B6E 5E24 BC53 F945 741F 66A0 A51E EE5A"            /* {n^$¼SùEt.f ¥.îZ */
+        $"2A0D B951 4EEE A88B 4F2F C326 F326 1D12"            /* *.¹QNO/Ã&ó&.. */
+        $"524A 9E48 CC53 44EF C54F 1737 8505 46CF"            /* RJžHÌSDïÅO.7….FÏ */
+        $"351E 4354 05C7 C832 2A7D 8899 D009 E617"            /* 5.CT.ÇÈ2*}ˆ™ÐÆæ. */
+        $"0334 305D 9497 D845 E6D3 2CD2 178F 1316"            /* .40]”—ØEæÓ,Ò.�.. */
+        $"65AD 239E 2ED5 ECCB 402A E728 09B5 E847"            /* e­#ž.ÕìË@*ç(ƵèG */
+        $"65BD 3F31 CAC5 F9D8 6606 B8AF 4F84 89FE"            /* e½?1ÊÅùØf.¸¯O„‰þ */
+        $"9004 4730 30BC E58F 5FB3 38CF 36B9 38FC"            /* �.G00¼å�_³8Ï6¹8ü */
+        $"FB9D 07EA D13F 9DB9 7185 0E88 0E3B 06E5"            /* û�.êÑ?�¹q….ˆ.;.å */
+        $"D476 CFCA 1587 3067 9257 B5DF 1E83 E7FF"            /* ÔvÏÊ.‡0g’Wµß.ƒçÿ */
+        $"7FFF 7FFF 0E68 E181 AC15 B980 2AFB 1D80"            /* .ÿ.ÿ.há�¬.¹€*û.€ */
+        $"C5BB A88D E36A 4DC5 94CF 6DB2 0694 F977"            /* Å»¨�ãjMÅ”Ïm².”ùw */
+        $"D708 02D1 F380 6773 016A CA84 3B1C 6A33"            /* ×..Ñó€gs.jÊ„;.j3 */
+        $"5AAC BA2D FEC5 7542 51FC 68D0 CDDD EA44"            /* Z¬º-þÅuBQühÐÍÝêD */
+        $"788E 2F96 D80C F159 FF45 3316 1494 A7F5"            /* xŽ/–Ø.ñYÿE3..”§õ */
+        $"98B4 FC39 0062 D59B 52A6 32CB F97C ABD6"            /* ˜´ü9.bÕ›R¦2Ëù|«Ö */
+        $"42AE AE46 6AA7 D986 0A4E DCDD 717E 8B7C"            /* B®®Fj§Ù†ÂNÜÝq~‹| */
+        $"8FB8 B396 65A6 83FF 6A4A A5C1 597F 70AF"            /* �¸³–e¦ƒÿjJ¥ÁY.p¯ */
+        $"DC96 E2EC 0C1D 7A00 3428 2C60 DE32 8DB8"            /* Ü–âì..z.4(,`Þ2�¸ */
+        $"1604 C249 5E82 1F5B 6C23 E562 B2D4 754E"            /* ..ÂI^‚.[l#åb²ÔuN */
+        $"7F73 442A 25D3 C42A 6A6D 5D09 0E8C 2E67"            /* .sD*%ÓÄ*jm]Æ.Œ.g */
+        $"95EC 08FE B505 8B5A A4A8 0000 0000 0000"            /* •ì.þµ.‹Z¤¨...... */
+        $"0000 0000 6121 26B3 27C3 AEC0 FF52 2FEE"            /* ....a!&³'îÀÿR/î */
+        $"D4F3 92BB 06E2 ABE4 35DC A278 9084 B2F0"            /* Ôó’».â«ä5Ü¢x�„²ð */
+        $"EE1A ADB2 F770 3D4E 120A FD01 B042 CD00"            /* î.­²÷p=N.Âý.°BÍ. */
+        $"B9C2 B661 40B0 E5FC DC59 59F0 61C5 53A7"            /* ¹Â¶a@°åüÜYYðaÅS§ */
+        $"7AC1 7EDC 77B7 1C84 0F9A E321 389C E693"            /* zÁ~Üw·.„.šã!8œæ“ */
+        $"AC98 5160 DDD0 C9A9 BE17 ED52 A10A 300C"            /* ¬˜Q`ÝÐÉ©¾.íR¡Â0. */
+        $"88ED BB5A 80DA C23B 1196 0C7C 6BA8 D4EA"            /* ˆí»Z€ÚÂ;.–.|k¨Ôê */
+        $"4FAB 08A9 EBE3 1CC9 6782 F6A9 85A4 1829"            /* O«.©ëã.Ég‚ö©…¤.) */
+        $"48BB D188 41E8 65BA 28BB 8AC1 8368 DC2F"            /* H»ÑˆAèeº(»ŠÁƒhÜ/ */
+        $"B2DE 61FE 95C0 BD88 C027 9CD9 3819 8A81"            /* ²Þaþ•À½ˆÀ'œÙ8.Š� */
+        $"20FF 616C DEAE C6EA 15A3 D12F 764A B4E2"            /*  ÿalÞ®Æê.£Ñ/vJ´â */
+        $"ECA3 AF32 36FF 29B0 E3CD 5046 527E 39B7"            /* 죯26ÿ)°ãÍPFR~9· */
+        $"921A ABF8 F0CB 7040 5FCD A182 4C57 986D"            /* ’.«øðËp@_Í¡‚LW˜m */
+        $"1115 DD94 687C 3663 7CFB 6C40 642D C8CA"            /* ..Ý”h|6c|ûl@d-ÈÊ */
+        $"1117 B5A9 8025 123D 9406 58F9 96B5 321E"            /* ..µ©€%.=”.Xù–µ2. */
+        $"7646 4BFD 48DE 0B9B DBEF B79F B6C7 031E"            /* vFKýHÞ.›Ûï·Ÿ¶Ç.. */
+        $"1D3B 1D18 B35D 2813 5601 3924 6AE1 FC21"            /* .;..³](.V.9$jáü! */
+        $"60B9 0B9F 6B4B AFB9 15D8 C57A 5345 7461"            /* `¹.ŸkK¯¹.ØÅzSEta */
+        $"0EF9 4B6B 88D1 7833 02DF 4FB8 DBEC 836A"            /* .ùKkˆÑx3.ßO¸Ûìƒj */
+        $"BEA7 3972 93C0 F973 37B5 C84F 1655 031C"            /* ¾§9r“Àùs7µÈO.U.. */
+        $"674D 741E 308E E3BA 6684 5BB0 4506 AB40"            /* gMt.0Žãºf„[°E.«@ */
+        $"14DE BFF2 9B38 4026 C5C2 3A44 FDFF 25CB"            /* .Þ¿ò›8@&ÅÂ:Dýÿ%Ë */
+        $"072E 1D99 62E3 22B8 DE8D 9CF1 79FA 1D38"            /* ...™bã"¸Þ�œñyú.8 */
+        $"8900 17CB A72B 8124 7EAF CF2F FC8D 34D6"            /* ‰..˧+�$~¯Ï/ü�4Ö */
+        $"E0AC 58ED 8BC1 0DAA 7964 FB91 BF08 EFA6"            /* à¬Xí‹Á.ªydû‘¿.ï¦ */
+        $"42FF 7FFF 7FE3 AF13 7C4B 1CF4 D643 3CD3"            /* Bÿ.ÿ.ã¯.|K.ôÖC<Ó */
+        $"5F1A 08BB 7C56 5CFB 6D27 04DE C66A 9AF1"            /* _..»|V\ûm'.ÞÆjšñ */
+        $"2053 D4B2 EE60 44FF 2A89 1FFC DFCC 57C1"            /*  SÔ²î`Dÿ*‰.üßÌWÁ */
+        $"3800 1290 7854 7902 FF7A 9A36 D71E F8D1"            /* 8..�xTy.ÿzš6×.øÑ */
+        $"D439 471B D02F 4A39 E5BC D25F FDF0 8B54"            /* Ô9G.Ð/J9å¼Ò_ýð‹T */
+        $"AE0A 3677 2625 B286 7DEC 8FF7 2457 2B25"            /* ®Â6w&%²†}ì�÷$W+% */
+        $"C066 2A4E A605 EE16 7244 CCFD D3D3 FDA1"            /* Àf*N¦.î.rDÌýÓÓý¡ */
+        $"F3B8 76C3 1C5F 491C 0165 8735 D71D 19AD"            /* ó¸vÃ._I..e‡5×..­ */
+        $"9BB1 A40D E5BA 9D1C E34B B71C 9CF0 EC7A"            /* ›±¤.åº�.ãK·.œðìz */
+        $"5E87 C4F0 A326 0913 9E2C 6517 50A3 E72B"            /* ^‡Äð£&Æ.ž,e.P£ç+ */
+        $"87FE D348 2E5D 0A00 0000 0000 0000 0000"            /* ‡þÓH.]Â......... */
+        $"0002 2C86 A73D 4030 2FE4 D32C 2B56 C74C"            /* ..,†§=@0/äÓ,+VÇL */
+        $"0869 A5C9 151A 69B9 9390 DA50 4411 8FFF"            /* .i¥É..i¹“�ÚPD.�ÿ */
+        $"4938 4E36 F9DD 09FB E4A0 C339 2431 ED8B"            /* I8N6ùÝÆûä Ã9$1í‹ */
+        $"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+        $"2366 FF4F E2A2 F01A C90F 02E3 51CD B477"            /* #fÿOâ¢ð.É..ãQÍ´w */
+        $"2230 690A B47C E28B 463C 2E88 7579 7943"            /* "0i´|â‹F<.ˆuyyC */
+        $"5055 6D0A EEC5 F3BF 2404 37D8 EFE1 71AC"            /* PUmÂîÅó¿$.7Øïáq¬ */
+        $"6AFE A3E4 A7EB 28BF BFFE 4373 E5FF 7E4A"            /* jþ£ä§ë(¿¿þCsåÿ~J */
+        $"2D5D 1ED3 6D78 1657 9914 A061 7958 972C"            /* -].Ómx.W™. ayX—, */
+        $"56FB D5B0 1FFD A18B 7A29 0C81 295B DF7C"            /* VûÕ°.ý¡‹z).�)[ß| */
+        $"83E3 CD36 0E66 7E2B D8FA 3096 AA44 7F9B"            /* ƒãÍ6.f~+Øú0–ªD.› */
+        $"F0B9 EA48 8CC7 0FFF 7E1C F394 CC5B 6A25"            /* ð¹êHŒÇ.ÿ~.ó”Ì[j% */
+        $"FD4C CECC 630B 38B7 D621 F081 73EE 9D40"            /* ýLÎÌc.8·Ö!ð�sî�@ */
+        $"7FAD FADD 8111 6492 599E DD2C 3600 FF6C"            /* .­úÝ�.d’YžÝ,6.ÿl */
+        $"5A8D B0B8 2AE7 668D C5A0 826B FA0D C5B1"            /* Z�°¸*çf�Å ‚kú.ű */
+        $"6873 D749 B533 9627 C2F6 4922 63F7 8944"            /* hs×Iµ3–'ÂöI"c÷‰D */
+        $"15C5 A1F9 8539 A21A 1CEB 1C2D 7D1B 0516"            /* .Å¡ù…9¢..ë.-}... */
+        $"FD6C 5D4F 92A3 14D9 126F C5FC 4116 B499"            /* ýl]O’£.Ù.oÅüA.´™ */
+        $"D878 D889 9123 D3C8 4637 36E3 8644 6F0B"            /* Øx؉‘#ÓÈF76ã†Do. */
+        $"D2C6 A599 B793 1367 B548 23BD 8836 11E5"            /* ÒÆ¥™·“.gµH#½ˆ6.å */
+        $"C323 7AD5 0534 3D05 A4E6 70B3 0376 2B0C"            /* Ã#zÕ.4=.¤æp³.v+. */
+        $"A964 173B F0BC 2A52 7FE4 2A53 85C2 22B2"            /* ©d.;ð¼*R.ä*S…Â"² */
+        $"B83F 7185 FB4C 3769 5B3E 4A24 E7E1 D0FD"            /* ¸?q…ûL7i[>J$çáÐý */
+        $"9B17 8737 FE8B E4C7 9FC1 0E30 D904 D0C5"            /* ›.‡7þ‹äÇŸÁ.0Ù.ÐÅ */
+        $"D2F5 05E4 3CD6 5FA7 B9AF FB98 755E 0BAF"            /* Òõ.ä<Ö_§¹¯û˜u^.¯ */
+        $"E4EE 408D A8BE 5E58 07A6 059D 1B33 37F3"            /* äî@�¨¾^X.¦.�.37ó */
+        $"8D14 871A 7FC6 43ED 6A6F 8F41 9681 095E"            /* �.‡..ÆCíjo�A–�Æ^ */
+        $"EE46 5BA4 1E15 F5F2 3063 E524 A62A 7C7F"            /* îF[¤..õò0cå$¦*|. */
+        $"0E38 5D00 A378 8F6D 3861 2088 EDD7 AC24"            /* .8].£x�m8a ˆí׬$ */
+        $"D3B6 B052 DE10 357D B65A 1414 4596 8E3D"            /* Ó¶°RÞ.5}¶Z..E–Ž= */
+        $"97E3 D838 9ACC 3C84 AF82 EA8D 8BD3 0180"            /* —ãØ8šÌ<„¯‚ê�‹Ó.€ */
+        $"1582 0654 BB61 1047 ACA1 29D3 7CFA 00C8"            /* .‚.T»a.G¬¡)Ó|ú.È */
+        $"BABC 146B 250C 8D19 8A4E A8B3 50D6 B986"            /* º¼.k%.�.ŠN¨³PÖ¹† */
+        $"2AD6 CEFA 02D6 AE11 FF7C B0A2 E6E0 30E9"            /* *ÖÎú.Ö®.ÿ|°¢æà0é */
+        $"D904 4C03 3BC1 8B68 5892 30B8 7D69 C2D6"            /* Ù.L.;Á‹hX’0¸}iÂÖ */
+        $"A9F8 56A2 7417 1E31 186F 09A1 4C11 6DCA"            /* ©øV¢t..1.oÆ¡L.mÊ */
+        $"A62E 5FCC F59A CCE8 6A29 B0DF E2BC E8BF"            /* ¦._ÌõšÌèj)°ßâ¼è¿ */
+        $"92DF 70C1 8B09 21DF 1440 1684 4413 2A60"            /* ’ßpÁ‹Æ!ß.@.„D.*` */
+        $"E033 6D92 8573 E63C 2746 6F40 D8F0 D0C9"            /* à3m’…sæ<'Fo@ØðÐÉ */
+        $"10AF 85A2 CFBF 373B B250 85E4 C1D3 85D2"            /* .¯…¢Ï¿7;²P…äÁÓ…Ò */
+        $"E167 1222 DF4A 67D9 B3D6 55B4 B047 8675"            /* ág."ßJgÙ³ÖU´°G†u */
+        $"C803 6AE5 E5AE AF92 C4B7 591A A040 98AC"            /* È.jå宯’Ä·Y. @˜¬ */
+        $"4412 45F8 BBC8 6482 F7BD 81B2 98FE 9D0B"            /* D.Eø»Èd‚÷½�²˜þ�. */
+        $"DAB1 2959 952C 9115 3504 9A24 BBA4 A04C"            /* Ú±)Y•,‘.5.š$»¤ L */
+        $"4125 5810 54F5 C268 63C2 1DB9 11CF 85BB"            /* A%X.TõÂhcÂ.¹.Ï…» */
+        $"D941 F5A1 0239 DED3 856D BBE5 7CF3 49C3"            /* ÙAõ¡.9ÞÓ…m»å|óIà */
+        $"C9CF 1BD1 A953 F58A F9AF E704 E70E 43B7"            /* ÉÏ.Ñ©SõŠù¯ç.ç.C· */
+        $"2B51 BE14 4FF3 262C 914B 90AF F2A9 E060"            /* +Q¾.Oó&,‘K�¯ò©à` */
+        $"6A24 6553 B776 C48D 19AD ECD3 2DD3 8ECF"            /* j$eS·vÄ�.­ìÓ-ÓŽÏ */
+        $"9EC7 8A0D 97F4 3C69 6E56 0881 1136 C147"            /* žÇŠ.—ô<inV.�.6ÁG */
+        $"E7D3 6FE5 A0C6 D7DC BCB0 76AC C4F8 DD65"            /* çÓoå Æ×ܼ°v¬ÄøÝe */
+        $"A5F9 02BF 2BFD 9A2C 354D 24C2 E088 6B63"            /* ¥ù.¿+ýš,5M$Âàˆkc */
+        $"E514 C014 E8F4 F5C2 B529 74FB EC02 032B"            /* å.À.èôõµ)tûì..+ */
+        $"A54B 696E B602 7D58 4542 824D BD8C 40FA"            /* ¥Kin¶.}XEB‚M½Œ@ú */
+        $"F675 5CD4 71C9 058E 7062 0E1B 10CC 72A9"            /* öu\ÔqÉ.Žpb...Ìr© */
+        $"95B8 C5FD 7EAF 995C 62ED DDE4 6579 3181"            /* •¸Åý~¯™\bíÝäey1� */
+        $"8BA1 A02B 1559 F5BC E9C9 914D 8CEB D7D8"            /* ‹¡ +.Yõ¼éÉ‘MŒë×Ø */
+        $"7D81 20C0 A609 18D2 B679 7C08 FB00 E4C6"            /* }� À¦Æ.Ò¶y|.û.äÆ */
+        $"2797 518E 32CE 67CE 3C8E 6796 A832 F712"            /* '—QŽ2ÎgÎ<Žg–¨2÷. */
+        $"0037 059C 96CD 85A0 98E6 5D20 05F2 EC61"            /* .7.œ–Í… ˜æ] .òìa */
+        $"335D AFFF 14BC 3EF9 0779 7A53 BAA4 F47A"            /* 3]¯ÿ.¼>ù.yzSº¤ôz */
+        $"6926 DAD2 72F9 5D4B 1014 8BD5 A4FA 68EA"            /* i&ÚÒrù]K..‹Õ¤úhê */
+        $"D9F9 F684 BFD5 F2ED FB9E 4C18 91C3 FF17"            /* Ùùö„¿ÕòíûžL.‘Ãÿ. */
+        $"2D17 D99A DE29 FE6E 63A4 C901 8642 9357"            /* -.ÙšÞ)þnc¤É.†B“W */
+        $"3120 4386 1938 E7D2 572D 0C59 E3C9 7FED"            /* 1 C†.8çÒW-.YãÉ.í */
+        $"30FA E54A CEF8 A94C F92D AF19 76EA 3372"            /* 0úåJÎø©Lù-¯.vê3r */
+        $"B4E1 E7C5 8239 A4AC A247 4838 55E8 EB9B"            /* ´áçÅ‚9¤¬¢GH8Uèë› */
+        $"DE7D 94E9 DBD7 07FB D488 1672 E61D 9E4C"            /* Þ}”éÛ×.ûÔˆ.ræ.žL */
+        $"6DF2 97D5 4936 F89A 5CBC D37A 8C2C F7ED"            /* mò—ÕI6øš\¼ÓzŒ,÷í */
+        $"9755 19F2 0350 AB2E D851 F0B7 78B5 9770"            /* —U.ò.P«.ØQð·xµ—p */
+        $"4DF3 4212 9C9C CA3B 403A BA7B D497 9410"            /* MóB.œœÊ;@:º{Ô—”. */
+        $"04C6 288B 5058 5DC9 EB79 AB85 622C 9A55"            /* .Æ(‹PX]Éëy«…b,šU */
+        $"2DA7 C113 9315 7CAE D84E 6B50 4062 AE94"            /* -§Á.“.|®ØNkP@b®” */
+        $"8F5E 7969 4BA5 56B2 E881 8C02 ED3B 5259"            /* �^yiK¥V²è�Œ.í;RY */
+        $"24CE C98A 4348 12B1 314F E3E3 B6A3 4E61"            /* $ÎÉŠCH.±1Oã㶣Na */
+        $"A426 6350 E380 B0B5 DEFF 64CF 72D6 D4B9"            /* ¤&cP〰µÞÿdÏrÖÔ¹ */
+        $"907C 9BE0 7E4D 39F9 2BB7 C3DE D7C3 DCD8"            /* �|›à~M9ù+·ÃÞ×ÃÜØ */
+        $"1F93 775F 0F44 DF0F A717 C3E9 D603 F269"            /* .“w_.Dß.§.ÃéÖ.òi */
+        $"FBE1 D36F 87B3 6F87 B280 E8AB DECC AF0D"            /* ûáÓo‡³o‡²€è«Þ̯. */
+        $"6C8A C695 8734 87EB A75F 5130 05EC 9BA8"            /* lŠÆ•‡4‡ë§_Q0.웨 */
+        $"78DB 85A2 680C 75A0 EDD1 4AA2 7E1B BAFF"            /* xÛ…¢h.u íÑJ¢~.ºÿ */
+        $"5AFC FD6C 3E36 A6D9 923A 2DCE 24BC 35EF"            /* Züýl>6¦Ù’:-Î$¼5ï */
+        $"27F4 8813 7CC4 0141 3CD9 9568 BFE6 BBB3"            /* 'ôˆ.|Ä.A<Ù•h¿æ»³ */
+        $"219B 0442 5227 3796 635D 0DE7 499A A701"            /* !›.BR'7–c].çIš§. */
+        $"7F74 FB13 F9DF E737 08AB 0A91 3D9E B77D"            /* .tû.ùßç7.«Â‘=ž·} */
+        $"E616 57BB 8BAF 7A0D 1B28 42E6 D653 6BD3"            /* æ.W»‹¯z..(BæÖSkÓ */
+        $"D7A8 9A2B 0905 6198 8809 E5D0 D0A4 F589"            /* רš+Æ.a˜ˆÆåÐФõ‰ */
+        $"3D04 8161 C4CB 7BC9 96E2 9DA4 1C59 C982"            /* =.�aÄË{É–â�¤.YÉ‚ */
+        $"4705 B1BE 1E05 E391 5E89 43FE 6C67 4342"            /* G.±¾..ã‘^‰CþlgCB */
+        $"636F 80C5 6A98 16E6 6B80 27C8 D0D9 B28C"            /* co€Åj˜.æk€'ÈÐÙ²Œ */
+        $"6FD4 E109 61AB 8FCB D4CB 19ED 2BE7 B510"            /* oÔáÆa«�ËÔË.í+çµ. */
+        $"C0E8 5883 0642 92A1 6094 7E45 5D3F 819A"            /* ÀèXƒ.B’¡`”~E]?�š */
+        $"4B6F AE8E ED0B 4B30 ABB1 2789 5C58 EEFD"            /* Ko®Ží.K0«±'‰\Xîý */
+        $"06C9 EF2B 2A12 1731 7581 4428 C72D 2501"            /* .Éï+*..1u�D(Ç-%. */
+        $"2C14 0DA4 2C98 035F FEA8 51A2 0E61 4C50"            /* ,..¤,˜._þ¨Q¢.aLP */
+        $"4A65 60DE FA1C F36C 62D9 A3FA 93A6 4CAC"            /* Je`Þú.ólbÙ£ú“¦L¬ */
+        $"C1D0 079D 912F A133 724B 13CC AFF4 1382"            /* ÁÐ.�‘/¡3rK.̯ô.‚ */
+        $"D61F 8AF2 A48B CCA6 5D66 4F61 E6BE 657B"            /* Ö.Šò¤‹Ì¦]fOaæ¾e{ */
+        $"7F5B 6F20 397A BBC2 3F23 86DF 2355 4A18"            /* .[o 9z»Â?#†ß#UJ. */
+        $"15DB CB3E 201F FF7C 4AC9 C764 B098 CA46"            /* .ÛË> .ÿ|JÉÇd°˜ÊF */
+        $"C2CF 44C6 42E7 D30A FD05 380F 6BD3 24C1"            /* ÂÏDÆBçÓÂý.8.kÓ$Á */
+        $"3998 C5C1 E7D5 0E2C 8D50 7FBB 7A11 6CB7"            /* 9˜ÅÁçÕ.,�P.»z.l· */
+        $"B80F 5A84 44BE E746 C43C 6B5D F055 7A3B"            /* ¸.Z„D¾çFÄ<k]ðUz; */
+        $"77CB BFA9 2B73 06AF 9C8B AF37 F600 E568"            /* wË¿©+s.¯œ‹¯7ö.åh */
+        $"EE70 09D2 B0A7 C201 94D9 AC58 E9A2 9D53"            /* îpÆÒ°§Â.”Ù¬Xé¢�S */
+        $"94C0 D1C9 E379 E453 E4C7 27C5 C3F8 1161"            /* ”ÀÑÉãyäSäÇ'ÅÃø.a */
+        $"D631 3F3C 0CFE 13A3 F6EB 3048 F049 CF11"            /* Ö1?<.þ.£öë0HðIÏ. */
+        $"5962 65AE 5D8E F911 A2E2 7787 6C78 F63C"            /* Ybe®]Žù.¢âw‡lxö< */
+        $"E24C ED5B F634 B2B9 9DDF 51B0 94B9 1ABF"            /* âLí[ö4²¹�ßQ°”¹.¿ */
+        $"BE93 4236 35A6 613E 3D1B C8FD 0587 27C7"            /* ¾“B65¦a>=.Èý.‡'Ç */
+        $"F936 55E0 D0CE BF1A 50D8 51CE 6253 0293"            /* ù6UàÐο.PØQÎbS.“ */
+        $"1958 3FA2 BF6C 54A5 B158 4236 7F88 7DE4"            /* .X?¢¿lT¥±XB6.ˆ}ä */
+        $"C231 6D0B 62F1 2C6C 1A1D F8AA 0317 C52D"            /* Â1m.bñ,l..øª..Å- */
+        $"D9D5 0B61 312B A074 B2B8 1905 FCF9 A102"            /* ÙÕ.a1+ t²¸..üù¡. */
+        $"6188 616D 74E6 8232 245D 9C8A 4FD8 E2FD"            /* aˆamtæ‚2$]œŠOØâý */
+        $"0C6C 8F2E 5C82 5724 C542 3AE5 BA0A EE0B"            /* .l�.\‚W$ÅB:åºÂî. */
+        $"2A14 BCDE 8005 4446 25B1 CF8A 6744 9F5C"            /* *.¼Þ€.DF%±ÏŠgDŸ\ */
+        $"9B09 6571 3003 9F52 A42A 7669 CCAA 7A75"            /* ›Æeq0.ŸR¤*vi̪zu */
+        $"F807 2530 7BA9 1474 F318 5A7B E64A 5DD7"            /* ø.%0{©.tó.Z{æJ]× */
+        $"A6F2 13B0 AFA5 7BF8 46DC CABF 4D80 CC26"            /* ¦ò.°¯¥{øFÜÊ¿M€Ì& */
+        $"5838 4016 3C05 4550 C62F 1504 5B79 0816"            /* X8@.<.EPÆ/..[y.. */
+        $"556C 8524 5DDA E914 92F1 3124 5C5B 3213"            /* Ul…$]Úé.’ñ1$\[2. */
+        $"7851 D9B8 EE79 46CF 3F06 1EAB 662A FD9E"            /* xQÙ¸îyFÏ?..«f*ýž */
+        $"E7D8 2E8C 938F 43FA B1B1 34B0 9207 34EC"            /* çØ.Œ“�Cú±±4°’.4ì */
+        $"7A09 46BF 201E 311F EEEE 88EF C6C1 C10D"            /* zÆF¿ .1.îîˆïÆÁÁ. */
+        $"E238 50C9 7F01 DFF0 2170 EDD1 7471 8C14"            /* â8PÉ..ßð!píÑtqŒ. */
+        $"FB17 6678 A8B9 6611 9713 D8BB 8840 427C"            /* û.fx¨¹f.—.Ø»ˆ@B| */
+        $"8E5E 1608 D5E6 79B6 0BD7 3592 5D97 3864"            /* Ž^..Õæy¶.×5’]—8d */
+        $"71DF 6137 C0E6 2EB0 F71D 466C CFFF 50EF"            /* qßa7Àæ.°÷.FlÏÿPï */
+        $"FE99 2E4D 0DBB 537F 32F1 DECB D5D4 39DF"            /* þ™.M.»S.2ñÞËÕÔ9ß */
+        $"4FCC 2FC2 C399 8EB9 FC8B 2806 3FB7 F227"            /* OÌ/ÂÙŽ¹ü‹(.?·ò' */
+        $"BA12 A288 9858 9159 B6ED 0DBF 3DCC 8FA1"            /* º.¢ˆ˜X‘Y¶í.¿=Ì�¡ */
+        $"9CF5 836D 499F B9E7 DB4E 497F D3A4 57BF"            /* œõƒmIŸ¹çÛNI.Ó¤W¿ */
+        $"9F0A EECE 8E29 127A 82FF 4222 75AC 32D4"            /* ŸÂîÎŽ).z‚ÿB"u¬2Ô */
+        $"6540 8040 4137 9EB4 EFFF 7FEC 9D37 60B4"            /* e@€@A7ž´ïÿ.ì�7`´ */
+        $"184A 9567 71E4 F5FE 1C55 BB95 9FD8 BE6D"            /* .J•gqäõþ.U»•ŸØ¾m */
+        $"037F 052C 035B 91D7 903B 6EEC 1642 3D18"            /* ...,.[‘×�;nì.B=. */
+        $"0B05 FEC5 4C0C 9ED3 BFA5 94AF CBB1 E725"            /* ..þÅL.žÓ¿¥”¯Ë±ç% */
+        $"DFC3 AF74 2485 D5A2 7F79 1275 C7DD ADE1"            /* ßït$…Õ¢.y.uÇÝ­á */
+        $"3BD5 AD19 74E6 EE9F 6846 7900 C09D 090B"            /* ;Õ­.tæîŸhFy.À�Æ. */
+        $"C17C FB0F 2C9F 4DEB B9FE 7152 A47E B1CB"            /* Á|û.,ŸMë¹þqR¤~±Ë */
+        $"FB0E 7108 21C7 EFAB 8FA3 8AF0 2FDC 17A9"            /* û.q.!Çï«�£Šð/Ü.© */
+        $"2565 5082 BEBF 4DDD 0699 3265 82AE D421"            /* %eP‚¾¿MÝ.™2e‚®Ô! */
+        $"3776 341F C56C ECDA B302 0306 AE5F 37FF"            /* 7v4.ÅlìÚ³...®_7ÿ */
+        $"7FB7 1192 8D68 5475 EE0B 4D80 6149 DEBB"            /* .·.’�hTuî.M€aIÞ» */
+        $"F9A7 D7E7 A35D 9515 8000 4F04 C4D6 670C"            /* ù§×ç£]•.€.O.ÄÖg. */
+        $"54B7 93BB D264 43E0 E8D4 2D4D D3E2 AEB0"            /* T·“»ÒdCàèÔ-MÓâ®° */
+        $"FBAE F5BD A155 A8F2 07B4 AAA6 CE0A 84CC"            /* û®õ½¡U¨ò.´ª¦ÎÂ„Ì */
+        $"907F D5C4 9900 8FE2 0E0D F385 55A0 CDFF"            /* �.ÕÄ™.�â..ó…U Íÿ */
+        $"7FFE D776 193F A5C4 0334 DD15 7A6A 0890"            /* .þ×v.?¥Ä.4Ý.zj.� */
+        $"DE98 5707 7799 9A5B D638 31B9 982B 5623"            /* Þ˜W.w™š[Ö81¹˜+V# */
+        $"3AFA A84A 20E7 417C F56E 7776 0C54 0765"            /* :ú¨J çA|õnwv.T.e */
+        $"91DE A19E 3DD2 4D8B F9F9 0D61 6343 0746"            /* ‘Þ¡ž=ÒM‹ùù.acC.F */
+        $"7D72 600B 4E15 FC8F 60FA A273 4348 A86E"            /* }r`.N.ü�`ú¢sCH¨n */
+        $"E11A CD6B 3FFF 7ED1 E486 AAAA A380 045A"            /* á.Ík?ÿ~Ñ䆪ª£€.Z */
+        $"70E5 3753 4FFF 7FC6 ADBE 8E71 66FF 8165"            /* på7SOÿ.Æ­¾Žqfÿ�e */
+        $"D782 24E8 7399 0C15 03BF 29B5 5685 FDA1"            /* ׂ$ès™...¿)µV…ý¡ */
+        $"5BAD 5751 6D53 799A A7C6 572E 6A37 B46A"            /* [­WQmSyš§ÆW.j7´j */
+        $"B9BF 05BF 3131 F7DB E3B8 8F11 EE2F 13D6"            /* ¹¿.¿11÷Ûã¸�.î/.Ö */
+        $"7DE9 D552 0B25 FEAF AEFE F0A7 FBE9 487F"            /* }éÕR.%þ¯®þð§ûéH. */
+        $"9085 0FFA 23FE A9DB 0494 B0E1 FEFD 1D50"            /* �….ú#þ©Û.”°áþý.P */
+        $"15B4 6548 AAA0 0182 C5FF 7D24 05C8 B15E"            /* .´eHª .‚Åÿ}$.ȱ^ */
+        $"E45F A508 3C68 CA73 3A57 A35E 462D 9213"            /* ä_¥.<hÊs:W£^F-’. */
+        $"9D19 A4FE F266 C323 64FF 7B71 19F7 0BC3"            /* �.¤þòfÃ#dÿ{q.÷.Ã */
+        $"062C 20C4 9745 F075 6FFF 31F0 A3AD 4C84"            /* ., Ä—Eðuoÿ1ð£­L„ */
+        $"00F3 104C 0064 3899 0DB9 8128 CB5F FF46"            /* .ó.L.d8™.¹�(Ë_ÿF */
+        $"7184 41CB 7E58 4C0B ADD5 CBB2 1A61 E3D6"            /* q„AË~XL.­Õ˲.aãÖ */
+        $"B45F 489E 7FE9 D915 2B77 0776 98BD B3A6"            /* ´_Hž.éÙ.+w.v˜½³¦ */
+        $"230E B817 1D5A D937 3251 2449 6B0A 5A13"            /* #.¸..ZÙ72Q$IkÂZ. */
+        $"C4E0 BB45 CB72 9758 9E56 158D B1E6 9590"            /* Äà»EËr—XžV.�±æ•� */
+        $"4FC4 0611 EDBC 426F 6D2B D932 D595 A74E"            /* OÄ..í¼Bom+Ù2Õ•§N */
+        $"8728 58CD BD02 9746 DBA2 7EAB 0F07 363C"            /* ‡(Xͽ.—FÛ¢~«..6< */
+        $"BAB3 1228 E02A BDB4 373F F3FB FF7D 8D0D"            /* º³.(à*½´7?óûÿ}�. */
+        $"2193 09F4 7603 A017 98B1 421E 7A47 D126"            /* !“Æôv. .˜±B.zGÑ& */
+        $"82FD 5449 B97F F864 5CD5 19F6 A8A4 F216"            /* ‚ýTI¹.ød\Õ.ö¨¤ò. */
+        $"A4B3 FF7F E820 4C58 DE4B 944B 6FD4 F4DA"            /* ¤³ÿ.è LXÞK”KoÔôÚ */
+        $"596E A688 456C 3F0D 7844 1596 2BED 0D5D"            /* Yn¦ˆEl?.xD.–+í.] */
+        $"FAFB 8D2E D7D0 ABCB B2BE 8D80 E74D 9EDC"            /* úû�.×Ы˲¾�€çMžÜ */
+        $"7FFF 7FC9 2FB9 3BDA F47A B9C2 E1B8 5CC8"            /* .ÿ.É/¹;Úôz¹Âá¸\È */
+        $"14AB D534 7208 32FE 73D2 EF23 862E 10F8"            /* .«Õ4r.2þsÒï#†..ø */
+        $"C16F 1FFF 6FBB FA97 5167 CDAD 4886 8FC2"            /* Áo.ÿo»ú—QgÍ­H†� */
+        $"BFFF 7FFE 2B73 126E 1EC8 C82A 3F6D 6CC3"            /* ¿ÿ.þ+s.n.ÈÈ*?mlà */
+        $"D98A D501 1DC2 82FD FF57 9731 B866 2A7D"            /* ÙŠÕ..‚ýÿW—1¸f*} */
+        $"C983 5F41 893F 2D09 F81C E373 42C2 5963"            /* Ƀ_A‰?-Æø.ãsBÂYc */
+        $"7E9F C269 2B8B C21A 8247 D433 0DF7 491E"            /* ~ŸÂi+‹Â.‚GÔ3.÷I. */
+        $"D1BF 3D9E F4BD 1B50 8034 4EE9 4A69 B155"            /* Ñ¿=žô½.P€4NéJi±U */
+        $"849A B0F7 8CEA 3FD0 E4A0 C339 2431 ED8B"            /* „š°÷Œê?Ðä Ã9$1í‹ */
+        $"793D 6354 12C0 97F9 C379 ADA9 7DEE E5EF"            /* y=cT.À—ùÃy­©}îåï */
+        $"2366 FD9F 7F36 9703 7BCA 1455 6A98 F02E"            /* #fýŸ.6—.{Ê.Uj˜ð. */
+        $"1EDC 4707 C9A6 B325 A6E4 637D 612B B3DD"            /* .ÜG.ɦ³%¦äc}a+³Ý */
+        $"1E5A 3660 EEB0 BEFA 2C50 307B 5887 6D39"            /* .Z6`î°¾ú,P0{X‡m9 */
+        $"0EC7 2D81 C32E 6B72 8546 30E4 133F 3D3B"            /* .Ç-�Ã.kr…F0ä.?=; */
+        $"0A76 21AA 4387 8F29 03C8 1C32 755C F553"            /* Âv!ªC‡�).È.2u\õS */
+        $"5CA1 C16A 02EC 4654 97C8 6F10 BA2A 16E0"            /* \¡Áj.ìFT—Èo.º*.à */
+        $"DB18 605E 8A18 8A6E 4F35 1EF7 8C57 F8B2"            /* Û.`^Š.ŠnO5.÷ŒWø² */
+        $"0020 4D0A 1739 2287 ADE2 B0C2 D816 17D2"            /* . MÂ.9"‡­â°ÂØ..Ò */
+        $"21F8 3104 FEA8 38E3 8644 6F0B D2C6 A599"            /* !ø1.þ¨8ã†Do.ÒÆ¥™ */
+        $"B793 1367 B548 23BD 8836 1143 D5DB 2720"            /* ·“.gµH#½ˆ6.CÕÛ'  */
+        $"73BB 1485 DEAF C96F 24E8 AA26 56B9 89D3"            /* s».…Þ¯Éo$èª&V¹‰Ó */
+        $"8F8D 2F3E 5EA5 466C BE3C 6879 6C0A 5891"            /* ��/>^¥Fl¾<hylÂX‘ */
+        $"974E 6F22 0E47 66D4 BD1F 6A7D 1885 42CC"            /* —No".GfÔ½.j}.…BÌ */
+        $"7E13 126E AC98 74B7 B093 BDFF 37DB E527"            /* ~..n¬˜t·°“½ÿ7Ûå' */
+        $"E6D0 CF2A D7E6 E7EB 1095 05AF 6407 BB9B"            /* æÐÏ*×æçë.•.¯d.»› */
+        $"0227 D5EB 260A C844 340F B249 E84F 58A7"            /* .'Õë&ÂÈD4.²IèOX§ */
+        $"FA14 9D34 7614 73A6 BE73 ED76 B2CD 4515"            /* ú.�4v.s¦¾sív²ÍE. */
+        $"F26C 3AD7 7C32 5480 5A3A C4DF 123A EA95"            /* òl:×|2T€Z:Äß.:ê• */
+        $"D2B4 A3D8 F88D E685 6505 A999 DD9E C8D1"            /* Ò´£Øø�æ…e.©™ÝžÈÑ */
+        $"A073 3702 5A8F 3598 F7DC A36F 0058 065E"            /*  s7.Z�5˜÷Ü£o.X.^ */
+        $"65E6 B5AC 2A85 0F1C 43BF 8A10 43A0 BB10"            /* e浬*…..C¿Š.C ». */
+        $"4C3A 8F4F 95AD 253D EEE9 FBE8 4023 4647"            /* L:�O•­%=îéûè@#FG */
+        $"7A75 8F1C 9245 3C51 3FF5 BD2B DFD3 57EF"            /* zu�.’E<Q?õ½+ßÓWï */
+        $"1FB4 900F 4546 6EFA A7AE 45EB EAE9 7B9D"            /* .´�.EFnú§®Eëêé{� */
+        $"6408 1DCB F7AC BE44 7D08 1482 2257 A9CF"            /* d..Ë÷¬¾D}..‚"W©Ï */
+        $"8B78 3610 9816 9518 A64C 215A 4569 6C5F"            /* ‹x6.˜.•.¦L!ZEil_ */
+        $"57E0 4F89 F77C 88D6 ADFC 8E42 9299 A2C9"            /* WàO‰÷|ˆÖ­üŽB’™¢É */
+        $"0F7C EA0A 7E98 B7AF 70ED 09A8 0759 B1A7"            /* .|êÂ~˜·¯píƨ.Y±§ */
+        $"C18E 2CC9 883F A788 A2F1 57B9 7A0E F384"            /* ÁŽ,Ɉ?§ˆ¢ñW¹z.ó„ */
+        $"F0CE 46F0 E10A ED6F CE17 2BE1 25D5 3A36"            /* ðÎFðáÂíoÎ.+á%Õ:6 */
+        $"5C6A F3AA F2D1 7225 6C5C 514F 8F1F 64A5"            /* \jóªòÑr%l\QO�.d¥ */
+        $"B08E D05D 3E2E B3E4 DE48 12A9 7DC6 6E03"            /* °ŽÐ]>.³äÞH.©}Æn. */
+        $"05B3 2AD0 EF87 EFB1 6D03 06E4 85AB 36C6"            /* .³*Ðï‡ï±m..ä…«6Æ */
+        $"9BF6 8382 74F2 F321 62DF 269C 8D95 8FBD"            /* ›öƒ‚tòó!bß&œ�•�½ */
+        $"C4CA 7278 FDBA C51B A4FC C224 BD43 5F76"            /* ÄÊrxýºÅ.¤üÂ$½C_v */
+        $"F9D9 0970 5EAA 5F05 FDCB 50DE 35E7 A82E"            /* ùÙÆp^ª_.ýËPÞ5ç¨. */
+        $"1E7E 584D 33D8 EF90 B221 622F 778E 460D"            /* .~XM3Øï�²!b/wŽF. */
+        $"6DC9 383F CF41 7B89 7414 97EF EFE2 CC75"            /* mÉ8?ÏA{‰t.—ïïâÌu */
+        $"8895 6AFD C6E8 610E 5E29 7AE1 FAAF 9FD5"            /* ˆ•jýÆèa.^)záú¯ŸÕ */
+        $"435F 3F61 6F9F AC78 7EAD 62BE 7DF7 7CFD"            /* C_?aoŸ¬x~­b¾}÷|ý */
+        $"D3FD 5BAF 83F5 5B37 CF6D BE7E 9DDF 3F4D"            /* Óý[¯ƒõ[7Ïm¾~�ß?M */
+        $"80E8 ABDE CCAF 0D6C 8AC6 9587 348A 7A5A"            /* €è«Þ̯.lŠÆ•‡4ŠzZ */
+        $"21F6 5D05 F6A4 1727 AC99 8E36 4607 A805"            /* !ö].ö¤.'¬™Ž6F.¨. */
+        $"1CA8 FB12 6979 4216 6FCF DF65 6135 AFF9"            /* .¨û.iyB.oÏßea5¯ù */
+        $"5A1E 01C1 15A0 4F38 E547 6F65 858D 0788"            /* Z..Á. O8åGoe…�.ˆ */
+        $"49E3 07A2 D476 B767 EC21 FF65 559D 3B3F"            /* Iã.¢Ôv·gì!ÿeU�;? */
+        $"B8A5 C1A8 6496 5183 24E6 93A6 DF2F 52F1"            /* ¸¥Á¨d–Qƒ$擦ß/Rñ */
+        $"19CA BFD7 1479 8040 2F9C 0DB9 00F0 49C5"            /* .Ê¿×.y€@/œ.¹.ðIÅ */
+        $"3D32 5B0C 9453 8D1F 452F D9E7 75FD CD61"            /* =2[.”S�.E/ÙçuýÍa */
+        $"44A9 62C3 F0C8 BAF0 6A66 A4D4 AA8B 73B0"            /* D©bÃðȺðjf¤Ôª‹s° */
+        $"C942 686A 4A1E E3A7 2343 A0ED D595 9AFC"            /* ÉBhjJ.ã§#C íÕ•šü */
+        $"5546 0ACB FD23 6F2E DCEE ABBD 70E7 FA93"            /* UFÂËý#o.Üpçú“ */
+        $"3FFF 7FC5 7D31 FA1C D910 1C70 6CDC 3362"            /* ?ÿ.Å}1ú.Ù..plÜ3b */
+        $"B0A1 C6F3 16D1 BE51 73D2 4697 37CA 8197"            /* °¡Æó.ѾQsÒF—7Ê�— */
+        $"A8C6 89C1 FF78 99EB 31B8 5F88 7B08 C557"            /* ¨Æ‰Áÿx™ë1¸_ˆ{.ÅW */
+        $"5483 A35C 0713 94D5 D2DF B84C 36CA D9EC"            /* Tƒ£\..”ÕÒ߸L6ÊÙì */
+        $"8FC7 A305 814F 8B04 07D2 E391 5E89 43FE"            /* �Ç£.�O‹..Òã‘^‰Cþ */
+        $"6C67 4343 91DB DD56 C1D2 FEA6 9F1F 346F"            /* lgCC‘ÛÝVÁÒþ¦Ÿ.4o */
+        $"714B 79E1 7AC7 53A1 9934 69F4 E886 5A9C"            /* qKyázÇS¡™4iôè†Zœ */
+        $"6F9A D26F DD48 5F60 A72A 7E20 77F8 1BE8"            /* ošÒoÝH_`§*~ wø.è */
+        $"91B9 9018 8124 7694 3664 4202 7B94 1007"            /* ‘¹�.�$v”6dB.{”.. */
+        $"4234 15FC 04A2 6DE0 DC6B 5EDE 4332 F592"            /* B4.ü.¢màÜk^ÞC2õ’ */
+        $"779A A3BD 8E84 5464 DE08 6BAE AE2F 6EEF"            /* wš£½Ž„TdÞ.k®®/nï */
+        $"CB75 5862 59D8 1362 5D60 79D2 137C 7606"            /* ËuXbYØ.b]`yÒ.|v. */
+        $"F2B1 06DE 8A2F B76A A7D9 84DB 8F52 1107"            /* ò±.ÞŠ/·j§Ù„Û�R.. */
+        $"A42C 9803 2476 0448 42C9 A9E5 D0F5 9110"            /* ¤,˜.$v.HBÉ©åÐõ‘. */
+        $"2FAB AAF4 0752 81C9 6064 B8F7 6CEB 438E"            /* /«ªô.R�É`d¸÷lëCŽ */
+        $"DC4B 916C 21F0 1C8F 2A6A 1919 9E26 2B36"            /* ÜK‘l!ð.�*j..ž&+6 */
+        $"3E51 F543 F7C5 2549 66D0 2F14 D18F 42F1"            /* >QõC÷Å%IfÐ/.Ñ�Bñ */
+        $"397B BA52 99ED 853C E07D 629B 92A1 2589"            /* 9{ºR™í…<à}b›’¡%‰ */
+        $"B3A9 B812 DC8D A368 3204 F8AA 7549 AF2B"            /* ³©¸.Ü�£h2.øªuI¯+ */
+        $"2DE7 529C 1ECB 9747 A4B8 F6EC 8DDC 0AC4"            /* -çRœ.Ë—G¤¸öì�ÜÂÄ */
+        $"2C31 F042 C407 3F18 FD32 9280 60E4 60D8"            /* ,1ðBÄ.?.ý2’€`ä`Ø */
+        $"77B5 C019 A5FF 6E0D 8E35 A78E C7AA E95B"            /* wµÀ.¥ÿn.Ž5§ŽÇªé[ */
+        $"D37C D883 5DD2 756B 385A 08BB 7708 AA5E"            /* Ó|؃]Òuk8Z.»w.ª^ */
+        $"5B89 0628 F831 7775 3555 A523 BF2F 721A"            /* [‰.(ø1wu5U¥#¿/r. */
+        $"099B E6B4 5128 9EA6 41E1 9B8B 18C1 928C"            /* Æ›æ´Q(ž¦Aᛋ.Á’Œ */
+        $"72A0 BD1E 84D6 836A C947 0982 284A 9238"            /* r ½.„ÖƒjÉGÆ‚(J’8 */
+        $"A06F E390 1BD5 BBFD 323F BA86 2091 BAD5"            /*  oã�.Õ»ý2?º† ‘ºÕ */
+        $"351D 16C5 1D44 E8C7 66C7 D469 047D 5548"            /* 5..Å.DèÇfÇÔi.}UH */
+        $"7049 7B42 B682 DF4C 68DE B5D2 2EDC C105"            /* pI{B¶‚ßLhÞµÒ.ÜÁ. */
+        $"4047 9A7E 0403 F48B 6215 C3ED 8DBA 12E9"            /* @Gš~..ô‹b.Ãí�º.é */
+        $"EEFB B61B 906E F6F6 DDFD D030 CD1C 47FD"            /* îû¶.�nööÝýÐ0Í.Gý */
+        $"7C37 E7C7 DC08 213E 3C33 08E6 74A0 F400"            /* |7çÇÜ.!><3.æt ô. */
+        $"7CFC 3B85 1A2E 5ACA 573F F24C 7D2C 0E3B"            /* |ü;…..ZÊW?òL},.; */
+        $"2A6D CEDC 6C9C 6E97 A572 915F A892 3833"            /* *mÎÜlœn—¥r‘_¨’83 */
+        $"A08F 0070 A602 FB49 0EA6 62FC 4237 C568"            /*  �.p¦.ûI.¦büB7Åh */
+        $"E937 1DC1 1FC2 C3F1 AA30 AC4D DDB8 E747"            /* é7.Á.ÂÃñª0¬MݸçG */
+        $"5EE4 FD73 8124 56EB ADBE 6DB3 F27B 80C0"            /* ^äýs�$Vë­¾m³ò{€À */
+        $"E536 971B 511B C76B AB20 8BA4 4DCD BFCB"            /* å6—.Q.Çk« ‹¤MÍ¿Ë */
+        $"4A0C 34DC 3DDC 9BEF 5122 89D0 99D1 9BE7"            /* J.4Ü=Ü›ïQ"‰Ð™Ñ›ç */
+        $"8840 002A A77A 25E2 9C2C F9BC 78F9 FB0E"            /* ˆ@.*§z%âœ,ù¼xùû. */
+        $"0DB7 4F14 B07A 12F6 65D3 ABE1 660D A84A"            /* .·O.°z.öeÓ«áf.¨J */
+        $"EFF9 A799 1852 8ED0 9582 B79A D812 1BE6"            /* ïù§™.RŽÐ•‚·šØ..æ */
+        $"F3D0 D5FA 9C76 5EBD DBFD 42A9 F7B3 885E"            /* óÐÕúœv^½ÛýB©÷³ˆ^ */
+        $"4A68 DBE7 9663 FB7F 1AC4 5004 197F 97F0"            /* JhÛç–cû..ÄP...—ð */
+        $"F57B 135D 19ED E0E0 1C84 139C BA3B 2493"            /* õ{.].íàà.„.œº;$“ */
+        $"D997 333D B6A7 9E83 619C FCE9 9875 134D"            /* Ù—3=¶§žƒaœüé˜u.M */
+        $"4B31 FCB3 5808 B917 C8BB 0B67 4564 488E"            /* K1ü³X.¹.È».gEdHŽ */
+        $"3554 8125 C3A4 DB4A 0BB2 E501 244C 1F49"            /* 5T�%äÛJ.²å.$L.I */
+        $"C6A7 51E4 6C51 A134 3DF4 CE21 2993 FF3B"            /* ƧQälQ¡4=ôÎ!)“ÿ; */
+        $"80F6 AE0B B9F8 D1D5 8853 4531 6806 4F3E"            /* €ö®.¹øÑÕˆSE1h.O> */
+        $"D2B6 5F62 796A 683C D3C9 A22B 6D56 C497"            /* Ò¶_byjh<ÓÉ¢+mVÄ— */
+        $"D854 2E14 C281 0F94 0220 BEE7 3754 D077"            /* ØT..Â�.”. ¾ç7TÐw */
+        $"EDB0 0F0E 95C1 A40B 55C9 B5AE 4DA8 A8A6"            /* í°..•Á¤.Uɵ®M¨¨¦ */
+        $"ADD6 4A11 DE81 B148 70D3 FA4F 795C 9171"            /* ­ÖJ.Þ�±HpÓúOy\‘q */
+        $"C72E 7EF2 454C 0336 BE4A EE68 960E 25BA"            /* Ç.~òEL.6¾Jîh–.%º */
+        $"E686 01F4 6FF5 3C7C 8B33 60D8 24D3 70A1"            /* æ†.ôoõ<|‹3`Ø$Óp¡ */
+        $"06C6 E616 29D4 63D6 3334 379F 743E 745D"            /* .Ææ.)ÔcÖ347Ÿt>t] */
+        $"4EF5 ECB5 072E 9F62 0750 F7BA 6FDE B6B0"            /* Nõìµ..Ÿb.P÷ºoÞ¶° */
+        $"0BD0 4FCC 8F59 9B13 0C77 0A30 9BAE DF36"            /* .ÐOÌ�Y›..wÂ0›®ß6 */
+        $"B13D D861 E92A 12C7 EC7A 0946 BF20 1E31"            /* ±=Øaé*.ÇìzÆF¿ .1 */
+        $"1FEE EE88 EFC6 C1C1 0DE2 3850 C97F 01DF"            /* .îîˆïÆÁÁ.â8PÉ..ß */
+        $"F021 605A D52A 570D 7089 0C1B B3FE 8B4D"            /* ð!`ZÕ*W.p‰..³þ‹M */
+        $"E441 70AC 5F71 3FCE 527F EBF4 048A A307"            /* äAp¬_q?ÎR.ëô.Š£. */
+        $"CEFD 4EB0 87ED BFE2 A36C 51B9 EAD3 37C6"            /* ÎýN°‡í¿â£lQ¹êÓ7Æ */
+        $"E8F0 9A3D 8F78 8747 81D4 33F0 9EEB 5EA0"            /* èðš=�x‡G�Ô3ðžë^  */
+        $"6FE0 A580 6B6B C126 1CE3 F1B2 DC9C CFCE"            /* oीkkÁ&.ãñ²ÜœÏÎ */
+        $"42EE 7E91 EF2F 0DDF CFDE 75EB 554D 6941"            /* Bî~‘ï/.ßÏÞuëUMiA */
+        $"07A5 21BE AD52 7CC1 49B5 FE74 AE40 F70F"            /* .¥!¾­R|ÁIµþt®@÷. */
+        $"AB3B 0C16 98F5 7742 3DCE 842D 0B2B 2FEB"            /* «;..˜õwB=΄-.+/ë */
+        $"5E90 DEBC 8BA9 81AC 40CC 0030 2853 FE9C"            /* ^�Þ¼‹©�¬@Ì.0(Sþœ */
+        $"6FC2 569B 2CD1 6200 2881 802D 7697 8442"            /* oÂV›,Ñb.(�€-v—„B */
+        $"92C8 666B BC90 3252 F4D3 9BD2 AD14 0027"            /* ’Èfk¼�2RôÓ›Ò­..' */
+        $"CE11 F5A4 437B 3F80 B250 AA4C 23B6 AD83"            /* Î.õ¤C{?€²PªL#¶­ƒ */
+        $"277E 5EF0 8132 6331 9325 D1A3 CFB6 6F73"            /* '~^ð�2c1“%ѣ϶os */
+        $"D37D 780F 91CC CD40 6234 2FE2 F097 1681"            /* Ó}x.‘ÌÍ@b4/âð—.� */
+        $"6097 88BD BFFF 18F5 2CBB FF67 FDBC 2F07"            /* `—ˆ½¿ÿ.õ,»ÿgý¼/. */
+        $"67FF 7FFF 1946 84C7 A551 03FF 7F52 A7C2"            /* gÿ.ÿ.F„Ç¥Q.ÿ.R§Â */
+        $"8AC8 1080 56FF 0C48 1804 A884 A5A2 08FF"            /* ŠÈ.€Vÿ.H..¨„¥¢.ÿ */
+        $"7FF5 3220 8043 9005 C25D DE15 02FB 7F2B"            /* .õ2 €C�.Â]Þ..û.+ */
+        $"8205 5CA8 40BE EFB1 78F0 2656 2AD4 14FF"            /* ‚.\¨@¾ï±xð&V*Ô.ÿ */
+        $"7505 20CD 8BE2 8B15 47BB 9E26 105E 15DD"            /* u. Í‹â‹.G»ž&.^.Ý */
+        $"21A7 82AE E19D FE27 5D8B DDAD E13B D5AD"            /* !§‚®á�þ']‹Ý­á;Õ­ */
+        $"1974 E6EE 9F68 4679 00C0 9D09 0BC1 7CFB"            /* .tæîŸhFy.À�Æ.Á|û */
+        $"0F2C 9F4E 082C 2CB4 569B A7B0 0009 E098"            /* .,ŸN.,,´V›§°.Æà˜ */
+        $"9AB0 9892 B1FF 6957 1D78 2613 4289 24C6"            /* š°˜’±ÿiW.x&.B‰$Æ */
+        $"12BC E2EF C9AE E6D9 784F C157 77AB 3470"            /* .¼âïÉ®æÙxOÁWw«4p */
+        $"D8C7 C746 1978 322D D4E9 FA24 B8B2 5054"            /* ØÇÇF.x2-Ôéú$¸²PT */
+        $"D643 8270 9090 D6D8 0C24 16E5 1146 421C"            /* ÖC‚p��ÖØ.$.å.FB. */
+        $"D6A2 40D9 1864 A800 0000 0000 0001 4554"            /* Ö¢@Ù.d¨.......ET */
+        $"031E 793B 33D3 FD4A CE0A 3D8A 9D46 37B0"            /* ..y;3ÓýJÎÂ=Š�F7° */
+        $"4D2C 6F04 2BFF 071C 023F E153 6688 1815"            /* M,o.+ÿ...?áSfˆ.. */
+        $"BA20 BF61 DDDF 2979 84E3 3348 50F6 E9B8"            /* º ¿aÝß)y„ã3HPöé¸ */
+        $"634A 8937 FF7F F1AE E84B C95A 771F 4C9C"            /* cJ‰7ÿ.ñ®èKÉZw.Lœ */
+        $"3FFE 0734 7D7F 6E35 4A2E 21E0 E52F FF7E"            /* ?þ.4}.n5J.!àå/ÿ~ */
+        $"8532 8513 7869 A6E6 495D 3E58 F349 1EF5"            /* …2….xi¦æI]>XóI.õ */
+        $"886C 6441 9091 82E8 0C24 1507 0E02 A105"            /* ˆldA�‘‚è.$....¡. */
+        $"95C5 1409 096C 9A37 F758 F13A 5ABF 149E"            /* •Å.ÆÆlš7÷Xñ:Z¿.ž */
+        $"DA31 52E9 0DA9 0BFF 45EB 20C7 1A1C E54C"            /* Ú1Ré.©.ÿEë Ç..åL */
+        $"29D1 6C8E D1EC 9D59 F945 4303 373F FF7F"            /* )ÑlŽÑì�YùEC.7?ÿ. */
+        $"CE95 B027 88F7 AB06 28B9 92E7 D540 BC2B"            /* Ε°'ˆ÷«.(¹’çÕ@¼+ */
+        $"7167 8C6C C87E 32B0 C904 7D7D 278E E519"            /* qgŒlÈ~2°É.}}'Žå. */
+        $"707D 2C42 1714 C425 F9D0 DC01 D910 23DB"            /* p},B..Ä%ùÐÜ.Ù.#Û */
+        $"E7F3 391C A4E6 FAE1 C850 5A1F 456A 6690"            /* çó9.¤æúáÈPZ.Ejf� */
+        $"3F37 F970 3841 73D3 1095 39CF 10A3 40F8"            /* ?7ùp8AsÓ.•9Ï.£@ø */
+        $"4CCC 4985 E3D5 127F 7CF4 92BC DCE9 2335"            /* LÌI…ãÕ..|ô’¼Üé#5 */
+        $"43FB 7460 8D5C C121 CFF2 1165 1CCE BBB2"            /* Cût`�\Á!Ïò.e.λ² */
+        $"5EA8 0279 2C97 E45B A43D 328C 7A6C 5EBC"            /* ^¨.y,—ä[¤=2Œzl^¼ */
+        $"61DD BB2C E34E 25E4 1725 3C6B EC12 BFEF"            /* aÝ»,ãN%ä.%<kì.¿ï */
+        $"3E5E 0ACF 766D 9D4E 8978 2AC5 F138 755A"            /* >^ÂÏvm�N‰x*Åñ8uZ */
+        $"CBDD 8421 F74E 9A07 A070 16ED 100C 769A"            /* ËÝ„!÷Nš. p.í..vš */
+        $"6571 1FA0 4D62 8ADC A3F1 0AAA 2253 1A39"            /* eq. MbŠÜ£ñª"S.9 */
+        $"0006 DF51 B09A 2267 BA13 3AD9 0120 8520"            /* ..ßQ°š"gº.:Ù. …  */
+        $"7375 BB11 0715 9FFF 7FFF 276F 9A44 4D02"            /* su»...Ÿÿ.ÿ'ošDM. */
+        $"9DF2 BE32 729A 8C71 FBC9 4C73 FA4B 1D24"            /* �ò¾2ršŒqûÉLsúK.$ */
+        $"4115 B69E 4FFF 7FFF 45B5 7091 9925 CEBD"            /* A.¶žOÿ.ÿEµp‘™%ν */
+        $"6A4E 1AA3 BFFF 7FFD AA3B 4043 EE5A 76B0"            /* jN.£¿ÿ.ýª;@CîZv° */
+        $"A073 CF17 7A58 3A06 649C B972 3CB8 897B"            /*  sÏ.zX:.dœ¹r<¸‰{ */
+        $"31E2 637A 05AC 83FA B94C 0F75 7113 FF7B"            /* 1âcz.¬ƒú¹L.uq.ÿ{ */
+        $"E690 225A FB16 A961 626A B7FE 22EF 864B"            /* æ�"Zû.©abj·þ"ï†K */
+        $"F464 1D62 4127 02B3 DB08 1C01 3ECE 1326"            /* ôd.bA'.³Û...>Î.& */
+        $"CF03 BF05 5771 4992 75FE 29FC 5FFF 60D5"            /* Ï.¿.WqI’uþ)ü_ÿ`Õ */
+        $"DCC3 1B1F 40FF 6990 DC69 3E47 D09A 6E6A"            /* ÜÃ..@ÿi�Üi>GКnj */
+        $"2866 9BA8 D74C BAAA 204E 05F9 DBFE E679"            /* (f›¨×Lºª N.ùÛþæy */
+        $"E76C 383D 9F92 BB32 1E14 2CA1 CBD5 E93C"            /* çl8=Ÿ’»2..,¡ËÕé< */
+        $"6C00 DFA2 B04F D650 3F14 60FF 7F73 29C3"            /* l.ߢ°OÖP?.`ÿ.s)à */
+        $"E20E 5672 C31B 6D72 FDCF 8097 B8B0 1482"            /* â.VrÃ.mrýÏ€—¸°.‚ */
+        $"C37E 4C4A 28FA 6E67 F061 E00C 371B 8655"            /* Ã~LJ(úngðaà.7.†U */
+        $"BDCB 2942 6AB1 0E31 38D3 6948 0D3F 6FEF"            /* ½Ë)Bj±.18ÓiH.?oï */
+        $"C2AB 669A E502 2490 C158 FC07 05F0 348A"            /* «fšå.$�ÁXü..ð4Š */
+        $"0505 F0B2 E7E3 F934 19DA 2DB9 9686 603E"            /* ..ð²çãù4.Ú-¹–†`> */
+        $"C2C3 4B2F EB95 FB4E 62D2 F085 4364 9DCA"            /* ÂÃK/ë•ûNbÒð…Cd�Ê */
+        $"A6E8 94F8 CC41 2603 5BFC 4E90 C05F 068D"            /* ¦è”øÌA&.[üN�À_.� */
+        $"414C 618C 8860 58B1 7059 0B4C 39E8 FB58"            /* ALaŒˆ`X±pY.L9èûX */
+        $"C413 43C6 BF39 CC12 6E5B F65C F671 DD29"            /* Ä.CÆ¿9Ì.n[ö\öqÝ) */
+        $"8A03 BC15 FF06 2028 49E4 BF04 E6FC D4FD"            /* Š.¼.ÿ. (Iä¿.æüÔý */
+        $"401A CB9C 5F7F EFE7 8F41 E707 7803 9F1A"            /* @.Ëœ_.ïç�Aç.x.Ÿ. */
+        $"715F 951E E63A 9B4C 1404 32AA B5B7 98B0"            /* q_•.æ:›L..2ªµ·˜° */
+        $"D5F4 CD69 DD15 9E81 D2FD 09F7 462D AF3E"            /* ÕôÍiÝ.ž�ÒýÆ÷F-¯> */
+        $"31DA 85C4 5053 8460 C06C 7018 908C 4821"            /* 1Ú…ÄPS„`Àlp.�ŒH! */
+        $"D8AB AC44 7666 44D1 EA04 8979 3A4A A0FE"            /* Ø«¬DvfDÑê.‰y:J þ */
+        $"27D7 B0C3 DBAA 5233 F376 3CA8 4968 DF8A"            /* '×°ÃÛªR3óv<¨Ihߊ */
+        $"874C 2117 6A15 4664 03FF 7FFF 7F7C 2D12"            /* ‡L!.j.Fd.ÿ.ÿ.|-. */
+        $"B28B 8A4C 6D72 1106 16E0 BF7F 9822 2424"            /* ²‹ŠLmr...à¿.˜"$$ */
+        $"3C1B CBC8 2F76 1AC7 FF7F FF7F EB42 22AA"            /* <.ËÈ/v.Çÿ.ÿ.ëB"ª */
+        $"F30A 0C9D 6086 E561 E1BC C1D9 4E7F FADF"            /* óÂ.�`†åaá¼ÁÙN.úß */
+        $"A85C B34C E2D4 FCF6 1A29 34F3 3B42 1DFC"            /* ¨\³LâÔüö.)4ó;B.ü */
+        $"C6BD 370B D203 B0C4 1C7D C348 1EE7 EAD9"            /* ƽ7.Ò.°Ä.}ÃH.çêÙ */
+        $"3145 E7FB 36CC 8E64 AB70 81DC 65E1 2C1D"            /* 1Eçû6ÌŽd«p�Üeá,. */
+        $"9CB5 18A0 1C95 7DE2 96DF C185 7A40 50C7"            /* œµ. .•}â–ßÁ…z@PÇ */
+        $"E32C FCC1 FF6B 14F5 05FE 0E1C 8757 8D82"            /* ã,üÁÿk.õ.þ..‡W�‚ */
+        $"3A41 284E 2906 8316 564F F479 4DCF FF7E"            /* :A(N).ƒ.VOôyMÏÿ~ */
+        $"5F11 3745 AC7F ED8D BC93 4205 7E12 E036"            /* _.7E¬.í�¼“B.~.à6 */
+        $"0BE4 4B4F F99C F369 6B38 263E 63EC 6311"            /* .äKOùœóik8&>cìc. */
+        $"D577 8B5D 7957 D24D 7D64 A2B5 1107 4625"            /* Õw‹]yWÒM}d¢µ..F% */
+        $"E1EB 2460 41A2 E878 5967 CEAE AE16 D8D5"            /* áë$`A¢èxYgή®.ØÕ */
+        $"F960 B484 0B49 7253 26F2 714E 6A13 03E4"            /* ù`´„.IrS&òqNj..ä */
+        $"A0C3 3924 31ED 8B79 3D63 5412 C097 F9C3"            /*  Ã9$1í‹y=cT.À—ùÃ */
+        $"79AD A97D EEE5 EF23 66FF 15BD C854 5DFB"            /* y­©}îåï#fÿ.½ÈT]û */
+        $"5921 E05C 6A39 B68E 6444 6D55 3B7D 6DDA"            /* Y!à\j9¶ŽdDmU;}mÚ */
+        $"9003 8F53 5C49 D978 31CD 41C5 DD62 7DE4"            /* �.�S\IÙx1ÍAÅÝb}ä */
+        $"2F24 5932 A14F 9C9C 97B6 2652 5988 7970"            /* /$Y2¡Oœœ—¶&RYˆyp */
+        $"F890 8A5C 9614 EBF4 DAC8 15D1 6F3C 07E4"            /* ø�Š\–.ëôÚÈ.Ño<.ä */
+        $"7B8B F763 6803 394F 2291 8D88 EB1B 3136"            /* {‹÷ch.9O"‘�ˆë.16 */
+        $"10C9 5077 060A 7DB0 A890 CB7B 947F AD8B"            /* .ÉPw.Â}°¨�Ë{”.­‹ */
+        $"0AAF 67FF 5D78 615A E459 013B 6923 5E0E"            /* ¯gÿ]xaZäY.;i#^. */
+        $"900D BA9C DFF2 37D0 0508 B5F3 EA48 FADE"            /* �.ºœßò7Ð..µóêHúÞ */
+        $"D348 3F2F 8E71 E6CD B6BE 8941 8773 0E17"            /* ÓH?/ŽqæͶ¾‰A‡s.. */
+        $"E97A B699 5A4F 21C1 0766 538B B29A B8CA"            /* éz¶™ZO!Á.fS‹²š¸Ê */
+        $"FBAE 21FA 76A0 B197 C613 E523 B127 1FE4"            /* û®!úv ±—Æ.å#±'.ä */
+        $"0AA8 798D 688E 8F27 E386 446F 0BD2 C6A5"            /* ¨y�hŽ�'ã†Do.ÒÆ¥ */
+        $"99B7 9313 67B5 4823 BD88 3611 E5A8 8054"            /* ™·“.gµH#½ˆ6.娀T */
+        $"3C15 C120 1B02 5B2A 2195 DD25 F90A 48A6"            /* <.Á ..[*!•Ý%ùÂH¦ */
+        $"BF92 56B9 4639 F2BD AC5F 3350 9699 14A7"            /* ¿’V¹F9ò½¬_3P–™.§ */
+        $"30A2 4B91 C33D 3175 F806 15AA 4B01 558F"            /* 0¢K‘Ã=1uø..ªK.U� */
+        $"400B 8148 DAF5 29FD 0561 1CA8 7239 51F4"            /* @.�HÚõ)ý.a.¨r9Qô */
+        $"A169 A92B EE2F 4F3D 2F96 029B 186B 7219"            /* ¡i©+î/O=/–.›.kr. */
+        $"C673 0E85 6FAC 9889 C64A 90AE DBAF E8E3"            /* Æs.…o¬˜‰ÆJ�®Û¯èã */
+        $"6607 DF2A C332 C690 840A 817A ABFF 3302"            /* f.ß*Ã2Æ�„Â�z«ÿ3. */
+        $"1464 A65F E1B3 04B0 90C6 51E5 6A2E 7EA2"            /* .d¦_á³.°�ÆQåj.~¢ */
+        $"9222 EABA 0632 2F13 B1A3 2337 85B4 E390"            /* ’"êº.2/.±£#7…´ã� */
+        $"766A 98DB BDDD 9813 F7BD 8AEA 1AB2 BEEC"            /* vj˜Û½Ý˜.÷½Šê.²¾ì */
+        $"BEE3 F4B7 EE35 6BB8 ADE1 E772 AEB0 7E66"            /* ¾ãô·î5k¸­áçr®°~f */
+        $"3F99 05C1 3339 69B2 C1D5 4CC7 DB0B 3C67"            /* ?™.Á39i²ÁÕLÇÛ.<g */
+        $"7F80 43C8 7B29 FA49 8C64 3FEB 6406 35FE"            /* .€CÈ{)úIŒd?ëd.5þ */
+        $"FAEB 4922 9410 5352 D4C0 00CB 72EA 56CE"            /* úëI"”.SRÔÀ.ËrêVÎ */
+        $"22F8 673A D3E8 AAFA E992 5B7F 827C A83D"            /* "øg:Óèªúé’[.‚|¨= */
+        $"586F 54B4 69F8 C6B7 FF14 CFD4 4069 C50F"            /* XoT´iøÆ·ÿ.ÏÔ@iÅ. */
+        $"9E23 797E DE78 5B86 FCAE BDE5 B920 9551"            /* ž#y~Þx[†ü®½å¹ •Q */
+        $"22EC 4155 0582 10F4 BF8C 144A 3251 97F3"            /* "ìAU.‚.ô¿Œ.J2Q—ó */
+        $"2E7D 1E04 969B 4C15 8BDB FAC1 9743 2B6C"            /* .}..–›L.‹ÛúÁ—C+l */
+        $"6EF5 C95E 47CB A380 A635 C17D AD97 42EA"            /* nõÉ^GË£€¦5Á}­—Bê */
+        $"88A1 A63E FC76 A19C AE08 C868 115F 098D"            /* ˆ¡¦>üv¡œ®.Èh._Æ� */
+        $"A1BE 16D4 3BF4 91C9 6CF1 DBE0 E0CA 0DAA"            /* ¡¾.Ô;ô‘ÉlñÛààÊ.ª */
+        $"EFCB 2A06 908B 7BAC CCF3 4CF8 179A 615E"            /* ïË*.�‹{¬ÌóLø.ša^ */
+        $"590D AB18 CB49 E032 B8ED 2A8E 584A ACDC"            /* Y.«.ËIà2¸í*ŽXJ¬Ü */
+        $"4797 F732 B8C9 24A4 0E5C 85A0 FED8 E30A"            /* G—÷2¸É$¤.\… þØã */
+        $"ECBF 08FB CDC1 E09D 9556 837A E086 95AC"            /* ì¿.ûÍÁà�•Vƒzà†•¬ */
+        $"BA2C E411 756E F132 9CE6 EDC4 6C90 B09E"            /* º,ä.unñ2œæíÄl�°ž */
+        $"3C59 DE78 44D0 E445 BCA0 3AE0 05D9 7440"            /* <YÞxDÐäE¼ :à.Ùt@ */
+        $"F09F 10EA E0BA 4596 84F5 81A2 550E 57A7"            /* ðŸ.êàºE–„õ�¢U.W§ */
+        $"F2A8 B2DD D612 A18F D74A 671D B70C 994A"            /* ò¨²ÝÖ.¡�×Jg.·.™J */
+        $"9441 8E10 12B8 80F0 6249 2075 CD39 3667"            /* ”AŽ..¸€ðbI uÍ96g */
+        $"6632 AFDD 5E48 6B22 15CC 179A C6FA 47AE"            /* f2¯Ý^Hk".Ì.šÆúG® */
+        $"66AF 7AFB 033D 03F1 B829 B852 F1BF 55DB"            /* f¯zû.=.ñ¸)¸Rñ¿UÛ */
+        $"17F6 E1EF A955 F266 ACFE 75F4 34FC 38B0"            /* .öáï©Uòf¬þuô4ü8° */
+        $"0068 7DD6 016E 98D4 57DB 6220 D269 4BE9"            /* .h}Ö.n˜ÔWÛb ÒiKé */
+        $"8007 22E8 9D82 8FCE EB41 317B D0FA 323B"            /* €."è�‚�ÎëA1{Ðú2; */
+        $"B2C0 06D3 99E3 ED9A 2423 78CD AE34 CF5B"            /* ²À.Ó™ãíš$#xÍ®4Ï[ */
+        $"58DA 8F69 9604 4804 8682 B58C C1DA 1E21"            /* XÚ�i–.H.†‚µŒÁÚ.! */
+        $"0E4E F709 83E1 B335 F208 6565 C882 70A0"            /* .N÷ƃá³5ò.eeÈ‚p  */
+        $"2F58 5379 3999 7F2E E63D 81E4 C2EB 58E3"            /* /XSy9™..æ=�äÂëXã */
+        $"4605 35E7 76D7 C7D0 AEDA 26C5 8BB6 0F99"            /* F.5çv×ÇЮÚ&Å‹¶.™ */
+        $"77C0 D3D6 9870 8279 4C2E 29C6 518F 13E6"            /* wÀÓÖ˜p‚yL.)ÆQ�.æ */
+        $"1373 FCB8 FD55 3D8F 8322 F8F4 CD80 3C09"            /* .sü¸ýU=�ƒ"øôÍ€<Æ */
+        $"1496 931A E1BF 0AE6 2842 6FF7 6986 6AEE"            /* .–“.á¿Âæ(Bo÷i†jî */
+        $"1AE9 FF0A 947D E3F6 D93F B59B F6D5 5FB6"            /* .éÿ”}ãöÙ?µ›öÕ_¶ */
+        $"AAC7 EDD1 1FDB 5A5F 5549 7D55 2E1F B6A4"            /* ªÇíÑ.ÛZ_UI}U..¶¤ */
+        $"FDAA F7D4 DF7D 4E80 F173 72EC 2AD6 46CC"            /* ýª÷Ôß}N€ñsrì*ÖFÌ */
+        $"6653 9F8A F548 8CD9 F7CC 0758 DFBD 1976"            /* fSŸŠõHŒÙ÷Ì.Xß½.v */
+        $"0832 03BE 1A6C 242F 4978 025D 37A6 D46A"            /* .2.¾.l$/Ix.]7¦Ôj */
+        $"B859 037D 5250 D0D6 8FC0 4C05 AAAB 7F38"            /* ¸Y.}RPÐÖ�ÀL.ª«.8 */
+        $"799B 43F9 E370 D367 B412 8CC2 F941 E270"            /* y›CùãpÓg´.ŒÂùAâp */
+        $"A967 1978 577B 7A22 541A 7DDD A593 75E5"            /* ©g.xW{z"T.}Ý¥“uå */
+        $"6B05 D950 D953 DA5E 7EBF D5D3 4314 5006"            /* k.ÙPÙSÚ^~¿ÕÓC.P. */
+        $"8EC3 8474 6B41 83B3 7B16 9C95 721B 5405"            /* ŽÃ„tkAƒ³{.œ•r.T. */
+        $"F4AE A41F 92D8 56DA F2C9 4BF8 5B0A EBC6"            /* ô®¤.’ØVÚòÉKø[ÂëÆ */
+        $"29D5 F4F3 36B9 A6D7 3BC4 75D7 972C 7465"            /* )Õôó6¹¦×;Äu×—,te */
+        $"CCBE 21FA 6EAF 6B26 465B 4676 356D E640"            /* ̾!ún¯k&F[Fv5mæ@ */
+        $"04C3 0E39 C431 FBA5 2B53 E001 8F9D 37F5"            /* .Ã.9Ä1û¥+Sà.��7õ */
+        $"F289 EC84 85B8 5FC3 F74A 734B E0B1 ED8C"            /* ò‰ì„…¸_Ã÷JsKà±íŒ */
+        $"5DF4 6678 22E4 887C A45B 1478 DFC3 A9E9"            /* ]ôfx"äˆ|¤[.xßéé */
+        $"F234 5723 01B3 2685 2754 8133 8699 21C8"            /* ò4W#.³&…'T�3†™!È */
+        $"180A 27F8 174C FED5 8F71 4082 C4E8 DB83"            /* .Â'ø.LþÕ�q@‚ÄèÛƒ */
+        $"BDA4 4506 3FA4 5286 5D63 00F7 905D A740"            /* ½¤E.?¤R†]c.÷�]§@ */
+        $"5251 07FA 22F8 1334 FBA6 5640 7199 FA41"            /* RQ.ú"ø.4û¦V@q™úA */
+        $"A3C7 3CC1 ECF5 7F43 A9AE FBD5 C1F0 18B3"            /* £Ç<Áìõ.C©®ûÕÁð.³ */
+        $"7072 4809 0A4C 8127 6E10 5F7C 335C CC28"            /* prHÆÂL�'n._|3\Ì( */
+        $"B723 3D12 724D 3DE5 37B3 1C2A 136D 2258"            /* ·#=.rM=å7³.*.m"X */
+        $"DCE6 BFA4 0DAD FB6E 72C1 70F7 6D71 785D"            /* Ü濤.­ûnrÁp÷mqx] */
+        $"BC75 69CE CE3B CF7A 170E 8343 CBA9 DE66"            /* ¼uiÎÎ;Ïz..ƒCË©Þf */
+        $"06ED 779C AA9F F28D 943D 5E3E DEDE 4769"            /* .íwœªŸò�”=^>ÞÞGi */
+        $"289C 5523 9792 EFAC 19A6 A945 B504 9446"            /* (œU#—’ï¬.¦©Eµ.”F */
+        $"A4DF BAA6 B5EB BAEF 7B92 3E08 6D17 870F"            /* ¤ßº¦µëºï{’>.m.‡. */
+        $"9E0A 487E 8A60 90B5 E555 CD4F D2F1 FE67"            /* žÂH~Š`�µåUÍOÒñþg */
+        $"88DE BB6A E653 A2B6 F9C7 B226 2544 A167"            /* ˆÞ»jæS¢¶ùDz&%D¡g */
+        $"5DF7 5F35 F38B DB99 30F8 C210 AF41 C7A4"            /* ]÷_5ó‹Û™0øÂ.¯AǤ */
+        $"167B 30B4 8B8D 0821 4ADB EFC6 5728 A86D"            /* .{0´‹�.!JÛïÆW(¨m */
+        $"99A8 2A1D 51E2 4CE5 AEA5 7ECC 23CB 628B"            /* ™¨*.QâL宥~Ì#Ëb‹ */
+        $"E438 F41A A280 CF2E 8E51 5004 A9BA 64AB"            /* ä8ô.¢€Ï.ŽQP.©ºd« */
+        $"B0AA 608C 8C19 38F7 567B 0C45 B7C5 0E2D"            /* °ª`ŒŒ.8÷V{.E·Å.- */
+        $"0F3D A192 B0F5 A567 4EE1 9FF5 F085 979A"            /* .=¡’°õ¥gNáŸõð…—š */
+        $"13DA 6FC3 89D0 0370 C986 5F44 AADD CAB9"            /* .ÚoÉÐ.pɆ_DªÝʹ */
+        $"FBD0 8CDE 18D9 8FED 715E 264F 0D69 2CEF"            /* ûÐŒÞ.Ù�íq^&O.i,ï */
+        $"63F0 7A64 D65B 094A 6976 E6D4 E3DC 1583"            /* cðzdÖ[ÆJivæÔãÜ.ƒ */
+        $"FE8C BD22 992E 3FDB AF18 03A7 0A74 8333"            /* þŒ½"™.?Û¯..§Âtƒ3 */
+        $"76E3 5195 C7FA A180 5123 7E0C 544B 9C8C"            /* vãQ•Çú¡€Q#~.TKœŒ */
+        $"928D 3DF6 F330 4D6E 8049 11AF 064E 4E3B"            /* ’�=öó0Mn€I.¯.NN; */
+        $"B937 EE03 A4D2 F530 4513 47F0 5E98 E060"            /* ¹7î.¤Òõ0E.Gð^˜à` */
+        $"72C6 46EC B761 FAB4 B0FA 9A80 FF78 5408"            /* rÆFì·aú´°úš€ÿxT. */
+        $"9152 452E 0111 2383 5E5F 6C4F FC53 0EDE"            /* ‘RE...#ƒ^_lOüS.Þ */
+        $"1092 66D3 5F38 1AC8 1412 561A 4017 9110"            /* .’fÓ_8.È..V.@.‘. */
+        $"CA19 3E6F 8803 0908 5F57 A2E2 4744 E3C4"            /* Ê.>oˆ.Æ._W¢âGDãÄ */
+        $"F1BF 49F6 836F E294 610B 4098 2761 1502"            /* ñ¿Iöƒoâ”a.@˜'a.. */
+        $"CCB2 0C11 81DD 05B4 ACD8 8F28 C5DD 1DD8"            /* ̲..�Ý.´¬Ø�(ÅÝ.Ø */
+        $"58E0 C1E1 70A8 42BF 456F FE20 1261 1F81"            /* XàÁáp¨B¿Eoþ .a.� */
+        $"08AC FEB1 F89C 3576 EF94 A20C 255F 3B3F"            /* .¬þ±øœ5v.%_;? */
+        $"5E6B B0C0 4B3F EADC 8536 55E9 8144 C946"            /* ^k°ÀK?êÜ…6Ué�DÉF */
+        $"7613 8662 DCB1 C761 2BDA 412D C7D6 2D5C"            /* v.†bܱÇa+ÚA-ÇÖ-\ */
+        $"BCC0 F84E 54E4 9B0B BDF7 4F45 FCA6 D6AE"            /* ¼ÀøNTä›.½÷OEü¦Ö® */
+        $"1754 31D1 E6CB 94F4 D163 2B1D 017D 4171"            /* .T1ÑæË”ôÑc+..}Aq */
+        $"ABE0 0285 395D 3D23 42D7 E641 348A 0C2E"            /* «à.…9]=#B×æA4Š.. */
+        $"9C16 42C9 8E99 B654 8046 C365 EA71 CE64"            /* œ.BÉŽ™¶T€FÃeêqÎd */
+        $"B762 0E4D 7C48 617B CDB9 6264 2C81 4A9F"            /* ·b.M|Ha{͹bd,�JŸ */
+        $"8600 50B2 B985 EB73 DB96 82EA FF7D 1E50"            /* †.P²¹…ësÛ–‚êÿ}.P */
+        $"6A49 AEA3 78E3 2DFD 0D59 3013 F257 AAA9"            /* jI®£xã-ý.Y0.òWª© */
+        $"0E5D 81DA E983 8D48 41BE DF0B FB34 AEA5"            /* .]�Úéƒ�HA¾ß.û4®¥ */
+        $"07B6 B0AA 1E53 1D9F B9C7 4CE5 8D46 6151"            /* .¶°ª.S.Ÿ¹ÇLå�FaQ */
+        $"8000 0C24 1D66 1946 1073 4456 2361 E486"            /* €..$.f.F.sDV#aä† */
+        $"120F 29F0 6121 2D6A AF51 0C82 F68C B571"            /* ..)ða!-j¯Q.‚öŒµq */
+        $"77AD BE59 9145 D105 DE8C 9500 0000 0000"            /* w­¾Y‘EÑ.ÞŒ•..... */
+        $"0000 0032 BC9A BD52 00B4 6C6F 3753 1A96"            /* ...2¼š½R.´lo7S.– */
+        $"9B00 FCD3 F055 A11A AFB1 FB95 1610 88D0"            /* ›.üÓðU¡.¯±û•..ˆÐ */
+        $"8D32 9653 FC10 55FD B965 C1A9 B6BD 2245"            /* �2–Sü.Uý¹eÁ©¶½"E */
+        $"D48B 8230 2EF5 56F1 6618 9F91 FEC4 4106"            /* Ô‹‚0.õVñf.Ÿ‘þÄA. */
+        $"F23B 7C8A 0320 79EA D7A0 D75F 09BD B985"            /* ò;|Š. yê× ×_ƽ¹… */
+        $"C22B E2F0 0508 64BA AA2F 2414 19D7 311D"            /* Â+âð..dºª/$..×1. */
+        $"F709 E05C 809B 9E62 83F8 FF13 2DE3 01D6"            /* ÷Æà\€›žbƒøÿ.-ã.Ö */
+        $"8ADC F118 5A80 77C8 DABC 2FB5 CEF6 FCFB"            /* ŠÜñ.Z€wÈÚ¼/µÎöüû */
+        $"7A94 2773 6CEC FAE2 7865 753C E612 E4AF"            /* z”'slìúâxeu<æ.ä¯ */
+        $"657C 5C67 8FB3 1E56 A319 1ED1 FE48 0D8D"            /* e|\g�³.V£..ÑþH.� */
+        $"2431 B10B 8E15 0A4B FF7F 7EB8 D068 5015"            /* $1±.Ž.ÂKÿ.~¸ÐhP. */
+        $"151E C37C 0390 F6CC 64A8 0000 0000 0000"            /* ..Ã|.�öÌd¨...... */
+        $"0000 0002 5991 79E8 2B17 082C ABCB DA90"            /* ....Y‘yè+..,«ËÚ� */
+        $"CE92 8CB0 E992 0710 2B8F CAAB D217 C4E9"            /* Î’Œ°é’..+�Ê«Ò.Äé */
+        $"E55E 11D2 6200 B530 5EF4 6932 1CBF EA6C"            /* å^.Òb.µ0^ôi2.¿êl */
+        $"E58D 2AA9 68C2 89FF 7903 A6ED D674 F1FC"            /* å�*©h‰ÿy.¦íÖtñü */
+        $"A256 3564 F7E0 4DDF CDA1 2729 F7FF 6EB2"            /* ¢V5d÷àMßÍ¡')÷ÿn² */
+        $"9D35 70A9 5447 924B B8E1 71D3 4A8A DECB"            /* �5p©TG’K¸áqÓJŠÞË */
+        $"93E1 8FA0 140E C9B7 6124 8020 D660 3D22"            /* “á� ..É·a$€ Ö`=" */
+        $"C708 222E 7289 B890 0002 00E1 2BC6 84B9"            /* Ç.".r‰¸�...á+Æ„¹ */
+        $"25DF 442F 97FF 7FEF 68EC 7325 B92C A150"            /* %ßD/—ÿ.ïhìs%¹,¡P */
+        $"EE19 48C3 2540 0000 0000 0000 0000 0749"            /* î.HÃ%@.........I */
+        $"DD4A 9891 375B B0E0 C176 A698 672E F295"            /* ÝJ˜‘7[°àÁv¦˜g.ò• */
+        $"0311 7B3E 2B87 B4B8 7FB3 5DF7 9C67 CBEA"            /* ..{>+‡´¸.³]÷œgËê */
+        $"6A19 4107 C9F4 2B19 6829 179A 3FFF 7E8C"            /* j.A.Éô+.h).š?ÿ~Œ */
+        $"44A2 15E8 8E37 B422 F825 1862 58FF 7FFE"            /* D¢.èŽ7´"ø%.bXÿ.þ */
+        $"8EA1 D38C 727A 3071 1FF0 541F 6AB4 EA83"            /* Ž¡ÓŒrz0q.ðT.j´êƒ */
+        $"44A0 086A BAD7 6966 FC5D 0E72 A66C C301"            /* D .jº×ifü].r¦lÃ. */
+        $"3E1F B82C 9192 20D5 0322 858F 224C 87F5"            /* >.¸,‘’ Õ."…�"L‡õ */
+        $"E940 85ED 7B36 EC96 D05C 21FF 7B10 59E1"            /* é@…í{6ì–Ð\!ÿ{.Yá */
+        $"E125 6C79 7852 2031 F3BA 34FB 6E57 BC3B"            /* á%lyxR 1óº4ûnW¼; */
+        $"69F0 C303 3A2A A573 D1E0 9836 C703 D02C"            /* iðÃ.:*¥sÑà˜6Ç.Ð, */
+        $"58CC 3DA7 FF0D 4301 F607 07C1 31FA 7F66"            /* XÌ=§ÿ.C.ö..Á1ú.f */
+        $"89BD A759 90CD 107A E5BD 6398 D7BE F7BB"            /* ‰½§Y�Í.zå½c˜×¾÷» */
+        $"E273 D09A F8EE D21B 1015 A513 18F5 5C7D"            /* âsКøîÒ...¥..õ\} */
+        $"FD20 E7C9 C6BE 3105 7A4B 831D 251B 4C36"            /* ý çÉƾ1.zKƒ.%.L6 */
+        $"2A49 3EAC 1A86 9F87 09CC 0B00 2CF4 643C"            /* *I>¬.†Ÿ‡ÆÌ..,ôd< */
+        $"7012 8574 D28F 952D E959 1093 FE7E F021"            /* p.…tÒ�•-éY.“þ~ð! */
+        $"028C 74ED 0E90 8DCD 5F06 B4BE EA1A 4C53"            /* .Œtí.��Í_.´¾ê.LS */
+        $"A47F 3706 93CB 8FAB 7864 D123 4A39 B6BA"            /* ¤.7.“Ë�«xdÑ#J9¶º */
+        $"CDCB 8AA9 2128 54FA CFB5 C4E1 F470 AD6E"            /* ÍËŠ©!(TúϵÄáôp­n */
+        $"6A05 07C9 72AA 562E F22F C922 BCF9 7DDF"            /* j..ÉrªV.ò/É"¼ù}ß */
+        $"3565 1AD4 F707 7DC0 1038 129E 4EA0 297E"            /* 5e.Ô÷.}À.8.žN )~ */
+        $"1037 3516 64BB FF75 539A 5C03 F7A3 C14D"            /* .75.d»ÿuSš\.÷£ÁM */
+        $"C617 50C8 14F1 7C95 0372 1443 C3F0 7ED4"            /* Æ.PÈ.ñ|•.r.CÃð~Ô */
+        $"EFDA FA88 BDD2 E947 7A43 A4A3 2339 CD58"            /* ïÚúˆ½ÒéGzC¤£#9ÍX */
+        $"526C 8407 8211 1949 6431 DB89 390B EB27"            /* Rl„.‚..Id1Û‰9.ë' */
+        $"9975 F04F D507 AC80 5D51 95B0 992A 1AC6"            /* ™uðOÕ.¬€]Q•°™*.Æ */
+        $"8699 86CC E64E 441C 2EFD 4F8C 70C1 DB2A"            /* †™†ÌæND..ýOŒpÁÛ* */
+        $"5395 8DF7 E279 AA65 BA32 2FD1 48C9 F400"            /* S•�÷âyªeº2/ÑHÉô. */
+        $"D0EA 663D 92FF 053E 130C A1A9 491B E583"            /* Ðêf=’ÿ.>..¡©I.åƒ */
+        $"6133 2EE1 AFBE 86B8 D218 B698 906D A5B9"            /* a3.᯾†¸Ò.¶˜�m¥¹ */
+        $"ACD3 9DC7 8720 C668 E134 1A1C 9C71 EA49"            /* ¬Ó�LJ Æhá4..œqêI */
+        $"7AE9 9276 56E9 78BB 5679 18E2 6044 2763"            /* zé’vVéx»Vy.â`D'c */
+        $"2342 64F4 3952 2712 F704 B2E8 C1D2 35CC"            /* #Bdô9R'.÷.²èÁÒ5Ì */
+        $"F0AB 5ABD 61A0 1CD5 5316 0E78 22E6 B807"            /* ð«Z½a .ÕS..x"æ¸. */
+        $"8774 CA36 91EF 0BFF D969 6330 3900 00D1"            /* ‡tÊ6‘ï.ÿÙic09..Ñ */
+        $"2300 0000 0C6A 5020 200D 0A87 0A00 0000"            /* #....jP  .‡Â... */
+        $"1466 7479 706A 7032 2000 0000 006A 7032"            /* .ftypjp2 ....jp2 */
+        $"2000 0000 4F6A 7032 6800 0000 1669 6864"            /*  ...Ojp2h....ihd */
+        $"7200 0002 0000 0002 0000 0407 0701 0000"            /* r............... */
+        $"0000 0F63 6F6C 7201 0000 0000 0010 0000"            /* ...colr......... */
+        $"0022 6364 6566 0004 0000 0000 0001 0003"            /* ."cdef.......... */
+        $"0001 0000 0001 0000 0002 0002 0000 0003"            /* ................ */
+        $"0000 0000 6A70 3263 FF4F FF51 0032 0000"            /* ....jp2cÿOÿQ.2.. */
+        $"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+        $"0000 0200 0000 0200 0000 0000 0000 0000"            /* ................ */
+        $"0004 0701 0107 0101 0701 0107 0101 FF52"            /* ..............ÿR */
+        $"000C 0000 0001 0105 0404 0001 FF5C 0013"            /* ............ÿ\.. */
+        $"2050 5858 6058 5860 5858 6058 5858 5050"            /*  PXX`XX`XX`XXXPP */
+        $"58FF 6400 1100 014B 616B 6164 752D 7635"            /* Xÿd....Kakadu-v5 */
+        $"2E32 2E31 FF90 000A 0000 0000 D036 0001"            /* .2.1ÿ�.Â....Ð6.. */
+        $"FF93 CFC2 DC03 54F9 36EC A8DC 2A8C 3701"            /* ÿ“ÏÂÜ.Tù6ì¨Ü*Œ7. */
+        $"118B 95C3 F2B2 5A7A 0428 C30A 2C64 B704"            /* .‹•Ãò²Zz.(ÃÂ,d·. */
+        $"5C3C 6DED 8696 4890 6404 5638 430C 59C5"            /* \<m톖H�d.V8C.YŠ*/
+        $"D913 B06B 0B08 E00E 1802 6D82 7225 E695"            /* Ù.°k..à...m‚r%æ• */
+        $"9F1E E7B0 D1DF 323C 61DC 1F25 E3FF 83E2"            /* Ÿ.ç°Ñß2<aÜ.%ãÿƒâ */
+        $"A49A DED4 4495 A948 5B70 9E5A 01F1 2431"            /* ¤šÞÔD•©H[pžZ.ñ$1 */
+        $"8EE5 2B54 2863 9041 FAE9 9E9F 1B85 E206"            /* Žå+T(c�Aú鞟.…â. */
+        $"4104 106C 5027 632A 8716 C3A5 F047 B3D5"            /* A..lP'c*‡.Ã¥ðG³Õ */
+        $"EE2B 19CD 2B75 17D8 DFB6 E2BF 491E A41F"            /* î+.Í+u.Ø߶â¿I.¤. */
+        $"BC48 3493 DEFB 453D 64DE DEA0 68DB EF5B"            /* ¼H4“ÞûE=dÞÞ hÛï[ */
+        $"1E69 8F3F C55C 1FF6 1823 1543 F483 DF20"            /* .i�?Å\.ö.#.Côƒß  */
+        $"F5B4 08F4 5D20 4DF0 7D7D 2007 2ACA 5B5E"            /* õ´.ô] Mð}} .*Ê[^ */
+        $"159F EF4A 505D 811D A8A3 5476 5539 B45B"            /* .ŸïJP]�.¨£TvU9´[ */
+        $"3113 1AC7 00F3 F1A7 E9E3 9E88 5D91 6CD5"            /* 1..Ç.óñ§é㞈]‘lÕ */
+        $"2CC0 F92B 2063 FF29 4B0E 775A 06EE 75CC"            /* ,Àù+ cÿ)K.wZ.îuÌ */
+        $"DA54 AC2F B72D 1C25 1E46 A4F8 C3E1 7D8D"            /* ÚT¬/·-.%.F¤øÃá}� */
+        $"85AE BBE6 3DBE EC4A 35F7 3B36 1FBF BC38"            /* …®»æ=¾ìJ5÷;6.¿¼8 */
+        $"2DC1 785C D644 2BED AB51 1950 2643 8730"            /* -Áx\ÖD+í«Q.P&C‡0 */
+        $"2AE9 E4EB 1B8E 8F90 BA0C FF2F 6F65 5F28"            /* *éäë.Ž��º.ÿ/oe_( */
+        $"1A3F 9398 FF20 01A2 69A0 02C9 8D1B C3EA"            /* .?“˜ÿ .¢i .É�.Ãê */
+        $"A600 6417 3CA3 9E84 93EF 063D 59DC 702C"            /* ¦.d.<£ž„“ï.=YÜp, */
+        $"959D C3A6 B1ED DEF1 F321 5BA6 FCCD 7762"            /* •�æ±íÞñó![¦üÍwb */
+        $"6C23 7398 AA59 4BBA 0052 B8A7 0608 1AAC"            /* l#s˜ªYKº.R¸§...¬ */
+        $"5B2E AF60 17F4 278E 6433 6F75 7839 CED2"            /* [.¯`.ô'Žd3oux9ÎÒ */
+        $"F32E 5D7D 9D40 B145 4CFB A25C D8D7 4BCB"            /* ó.]}�@±ELû¢\Ø×KË */
+        $"956D 88DD 4B92 64BF 4CD4 AFD5 6E56 9859"            /* •mˆÝK’d¿LÔ¯ÕnV˜Y */
+        $"ABEF BB40 AD0E 6E1F 9B3B 16A3 D9D3 58DF"            /* «ï»@­.n.›;.£ÙÓXß */
+        $"584E C303 1DAD D18B 6082 9C29 88EB 5163"            /* XNÃ..­Ñ‹`‚œ)ˆëQc */
+        $"A42D 061A 1570 64A9 0F1C E00D 56D9 E0CB"            /* ¤-...pd©..à.VÙàË */
+        $"7C66 799C 8EB4 BFCA CF5C CFC2 B611 4F0C"            /* |fyœŽ´¿ÊÏ\϶.O. */
+        $"AFDE 008C 3580 A270 0C1A 3737 50A1 9A89"            /* ¯Þ.Œ5€¢p..77P¡š‰ */
+        $"2546 BB2C 62A0 57BE 59CB C00A 1EE9 0F1D"            /* %F»,b W¾YËÀÂ.é.. */
+        $"C528 40D4 EA69 D281 AED4 B078 F27A 0B42"            /* Å(@ÔêiÒ�®Ô°xòz.B */
+        $"7AD2 DADD 146B 7FFF 223D 6A74 2041 4FCF"            /* zÒÚÝ.k.ÿ"=jt AOÏ */
+        $"46E1 60C8 9ABE 841E E18D 1712 DB6D 902B"            /* Fá`Èš¾„.á�..Ûm�+ */
+        $"7BE6 56DA 7E4B 1704 A373 2802 B120 0184"            /* {æVÚ~K..£s(.± .„ */
+        $"0681 4499 2739 CE73 9CE8 99D8 C352 337C"            /* .�D™'9Îsœè™ØÃR3| */
+        $"06AB BB71 6257 16EF B535 4972 8C2F 2EE0"            /* .«»qbW.ïµ5IrŒ/.à */
+        $"85CC 8431 D867 47EE CC43 6E87 A485 2316"            /* …Ì„1ØgGîÌCn‡¤…#. */
+        $"4927 AE22 C12D 49CE 739C E61C 97D0 99CC"            /* I'®"Á-IÎsœæ.—Ð™Ì */
+        $"3DC5 F26B 1A31 E742 3E56 464B 2944 108E"            /* =Åòk.1çB>VFK)D.Ž */
+        $"CB0C F4C7 E144 47E1 47C1 F6BD 8089 21DB"            /* Ë.ôÇáDGáGÁö½€‰!Û */
+        $"8279 4533 01BF B9CC C444 AD53 5F75 D706"            /* ‚yE3.¿¹ÌÄD­S_u×. */
+        $"3FDD CA27 5D6C 9F54 1CCF F838 38E4 B2E4"            /* ?ÝÊ']lŸT.Ïø88ä²ä */
+        $"F9FF 429F 59FE D27B 4A5E A69F 2C21 38F6"            /* ùÿBŸYþÒ{J^¦Ÿ,!8ö */
+        $"5A74 D405 2FEE 50B8 E5F1 C489 2693 5B33"            /* ZtÔ./îP¸åñĉ&“[3 */
+        $"D2C2 9DEC 68ED F55C 1FAC 1401 8D66 795A"            /* ÒÂ�ìhíõ\.¬..�fyZ */
+        $"F5F3 27A3 5874 6681 9AC6 F41D A4E6 40DA"            /* õó'£Xtf�šÆô.¤æ@Ú */
+        $"3EE5 CCEE 340C AF72 87FD 6B2A EB94 88EC"            /* >åÌî4.¯r‡ýk*딈ì */
+        $"A61D A536 7AC2 C6B8 85D9 CEBD 146C 83B5"            /* ¦.¥6zÂƸ…Ùν.lƒµ */
+        $"F5E0 A3C7 B524 BC64 B6B5 91A6 BF91 C547"            /* õà£Çµ$¼d¶µ‘¦¿‘ÅG */
+        $"BD87 811F D58E 8E51 BB89 FA6C 5257 33D9"            /* ½‡�.ÕŽŽQ»‰úlRW3Ù */
+        $"A964 A4AB 3BB9 9608 BECC 0D9C D6B9 3D3A"            /* ©d¤«;¹–.¾Ì.œÖ¹=: */
+        $"CB64 28BE 3B07 6318 DF9D C134 9F16 567A"            /* Ëd(¾;.c.ß�Á4Ÿ.Vz */
+        $"8127 5FFD F396 BA0C B86F AA17 2301 022A"            /* �'_ýó–º.¸oª.#..* */
+        $"3742 CE95 B1AF F858 C503 8156 35E0 8F2C"            /* 7BΕ±¯øXÅ.�V5à�, */
+        $"67D7 2D41 1F0B 5284 1535 AF16 6540 FB65"            /* g×-A..R„.5¯.e@ûe */
+        $"65BC 5F6B 136D 73A5 1C5D 3D92 FF5F 8494"            /* e¼_k.ms¥.]=’ÿ_„” */
+        $"FDBF E0C5 821F 072A 0EEB B855 6B42 CEE8"            /* ý¿àÅ‚..*.ë¸UkBÎè */
+        $"ABEE 381E 894E DF1E 29DD 4B78 3F0A F5EB"            /* «î8.‰Nß.)ÝKx?Âõë */
+        $"B9F8 61B8 8266 3BD8 A2AC 5BC1 38F4 5098"            /* ¹øa¸‚f;Ø¢¬[Á8ôP˜ */
+        $"3951 2437 1798 7BF9 EA00 12BF CF3E 9166"            /* 9Q$7.˜{ùê..¿Ï>‘f */
+        $"8253 6FF0 B942 70D7 C729 0866 33F7 3484"            /* ‚Soð¹Bp×Ç).f3÷4„ */
+        $"ADF8 C3D2 4EF6 1DF4 0E6F 8E64 B470 1D5E"            /* ­øÃÒNö.ô.oŽd´p.^ */
+        $"F311 9BD1 EDE1 BA5D 7601 2053 D70A FDCD"            /* ó.›Ñíáº]v. S×ÂýÍ */
+        $"82C0 1BDA A35C FAD2 67AD E569 7851 10A7"            /* ‚À.Ú£\úÒg­åixQ.§ */
+        $"EF9A 3533 EC03 E813 08B6 D984 1A1D 3DC0"            /* ïš53ì.è..¶Ù„..=À */
+        $"7C8E E03E 4A44 03E4 7894 FF1F 080E 2BFD"            /* |Žà>JD.äx”ÿ...+ý */
+        $"EEB4 E64A C757 389B 5780 3AF8 248C 580D"            /* î´æJÇW8›W€:ø$ŒX. */
+        $"461B D417 66BA CEB2 2042 3C84 DAF9 C127"            /* F.Ô.fºÎ² B<„ÚùÁ' */
+        $"63E9 168C A9E3 D418 61E8 C46C CF01 F59B"            /* cé.Œ©ãÔ.aèÄlÏ.õ› */
+        $"4518 8833 3E62 5B14 BFD1 41A8 45D6 D311"            /* E.ˆ3>b[.¿ÑA¨EÖÓ. */
+        $"8431 80DB 1FD5 5839 DE81 BCD9 EAFB EE26"            /* „1€Û.ÕX9Þ�¼Ùêûî& */
+        $"33DD 9E73 0B6F F957 26EE E7BA E0DA FF22"            /* 3Ýžs.oùW&îçºàÚÿ" */
+        $"EA50 24BF A182 089D 749A 6AAF BFF2 224D"            /* êP$¿¡‚.�tšj¯¿ò"M */
+        $"30D4 11D0 E07A A012 587A 0633 92B4 CBFC"            /* 0Ô.Ðàz .Xz.3’´Ëü */
+        $"8E1B E5AC 9025 A74D 2819 3F9D 8132 B795"            /* Ž.å¬�%§M(.?��2·• */
+        $"458E 4651 1589 158D D24C A5B0 CBFA 359E"            /* EŽFQ.‰.�ÒL¥°Ëú5ž */
+        $"BDB0 E4FB BFE3 5854 3E88 A646 71B1 9CB2"            /* ½°äû¿ãXT>ˆ¦Fq±œ² */
+        $"BB4E BA8E E170 8CBF C1F5 3141 F537 C0FA"            /* »NºŽápŒ¿Áõ1Aõ7Àú */
+        $"9780 6448 BA3B 94D6 3E8B 7AF0 0B5A C7A2"            /* —€dHº;”Ö>‹zð.ZÇ¢ */
+        $"4D05 C6BB 7F47 7102 F66E E4E8 3681 1C97"            /* M.Æ».Gq.önäè6�.— */
+        $"0996 4491 F713 2A24 3756 2715 4B55 762F"            /* Æ–D‘÷.*$7V'.KUv/ */
+        $"78CB 2608 0563 73F7 5626 9F35 0C54 6822"            /* xË&..cs÷V&Ÿ5.Th" */
+        $"F061 792A 4AFC 163A 9F83 8F82 638B 524D"            /* ðay*Jü.:Ÿƒ�‚c‹RM */
+        $"C21C 3735 DB76 6F4B 01F2 3E7E 5755 5945"            /* Â.75ÛvoK.ò>~WUYE */
+        $"6149 AAEE 1A88 7748 DC47 79E4 0660 318C"            /* aIªî.ˆwHÜGyä.`1Œ */
+        $"AA94 E92D 9879 C9C1 AC17 C828 7BBB 997A"            /* ª”é-˜yÉÁ¬.È({»™z */
+        $"315E 858F F31D 3522 A6D2 B3BD E548 DBA2"            /* 1^…�ó.5"¦Ò³½åHÛ¢ */
+        $"3274 749B 11C1 9570 D715 0350 4CC4 6820"            /* 2tt›.Á•p×..PLÄh  */
+        $"560A 8542 A38D 913B 3863 FF5C 97F2 9BA5"            /* VÂ…B£�‘;8cÿ\—ò›¥ */
+        $"893F 6C9B 15A2 EE40 BCD6 2676 80A9 AC89"            /* ‰?l›.¢î@¼Ö&v€©¬‰ */
+        $"9054 849D 859C 8DCD 181B 64F4 6D7B 71B4"            /* �T„�…œ�Í..dôm{q´ */
+        $"FBD3 0C84 21D4 CC6C CF84 F40A A3CD C958"            /* ûÓ.„!ÔÌlÏ„ô£ÍÉX */
+        $"928E 97E5 346C 6497 2888 7903 5B0B 3277"            /* ’Ž—å4ld—(ˆy.[.2w */
+        $"B4D6 9AA4 86C3 C691 CA1A 3C92 FCFB 02DE"            /* ´Öš¤†ÃÆ‘Ê.<’üû.Þ */
+        $"A25E 5C5C C6A8 1CE2 F5B5 88AB 3673 F912"            /* ¢^\\ƨ.âõµˆ«6sù. */
+        $"96AF E6BC 67FF 40CC 068D C6E3 8435 48AF"            /* –¯æ¼gÿ@Ì.�Æã„5H¯ */
+        $"B929 F509 0F59 3410 A9A6 1087 8352 11EC"            /* ¹)õÆ.Y4.©¦.‡ƒR.ì */
+        $"23CF CD2E 3F05 487E 0740 9BE7 236F 56FB"            /* #ÏÍ.?.H~.@›ç#oVû */
+        $"D0F4 677F 9514 C6E9 50BB A61A 6135 73FB"            /* Ðôg.•.ÆéP»¦.a5sû */
+        $"37AA FA5C 0967 671C 8485 5326 6EB5 4955"            /* 7ªú\Ægg.„…S&nµIU */
+        $"1AAE 5FCE C271 D992 9E8C B0DF 7795 E0F2"            /* .®_ÎÂqÙ’žŒ°ßw•àò */
+        $"A17A B50F E53A FE12 756F D1A1 5CE1 7C9B"            /* ¡zµ.å:þ.uoÑ¡\á|› */
+        $"D185 2C1A 9224 BC62 5C98 FA35 1649 6EA7"            /* Ñ…,.’$¼b\˜ú5.In§ */
+        $"4C7C C191 DF92 9D7A 6FE9 71D9 9A11 5A19"            /* L|Á‘ß’�zoéqÙš.Z. */
+        $"214D F951 38FA C459 E39A 6DAE 1253 31DF"            /* !MùQ8úÄYãšm®.S1ß */
+        $"B335 3337 39D2 7591 BFC1 31E6 887A 8BAB"            /* ³5379Òu‘¿Á1æˆz‹« */
+        $"ECCD 7A58 8E4A AD65 A7E1 5FC6 8EB0 DA82"            /* ìÍzXŽJ­e§á_ÆŽ°Ú‚ */
+        $"0F81 6849 5CE5 AB32 B763 1227 3F4C 5691"            /* .�hI\å«2·c.'?LV‘ */
+        $"43C7 DD24 E8D9 C4F3 7BB0 4666 7A24 1C5B"            /* CÇÝ$èÙÄó{°Ffz$.[ */
+        $"F57D 719F 2BDB 3794 66BA BBB6 9D8D A662"            /* õ}qŸ+Û7”fº»¶��¦b */
+        $"CF99 4DDC E533 96D6 EEE0 3FC7 BFB8 B1B7"            /* Ï™MÜå3–Öîà?Ç¿¸±· */
+        $"9AE3 57C7 E1A8 B1F8 6C5C 3F0D 19C1 812D"            /* šãWÇᨱøl\?..Á�- */
+        $"8D31 C88B C396 B5E7 3CE0 4E2C AE73 7876"            /* �1ȋÖµç<àN,®sxv */
+        $"0436 A295 BEC6 BDF1 C604 C41C 94E6 E7C1"            /* .6¢•¾Æ½ñÆ.Ä.”æçÁ */
+        $"AC78 356A B92A DB37 3360 3372 6638 0C5C"            /* ¬x5j¹*Û73`3rf8.\ */
+        $"F388 7CDE 4045 060F E713 C4C3 321E E08B"            /* óˆ|Þ@E..ç.ÄÃ2.à‹ */
+        $"0810 71EE A6AB C032 2B85 C34C 2671 8143"            /* ..qÀ2+…ÃL&q�C */
+        $"AFDE 07D1 A40C D86A ADBE B961 EAA3 54BD"            /* ¯Þ.Ѥ.Øj­¾¹aê£T½ */
+        $"804D 6FA9 AA3F 7FBE BCD9 E785 A230 EA4E"            /* €Mo©ª?.¾¼Ùç…¢0êN */
+        $"1C08 1DF6 8373 7754 5039 7854 1192 1512"            /* ...öƒswTP9xT.’.. */
+        $"B956 E9A7 575E E3DB F5F9 4B02 F739 F2BB"            /* ¹Vé§W^ãÛõùK.÷9ò» */
+        $"91B2 73E1 3D19 EBB6 AD2F 291C 5BAC 5EEA"            /* ‘²sá=.붭/).[¬^ê */
+        $"EEDF 8DA7 5FCA 8E8C 952D 8FD0 441C 5BA4"            /* îß�§_ÊŽŒ•-�ÐD.[¤ */
+        $"8AF6 21BE 1FAF DAE3 DADD EA91 EF73 58A0"            /* Šö!¾.¯ÚãÚÝê‘ïsX  */
+        $"29E6 89B2 E279 B02A D092 DD08 6187 9095"            /* )扲ây°*Ð’Ý.a‡�• */
+        $"5C85 C903 0DD2 9ED3 538B D9BB E936 8ABB"            /* \…É..ÒžÓS‹Ù»é6Š» */
+        $"E203 DD03 2944 5317 7BC3 0297 2125 F198"            /* â.Ý.)DS.{Ã.—!%ñ˜ */
+        $"D117 8DDB E382 71F8 D0A7 14B1 6D7A A0EB"            /* Ñ.�Ûã‚qøЧ.±mz ë */
+        $"7C6F 7651 D2EC ECA7 F670 D09F 6CF6 30DB"            /* |ovQÒìì§öpПlö0Û */
+        $"0830 39B5 BC45 3915 4054 4490 A7BA 5CEC"            /* .09µ¼E9.@TD�§º\ì */
+        $"D37B FBC2 7890 B18F DEEA 4966 D46D 5FD2"            /* Ó{ûÂx�±�ÞêIfÔm_Ò */
+        $"7811 AAD0 8EBF FB40 0F30 D8A4 2B71 5A03"            /* x.ªÐŽ¿û@.0ؤ+qZ. */
+        $"636A C360 C889 891D D420 A828 E337 41CC"            /* cjÃ`ȉ‰.Ô ¨(ã7AÌ */
+        $"3314 5473 B91F 7B78 2B3B AC7A 1127 F2DE"            /* 3.Ts¹.{x+;¬z.'òÞ */
+        $"E997 2101 6008 26AE 43D5 7CE7 8532 B9CE"            /* é—!.`.&®CÕ|ç…2¹Î */
+        $"A81A 710E 5D87 49D7 3EF6 65A3 D533 977E"            /* ¨.q.]‡I×>öe£Õ3—~ */
+        $"7BE9 0CA7 8B28 9ADA AF4F 45A5 99BD E21D"            /* {é.§‹(šÚ¯OE¥™½â. */
+        $"D4B1 BB33 2508 C8D1 31E5 E9FB F917 A8E1"            /* Ô±»3%.ÈÑ1åéûù.¨á */
+        $"2955 9008 F531 9010 575A 3AFB 59F4 CD63"            /* )U�.õ1�.WZ:ûYôÍc */
+        $"3EEE 2409 BCD4 E5F1 1418 6155 B6D7 A94B"            /* >î$ƼÔåñ..aU¶×©K */
+        $"1D48 79A8 2F32 0770 476B CE28 023A DC86"            /* .Hy¨/2.pGkÎ(.:܆ */
+        $"E008 813B E64A 39F5 58CE 3E75 DAA6 BD7A"            /* à.�;æJ9õXÎ>uÚ¦½z */
+        $"1528 FF50 0738 C132 5569 3C99 C4BC A20F"            /* .(ÿP.8Á2Ui<™Ä¼¢. */
+        $"6DED 9310 6FE1 8BE4 BF4D D0B1 993E 0FD3"            /* mí“.oá‹ä¿Mб™>.Ó */
+        $"4938 1302 E4A8 FDA2 A7D2 4615 CD89 1E52"            /* I8..ä¨ý¢§ÒF.͉.R */
+        $"4160 51F8 BABB FEED 4281 0E0C 31CD 91D7"            /* A`Qøº»þíB�..1Í‘× */
+        $"C7CF E302 E155 4188 0F06 097F 6906 2EC9"            /* ÇÏã.áUAˆ..Æ.i..É */
+        $"BE00 A1FB 0D99 8FB1 3B3D E3D3 70B8 4296"            /* ¾.¡û.™�±;=ãÓp¸B– */
+        $"F199 E066 15B5 920C 38A2 695F F2E8 81E1"            /* ñ™àf.µ’.8¢i_òè�á */
+        $"E0EC 34E5 97B3 9580 459F A2D9 E267 B847"            /* àì4å—³•€EŸ¢Ùâg¸G */
+        $"E302 3AA0 8631 8C61 5F8E 88DE 2FBB 394B"            /* ã.: †1Œa_ŽˆÞ/»9K */
+        $"B9EC 234B 6515 BDF3 BA80 AA30 3D50 2F90"            /* ¹ì#Ke.½óº€ª0=P/� */
+        $"C26A D743 2198 707A 2DC1 9C64 1647 1FA3"            /* Âj×C!˜pz-Áœd.G.£ */
+        $"43A2 B1C7 C95D 1E19 9650 E616 F24B C118"            /* C¢±ÇÉ]..–Pæ.òKÁ. */
+        $"FB68 CE23 485E BF50 ACF8 F669 B5A3 92AA"            /* ûhÎ#H^¿P¬øöiµ£’ª */
+        $"5625 BF48 8584 A6E7 DAC0 E203 2AF0 89A0"            /* V%¿H…„¦çÚÀâ.*ð‰  */
+        $"DB92 4924 9249 1BF5 D855 0470 51D0 AAE2"            /* Û’I$’I.õØU.pQЪâ */
+        $"A1E5 FBC9 CB80 1798 2EB3 EB1E 9FD4 46E7"            /* ¡åûÉË€.˜.³ë.ŸÔFç */
+        $"63DB F02E 204B D35F 54DE 0FD3 2F81 FB63"            /* cÛð. KÓ_TÞ.Ó/�ûc */
+        $"9CEC 37F1 C9FF 5B63 B13D BFBD 1169 0415"            /* œì7ñÉÿ[c±=¿½.i.. */
+        $"0E97 DA89 25E3 92C7 01F5 50E6 2181 A536"            /* .—Ú‰%ã’Ç.õPæ!�¥6 */
+        $"4020 C49B 1977 1BF5 5226 FD7D 668A D76F"            /* @ Ä›.w.õR&ý}fŠ×o */
+        $"2954 58F1 F44F 2935 F136 18BD C844 05FD"            /* )TXñôO)5ñ6.½ÈD.ý */
+        $"E325 9012 9E92 6EC3 E822 D06F A958 C54C"            /* ã%�.ž’nÃè"Ðo©XÅL */
+        $"6A4D 0A98 093C 481D 1424 7964 E810 7A60"            /* jM˜Æ<H..$ydè.z` */
+        $"F2C0 8287 A7F4 B307 FBDF 2550 567E 01EA"            /* òÀ‚‡§ô³.ûß%PV~.ê */
+        $"2C45 4614 9A0A 04E8 397B 3DEC 6CDA CA95"            /* ,EF.šÂ.è9{=ìlÚÊ• */
+        $"B754 699A FF29 B46B D6E3 BB8C 153C AEC0"            /* ·Tišÿ)´kÖ㻌.<®À */
+        $"BEFF 46AD 744B B945 4C07 F7F7 178D 059E"            /* ¾ÿF­tK¹EL.÷÷.�.ž */
+        $"2E80 10C4 6DD6 F19E B649 73D6 8C57 7A6C"            /* .€.ÄmÖñž¶IsÖŒWzl */
+        $"45DE 3D43 22DE C54A DFCD 64EA 9D77 1AC6"            /* EÞ=C"ÞÅJßÍdê�w.Æ */
+        $"E15E A9A7 0D83 D53C 100B EC25 2B93 1D27"            /* á^©§.ƒÕ<..ì%+“.' */
+        $"367A 864E D9C4 F0B9 DF5C 538D B2C0 24EE"            /* 6z†NÙÄð¹ß\S�²À$î */
+        $"46E7 424C 2127 6BED B492 3354 86C9 D855"            /* FçBL!'kí´’3T†ÉØU */
+        $"317B 6BE2 8205 C07C 9A42 03E4 D6B0 0F93"            /* 1{kâ‚.À|šB.äÖ°.“ */
+        $"4400 AFF0 AE8C D6D6 6729 AEBE 9CDE 5C69"            /* D.¯ð®ŒÖÖg)®¾œÞ\i */
+        $"D95C 01A0 28AF 1E57 B12C CA6D F010 ED89"            /* Ù\. (¯.W±,Êmð.í‰ */
+        $"4C46 38AA BAFC D67E 9E98 C6CA 85E4 433E"            /* LF8ªºüÖ~ž˜ÆÊ…äC> */
+        $"C450 03B7 E8DE 17B3 9CE7 02E1 BE72 100B"            /* ÄP.·èÞ.³œç.á¾r.. */
+        $"2EF5 787D 0D12 FC3B 855A 3F97 1850 05EF"            /* .õx}..ü;…Z?—.P.ï */
+        $"A05D 7CC2 405B BA6D 9175 7C99 BE1C 2370"            /*  ]|Â@[ºm‘u|™¾.#p */
+        $"1F57 2085 13F8 B672 728D 1152 8232 1EE4"            /* .W ….ø¶rr�.R‚2.ä */
+        $"A666 BFD0 06A8 6CFF 3D73 D895 5968 A54A"            /* ¦f¿Ð.¨lÿ=sØ•Yh¥J */
+        $"3219 63AB D4CD 8E7D 52F3 D260 CE4D E329"            /* 2.c«ÔÍŽ}RóÒ`ÎMã) */
+        $"F554 C837 34CC 2866 FA1E 1F34 B209 B8C3"            /* õTÈ74Ì(fú..4²Æ¸Ã */
+        $"097B 8DBC 8788 F621 2A57 5468 5FD8 852B"            /* Æ{�¼‡ˆö!*WTh_Ø…+ */
+        $"08A9 45F3 71A8 A26B F63C 2DB1 750F A833"            /* .©Eóq¨¢kö<-±u.¨3 */
+        $"4767 6D8A B551 FF10 9E54 AD5D EE2E 2207"            /* GgmŠµQÿ.žT­]î.". */
+        $"44EA 0D21 75D4 779D E96D 49FF 47CE D775"            /* Dê.!uÔw�émIÿGÎ×u */
+        $"D7B0 2380 5F1C 4185 EF0B BECB 1A55 9696"            /* ×°#€_.A…ï.¾Ë.U–– */
+        $"81B8 94F2 4F5B 07D8 D5EC 9E2A 049D 5E87"            /* �¸”òO[.ØÕìž*.�^‡ */
+        $"2601 FB44 4AD5 C57B A7B0 8088 B723 134E"            /* &.ûDJÕÅ{§°€ˆ·#.N */
+        $"0B8A 375E B972 F34F F25A 2B68 3F15 4496"            /* .Š7^¹róOòZ+h?.D– */
+        $"5734 FE10 D742 67F9 9FFF 639C FAFD 23DB"            /* W4þ.×BgùŸÿcœúý#Û */
+        $"B90C F402 17F0 81C6 2656 EFD0 E011 C866"            /* ¹.ô..ð�Æ&VïÐà.Èf */
+        $"15C8 4927 3415 BEC1 7876 E693 74CB DBEA"            /* .ÈI'4.¾Áxvæ“tËÛê */
+        $"7206 2246 23EC DCCA 51CD 72C1 8C41 1B85"            /* r."F#ìÜÊQÍrÁŒA.… */
+        $"AE9B 6FA5 4286 03FB 7000 D94F 5A8B 8A85"            /* ®›o¥B†.ûp.ÙOZ‹Š… */
+        $"2F34 7575 E7AB 08FF 3CBD 328D D95D BDF5"            /* /4uuç«.ÿ<½2�Ù]½õ */
+        $"8070 0FAD B573 A91E 5F83 D32D 3337 A5B7"            /* €p.­µs©._ƒÓ-37¥· */
+        $"C6A7 3048 8D7C 3F01 F6BF 1BAB D684 0585"            /* Ƨ0H�|?.ö¿.«Ö„.… */
+        $"798A A28D 68A6 4993 22BC F35C E3A7 BABE"            /* yŠ¢�h¦I“"¼ó\㧺¾ */
+        $"0D5B 7E43 2B91 5DA6 6821 0495 4B22 33C0"            /* .[~C+‘]¦h!.•K"3À */
+        $"1217 1302 A7EB 1093 C8BD 3622 F0FD 14C3"            /* ....§ë.“Ƚ6"ðý.à */
+        $"EDBA 60FA B4C2 07D5 6D80 C177 9C23 24FE"            /* íº`ú´Â.Õm€Áwœ#$þ */
+        $"C9E7 77A7 1945 4C1A 8945 129A 2581 498D"            /* Éçw§.EL.‰E.š%�I� */
+        $"F2BD 5AD6 EF89 4D80 3EC2 DA29 E093 A726"            /* ò½ZÖï‰M€>ÂÚ)à“§& */
+        $"88F1 0796 E9F0 8F36 D342 7AD3 DEC2 2CCA"            /* ˆñ.–éð�6ÓBzÓÞÂ,Ê */
+        $"45B9 35A0 DE31 D18B 2954 C38C 4B3A EEA2"            /* E¹5 Þ1Ñ‹)TÃŒK:î¢ */
+        $"5CD5 333D 6C59 23C7 17B3 C98C 65EE 8117"            /* \Õ3=lY#Ç.³ÉŒeî�. */
+        $"22A2 574D D223 581B D09B 6473 3F85 6E2A"            /* "¢WMÒ#X.Лds?…n* */
+        $"81B5 F600 CAB6 1A02 3B24 D726 4344 536F"            /* �µö.ʶ..;$×&CDSo */
+        $"99AB 09C8 96EA B41B 01C9 7AC8 9478 B8AB"            /* ™«ÆÈ–ê´..ÉzÈ”x¸« */
+        $"69E3 1BF1 1100 AFF3 C59C 01FB 8EF9 047D"            /* iã.ñ..¯óÅœ.ûŽù.} */
+        $"21EF 11DE D2CA BEE2 8372 5DDB C39C DE6E"            /* !ï.ÞÒʾâƒr]ÛÃœÞn */
+        $"B652 35FE FDFB F1E8 2E91 778A 86C3 3117"            /* ¶R5þýûñè.‘wŠ†Ã1. */
+        $"87D8 A7D5 7862 68B7 30C1 3B32 D209 0256"            /* ‡Ø§Õxbh·0Á;2ÒÆ.V */
+        $"2BF7 DFEF 17C3 FC30 EF1D 9327 7041 FC3C"            /* +÷ßï.Ãü0ï.“'pAü< */
+        $"674F 3069 DAB2 0EA5 BB48 DC2C DC66 F660"            /* gO0iÚ².¥»HÜ,Üfö` */
+        $"9C9B C7C8 3734 C68B 7D5A 60A1 DF3D D3A8"            /* œ›ÇÈ74Æ‹}Z`¡ß=Ó¨ */
+        $"E60C D15A 11C7 FB3B F75A 358E A7F7 16CB"            /* æ.ÑZ.Çû;÷Z5Ž§÷.Ë */
+        $"67B5 097E E2A2 DE6C E40A FD52 8F75 43EF"            /* gµÆ~â¢ÞläÂýR�uCï */
+        $"F5DF 5A51 BBF5 A074 791F F54F 9724 23C3"            /* õßZQ»õ ty.õO—$#Ã */
+        $"F5E6 C4A3 E22C 1E06 3B71 A9A2 1C17 0109"            /* õæÄ£â,..;q©¢...Æ */
+        $"1B59 2742 AB03 0497 3E5A AD73 7FD3 DA51"            /* .Y'B«..—>Z­s.ÓÚQ */
+        $"9F17 A10E B9CF 7503 3395 8788 9D9D 4A58"            /* Ÿ.¡.¹Ïu.3•‡ˆ��JX */
+        $"F9B8 4A61 3DDA 7489 8086 9EAC 4D7D 62DD"            /* ù¸Ja=Út‰€†ž¬M}bÝ */
+        $"BF8B 9462 1CC0 6912 69BE 3BFE FED7 3174"            /* ¿‹”b.Ài.i¾;þþ×1t */
+        $"CAA6 A806 FF59 B963 ABEE 508B F428 D15C"            /* ʦ¨.ÿY¹c«îP‹ô(Ñ\ */
+        $"82FC BA30 6907 C572 F2BD C0DB E9A2 44AF"            /* ‚üº0i.Årò½ÀÛé¢D¯ */
+        $"EED6 81F7 C602 F802 0374 CD1D 0F41 5E2E"            /* îÖ�÷Æ.ø..tÍ..A^. */
+        $"F54F E7AB C492 54F8 C570 48A6 1603 35D3"            /* õOç«Ä’TøÅpH¦..5Ó */
+        $"EA1A 6A6D FD79 27E3 F928 4E16 3A2D 43FE"            /* ê.jmýy'ãù(N.:-Cþ */
+        $"6C3D AFC6 FA1C 578C 7BA9 7343 5B2C 7BB9"            /* l=¯Æú.WŒ{©sC[,{¹ */
+        $"0614 915A 24C4 CAC1 A2D3 0EAF EAE8 7257"            /* ..‘Z$ÄÊÁ¢Ó.¯êèrW */
+        $"EA2D 1ED2 3FFE 26A7 3E28 28D0 1AE1 D790"            /* ê-.Ò?þ&§>((Ð.á×� */
+        $"A25D 1C6C BA20 E196 1EEC 9720 92EE 6E62"            /* ¢].lº á–.ì— ’înb */
+        $"E218 5609 944E 9A2E 9228 117A 6065 93FF"            /* â.VÆ”Nš.’(.z`e“ÿ */
+        $"2B32 B2C1 7876 E657 E39E 8641 F202 62B4"            /* +2²ÁxvæW㞆Aò.b´ */
+        $"20C5 99D9 F9E5 7D83 D807 EDB7 9A34 475B"            /*  Å™Ùùå}ƒØ.í·š4G[ */
+        $"4F45 9AE8 ACD6 3098 A0C2 8D14 CBDB 9A2B"            /* OEšè¬Ö0˜ Â�.ËÛš+ */
+        $"0EF7 CB30 8B49 169F 1ECD 6F33 F063 65DA"            /* .÷Ë0‹I.Ÿ.Ío3ðceÚ */
+        $"2A2F F0B0 EE29 91F7 CA11 748C 5E4E A447"            /* *.ð°î)‘÷Ê.tŒ^N¤G */
+        $"0F7F 4B32 DB7A 366C 27C4 F178 33B7 5E9B"            /* ..K2Ûz6l'Äñx3·^› */
+        $"BAAF 29CD A3EF 39BB 5FAD AD2B 5DCA 09E8"            /* º¯)Í£ï9»_­­+]ÊÆè */
+        $"DB9A DD07 84DD 870E 2A4C 850B BD04 7F9A"            /* ÛšÝ.„݇.*L….½..š */
+        $"1354 1DAA 0819 F583 1F47 5905 6597 5F07"            /* .T.ª..õƒ.GY.e—_. */
+        $"7ED6 DFFA BA65 FA6C D01D F65F F833 D479"            /* ~ÖßúºeúlÐ.ö_ø3Ôy */
+        $"BFD3 F3D8 57BB 3718 EBC8 5A2D 732E 464E"            /* ¿ÓóØW»7.ëÈZ-s.FN */
+        $"6B46 9512 778B 8066 D5DA D21A 819D 5384"            /* kF•.w‹€fÕÚÒ.��S„ */
+        $"A84C AE56 92E2 2E9A 4D27 8A21 E02D 67FC"            /* ¨L®V’â.šM'Š!à-gü */
+        $"EAA4 B3D5 9306 1D06 CC9A 84C8 D6C4 C7E1"            /* ꤳՓ...Ìš„ÈÖÄÇá */
+        $"4F47 E168 43F0 6EB1 9276 ED11 2C29 F1CB"            /* OGáhCðn±’ví.,)ñË */
+        $"90AB 1975 3405 422B 78EC 7776 FA5C 0A2C"            /* �«.u4.B+xìwvú\Â, */
+        $"F4B1 4F40 32CE D338 8911 EAB4 4CFC 7765"            /* ô±O@2ÎÓ8‰.ê´Lüwe */
+        $"D9ED C10E 114B 0909 1122 6832 A41E 3365"            /* ÙíÁ..KÆÆ."h2¤.3e */
+        $"96EF FC81 A398 2FE8 0464 5D18 0C9F C1AF"            /* –ïü�£˜/è.d]..ŸÁ¯ */
+        $"8E6F 42CA BDC9 1DC4 770E 1C2E 01BD 62DB"            /* ŽoBʽÉ.Äw....½bÛ */
+        $"7798 4167 FC4F B27D D7E6 32CE 7F95 954F"            /* w˜AgüO²}×æ2Î.••O */
+        $"653C 833E B4F1 C6C2 307E 0796 686E 6F5C"            /* e<ƒ>´ñÆÂ0~.–hno\ */
+        $"6EE2 6260 4C0B 5329 36D8 839E 5F08 319C"            /* nâb`L.S)6؃ž_.1œ */
+        $"4CAE 85DE 6B64 F427 1358 C9FF 57B9 AF78"            /* L®…Þkdô'.XÉÿW¹¯x */
+        $"332B 82A6 0EBF 0F83 7A3C 8004 1402 6A12"            /* 3+‚¦.¿.ƒz<€...j. */
+        $"FEE8 1612 2D8A 47FE 5BDE 2714 B393 E32F"            /* þè..-ŠGþ[Þ'.³“ã/ */
+        $"013E BD7E 14FA 285D BF61 7CDA 3A92 734A"            /* .>½~.ú(]¿a|Ú:’sJ */
+        $"520E 978D 8736 6AA9 847B 05C9 F28B 3D9A"            /* R.—�‡6j©„{.Éò‹=š */
+        $"9B2E 721C 9082 3EC1 362C D516 D306 1EB9"            /* ›.r.�‚>Á6,Õ.Ó..¹ */
+        $"A95C EC63 3111 4ED2 054A EFF8 F26A 0E36"            /* ©\ìc1.NÒ.Jïøòj.6 */
+        $"7445 26A0 464F CEDC 924D B183 FAEF 28F7"            /* tE& FOÎÜ’M±ƒúï(÷ */
+        $"AF76 2DBA F15C 4F45 4BFD E003 CDC1 A878"            /* ¯v-ºñ\OEKýà.ÍÁ¨x */
+        $"6FB4 207C 2A45 1ED9 CE49 2495 F6A9 77E8"            /* o´ |*E.ÙÎI$•ö©wè */
+        $"E7FF 7FFF 7FFF 7FFF 70EC F373 E872 28BA"            /* çÿ.ÿ.ÿ.ÿpìósèr(º */
+        $"A0BB 38E4 AC79 94DA 6562 832A 9A7B EEA8"            /*  »8ä¬y”Úebƒ*š{î¨ */
+        $"6B09 FEA7 9249 2005 E7D1 D721 4761 B6DB"            /* kÆþ§’I .çÑ×!Ga¶Û */
+        $"6DB6 DB6D 98C5 C208 FD98 41AA F430 3EAE"            /* m¶Ûm˜ÅÂ.ý˜Aªô0>® */
+        $"7118 7229 50B1 07D8 C5CA 010D 4AB4 DE82"            /* q.r)P±.ØÅÊ..J´Þ‚ */
+        $"53D3 E184 6561 DE5F 7236 BBF5 550D 4A83"            /* SÓá„eaÞ_r6»õU.Jƒ */
+        $"555B 5C0F 9C0E F052 0080 F4AC 3912 DD30"            /* U[\.œ.ðR.€ô¬9.Ý0 */
+        $"47C9 B77E C632 15D7 8EB6 CD51 0454 A805"            /* GÉ·~Æ2.׎¶ÍQ.T¨. */
+        $"2DAD F687 6CB7 B37F 2289 759F F7D5 8839"            /* -­ö‡l·³."‰uŸ÷Õˆ9 */
+        $"B3E6 BCA5 AA89 9D9D 599A 5BDD 54B9 7F7D"            /* ³æ¼¥ª‰��Yš[ÝT¹.} */
+        $"2770 11ED 2217 C539 0204 16FF 728A C52A"            /* 'p.í".Å9...ÿrŠÅ* */
+        $"2D24 5FC7 E1D7 C47E 1DE8 C3F0 EA38 E730"            /* -$_Çá×Ä~.èÃðê8ç0 */
+        $"2D9D 0AC5 991A F5DD 38EC 007B A963 8B4D"            /* -�ÂÅ™.õÝ8ì.{©c‹M */
+        $"51BA A9FC AE25 908A 1B70 9145 EBA2 38C4"            /* Qº©ü®%�Š.p‘Eë¢8Ä */
+        $"168F 70BB 10A5 CAA5 A249 1974 03F3 AB57"            /* .�p».¥Ê¥¢I.t.ó«W */
+        $"3611 30C5 1F14 529F 040A A8EC EBDF F2FF"            /* 6.0Å..RŸ.¨ìëßòÿ */
+        $"232B 83FE C2D0 59D9 93C2 2A8A F86A 997F"            /* #+ƒþÂÐYÙ“Â*Šøj™. */
+        $"3207 03A7 C406 E96C C96F 23F1 1490 95DF"            /* 2..§Ä.élÉo#ñ.�•ß */
+        $"4024 67DC 3DE6 E1B1 EB60 1026 8786 531C"            /* @$gÜ=æá±ë`.&‡†S. */
+        $"9A51 378D EE86 881F 496C 8854 9459 7799"            /* šQ7�.IlˆT”Yw™ */
+        $"11EC 4196 0C22 0F05 3762 D8F4 C348 7299"            /* .ìA–."..7bØôÃHr™ */
+        $"793E 0718 14D3 D09C C192 80E1 9F7C 5CFA"            /* y>...ÓÐœÁ’€áŸ|\ú */
+        $"429C 7960 2F8B 9063 C7E1 1447 7F52 D850"            /* Bœy`/‹�cÇá.G.RØP */
+        $"B80A F1D8 BE98 DC3C 9C44 3AB7 3DA7 E08C"            /* ¸Âñؾ˜Ü<œD:·=§àŒ */
+        $"E7B6 07CE 2B69 C0E9 0C21 6133 1EC5 DAB5"            /* ç¶.Î+iÀé.!a3.ÅÚµ */
+        $"B079 413B FBA4 0259 78B8 DA3A E6D1 4AAC"            /* °yA;û¤.Yx¸Ú:æÑJ¬ */
+        $"2459 93C8 AD9A D69C AC40 5CF7 7385 1B18"            /* $Y“È­šÖœ¬@\÷s….. */
+        $"D67D 82BD 5E44 3DF8 5D2F E6D3 CE47 0191"            /* Ö}‚½^D=ø]/æÓÎG.‘ */
+        $"6E57 0F2F E8E8 9FF0 14BC 21F1 7720 6F34"            /* nW./èèŸð.¼!ñw o4 */
+        $"1EEE 5EF6 F8FD 5481 44E3 AB6B B06E 2556"            /* .î^öøýT�Dã«k°n%V */
+        $"6F07 AD65 FC95 7C32 7487 10A0 3C20 9CA7"            /* o.­eü•|2t‡. < œ§ */
+        $"B0EB F703 2D09 F0A6 D3FD 55F6 354B EDB0"            /* °ë÷.-Æð¦ÓýUö5Kí° */
+        $"179B B267 B9EB 8DA1 ED8E 7D0F 1AFF 4D50"            /* .›²g¹ë�¡íŽ}..ÿMP */
+        $"C1C7 A686 586C 6A26 3B0B 4292 60A0 A804"            /* ÁǦ†Xlj&;.B’` ¨. */
+        $"04F6 5FDB 0F76 E2BC D680 20B5 46AE 399D"            /* .ö_Û.vâ¼Ö€ µF®9� */
+        $"CC54 82A4 1DCA 08E7 E2B4 6710 ABD8 FC18"            /* ÌT‚¤.Ê.çâ´g.«Øü. */
+        $"949B 7076 11CD 598E 2A8B 99FC CC28 EC17"            /* ”›pv.ÍYŽ*‹™üÌ(ì. */
+        $"451C DE31 F7F4 C47E 3ABB AF03 FDC6 D875"            /* E.Þ1÷ôÄ~:»¯.ýÆØu */
+        $"BD0C AB3E B78F F942 A53E E5F8 CA09 414D"            /* ½.«>·�ùB¥>åøÊÆAM */
+        $"7544 D5B4 8367 3256 6D8C CB66 6DE7 E99C"            /* uDÕ´ƒg2VmŒËfmçéœ */
+        $"88E9 FCDC EB55 F67B 20E7 F44D 7616 6B29"            /* ˆéüÜëUö{ çôMv.k) */
+        $"124A C9AB 95C7 E9A8 209D EDA5 499F 2D2F"            /* .JÉ«•Çé¨ �í¥IŸ-/ */
+        $"20E5 DE8C 2EEE 92AF 4BD6 484B 7E18 2D81"            /*  åÞŒ.î’¯KÖHK~.-� */
+        $"0502 F439 C742 BA21 693B 43C5 60DF 8BA0"            /* ..ô9ÇBº!i;CÅ`ß‹  */
+        $"9EAC 0A98 DFE4 DB4B 0BE1 E526 9B74 5982"            /* ž¬Â˜ßäÛK.áå&›tY‚ */
+        $"1817 EA6B 067A D3E4 8786 883D 26DB D361"            /* ..êk.zÓ䇆ˆ=&ÛÓa */
+        $"C40F 89F4 B31F 2AF3 1369 FDA9 889A 5620"            /* Ä.‰ô³.*ó.iý©ˆšV  */
+        $"9AE7 4384 7184 9D7F 6C37 F79B 9422 ADF3"            /* šçC„q„�.l7÷›”"­ó */
+        $"2BEA A620 14CF 0267 110E AB20 594B F1DA"            /* +ê¦ .Ï.g..« YKñÚ */
+        $"9D7F DB53 3723 1A4E 0DEC DF68 3A10 078F"            /* �.ÛS7#.N.ìßh:..� */
+        $"8CA5 471B 4400 0975 92AA A351 8C66 5DDA"            /* Œ¥G.D.Æu’ª£QŒf]Ú */
+        $"0E4E C7B1 286F 2F7C E0EB 24CC 0A8B CAF8"            /* .NDZ(o/|àë$Ì‹Êø */
+        $"4F0F 75E5 CACF 26F5 0FFE 86A8 1E77 5F03"            /* O.uåÊÏ&õ.þ†¨.w_. */
+        $"A8B5 A544 F04B A521 B3FA 854A 64FA 70CD"            /* ¨µ¥DðK¥!³ú…JdúpÍ */
+        $"526F 97AE 807A 05FC 3F67 2471 61E5 2715"            /* Ro—®€z.ü?g$qaå'. */
+        $"5774 E452 7E4A CDDA 6E48 0DA2 04B3 3A29"            /* WtäR~JÍÚnH.¢.³:) */
+        $"DE10 8F75 3A3A 559D A881 B948 74F3 AB92"            /* Þ.�u::U�¨�¹Htó«’ */
+        $"B154 0F88 A11B A00B 25ED 9A59 B894 618E"            /* ±T.ˆ¡. .%íšY¸”aŽ */
+        $"AD45 3D59 9C08 49EA 076C CD63 8F49 B714"            /* ­E=Yœ.Iê.lÍc�I·. */
+        $"32B3 8743 2506 F55A C011 CBEF C94A 8606"            /* 2³‡C%.õZÀ.ËïÉJ†. */
+        $"EDE4 BE7D 2DC9 8830 6C23 91E0 0209 440C"            /* íä¾}-Ɉ0l#‘à.ÆD. */
+        $"9409 1457 6CA0 2201 8FF4 7573 54F8 CCEC"            /* ”Æ.Wl ".�ôusTøÌì */
+        $"D201 4A3A 66A6 B191 4E14 4CB1 08B4 2100"            /* Ò.J:f¦±‘N.L±.´!. */
+        $"BCF2 3A0D 696F 4582 F8B0 3A60 2D09 E9A7"            /* ¼ò:.ioE‚ø°:`-Æé§ */
+        $"8E83 CF44 A16A 6516 31C1 B51E 2DFE BDAC"            /* ŽƒÏD¡je.1Áµ.-þ½¬ */
+        $"356B F402 856C BEA0 109C A125 A759 E580"            /* 5kô.…l¾ .œ¡%§Yå€ */
+        $"3501 F500 F252 9533 F180 6E7D 30A8 FD62"            /* 5.õ.òR•3ñ€n}0¨ýb */
+        $"7FD6 B4EB 9120 8504 493A DD87 D79A 0CB1"            /* .Ö´ë‘ ….I:݇ך.± */
+        $"B674 7010 830D 8A38 5B44 B11D 3632 3FA5"            /* ¶tp.ƒ.Š8[D±.62?¥ */
+        $"CE31 CE9A 1670 AF20 16F6 BDA6 4980 002E"            /* Î1Κ.p¯ .ö½¦I€.. */
+        $"3E9E 8AB0 8B1F 63C5 28C3 7914 2833 137F"            /* >žŠ°‹.cÅ(Ãy.(3.. */
+        $"0915 DD39 7D38 49A3 6054 B5DC 2509 EE11"            /* Æ.Ý9}8I£`TµÜ%Æî. */
+        $"D68A 5C2A C75B 5B9F 7A9A FF3A D06F 3331"            /* ÖŠ\*Ç[[Ÿzšÿ:Ðo31 */
+        $"29E6 A9F4 8AD5 E0D9 7FB9 84B1 F403 8910"            /* )æ©ôŠÕàÙ.¹„±ô.‰. */
+        $"1168 1270 19E2 E385 0353 0FFF 697F 96BE"            /* .h.p.âã….S.ÿi.–¾ */
+        $"EF55 21CA 25A1 CE5E 0CD7 03A9 094F 51FE"            /* ïU!Ê%¡Î^.×.©ÆOQþ */
+        $"5314 E59F 90EB 907A E37A DD9D 182A E41C"            /* S.åŸ�ë�zãzÝ�.*ä. */
+        $"CFFB 7262 0D9E B904 8D95 2DE3 E02B F5CB"            /* Ïûrb.ž¹.�•-ãà+õË */
+        $"BF61 6012 924E 50D3 2D8D 6C25 FC60 8D19"            /* ¿a`.’NPÓ-�l%ü`�. */
+        $"9855 8BF2 5400 0000 04E3 7684 B40E 9EE7"            /* ˜U‹òT....ãv„´.žç */
+        $"21F8 CB76 250B 7CE0 2605 7C84 7E9F F226"            /* !øËv%.|à&.|„~Ÿò& */
+        $"6B94 0DB5 02AA 61E7 A9FF 5D9F A9F2 B546"            /* k”.µ.ªaç©ÿ]Ÿ©òµF */
+        $"2417 2E4D B238 ADDF 9233 5911 1D61 D35A"            /* $..M²8­ß’3Y..aÓZ */
+        $"8788 DF34 284A 9664 B91E 7A11 4568 B395"            /* ‡ˆß4(J–d¹.z.Eh³• */
+        $"7C74 C891 2A46 C056 EE92 0459 D81C A41F"            /* |tÈ‘*FÀVî’.YØ.¤. */
+        $"CA5E 4752 3ADE 89AB 995B 2BF2 D070 41B1"            /* Ê^GR:Þ‰«™[+òÐpA± */
+        $"EBFE 65BF FF61 55F5 5460 A4E0 33CF 7F1E"            /* ëþe¿ÿaUõT`¤à3Ï.. */
+        $"691A 0DA4 9372 4DCD 4A7C FF30 7DA5 4AD0"            /* i..¤“rMÍJ|ÿ0}¥JÐ */
+        $"1236 3C90 00C2 4517 FF78 771E DA05 952D"            /* .6<�.ÂE.ÿxw.Ú.•- */
+        $"1085 D433 FD50 1E6F D583 2585 CBD6 5CFC"            /* .…Ô3ýP.oÕƒ%…ËÖ\ü */
+        $"9EF2 539B BE7A CCA1 ABF6 5AED 484B FF78"            /* žòS›¾zÌ¡«öZíHKÿx */
+        $"D6BD 435E E56E 5510 3047 49DE C511 72CF"            /* Ö½C^ånU.0GIÞÅ.rÏ */
+        $"72A0 B2CE 5E4D E2DA 0AFA FEDE BDFD 3167"            /* r ²Î^MâÚÂúþÞ½ý1g */
+        $"02FE 3FBE A1B9 7A5F 205B 7D60 1BA3 C975"            /* .þ?¾¡¹z_ [}`.£Éu */
+        $"5949 A641 5A3E 5AF2 F237 53BE FCAC 71F1"            /* YI¦AZ>Zòò7S¾ü¬qñ */
+        $"E3E3 6AEB 35B9 41BD C4B6 3400 DBA0 4B7F"            /* ããjë5¹A½Ä¶4.Û K. */
+        $"FF79 17FD 23F9 918D E532 F6BD F949 B633"            /* ÿy.ý#ù‘�å2ö½ùI¶3 */
+        $"6A36 7600 17D8 C912 DB72 6F48 869C 0D66"            /* j6v..ØÉ.ÛroH†œ.f */
+        $"1410 074A 8F5B 629C 5B8B F293 6DB6 DB6D"            /* ...J�[bœ[‹ò“m¶Ûm */
+        $"B6DB 6740 B8F8 BF85 2938 ECDA 6390 6537"            /* ¶Ûg@¸ø¿…)8ìÚc�e7 */
+        $"5986 A2A6 B52C A20D F057 C41F 660A C203"            /* Y†¢¦µ,¢.ðWÄ.fÂÂ. */
+        $"E5C1 68B0 9D56 DAD8 F20C 665C 5D04 4BA2"            /* åÁh°�VÚØò.f\].K¢ */
+        $"46FF 7DB5 4880 6121 2EA3 5D2A 82F4 B18A"            /* Fÿ}µH€a!.£]*‚ô±Š */
+        $"50FC 2D12 DEFE 1F4D 01BF 3315 10D3 5D94"            /* Pü-.Þþ.M.¿3..Ó]” */
+        $"11B1 0221 28B8 56D9 4CED 012D D9C9 4005"            /* .±.!(¸VÙLí.-ÙÉ@. */
+        $"316F E887 29A8 3E83 9E25 FF1F A4C1 5D25"            /* 1oè‡)¨>ƒž%ÿ.¤Á]% */
+        $"8893 36E0 73BE DE25 456A 4678 B7C5 AD7A"            /* ˆ“6às¾Þ%EjFx·Å­z */
+        $"90C9 3950 942F 1459 C737 31EF 991F 241B"            /* �É9P”/.YÇ71ï™.$. */
+        $"C294 7CFB 9461 B43A 8D37 8A6D BBC8 D7F6"            /* ”|û”a´:�7Šm»È×ö */
+        $"A128 281D DF2B EAC5 A154 E6D9 FF53 984D"            /* ¡((.ß+êÅ¡TæÙÿS˜M */
+        $"550E 9C70 3F64 0E0E 0940 0AFC 5CC9 CF43"            /* U.œp?d..Æ@Âü\ÉÏC */
+        $"7184 3D0F 9FDE 08DF EC31 B86E 0D38 AF71"            /* q„=.ŸÞ.ßì1¸n.8¯q */
+        $"29F1 A21D 7847 7150 6DCA 9211 C778 F1A4"            /* )ñ¢.xGqPmÊ’.Çxñ¤ */
+        $"26AA B90D 1A39 DB92 4924 9249 2493 36D2"            /* &ª¹..9Û’I$’I$“6Ò */
+        $"4924 9249 2492 49FE 069C E7B9 CB0D 4E87"            /* I$’I$’Iþ.œç¹Ë.N‡ */
+        $"7D9E 9D29 FC64 8A6F 6185 2BD9 806F 760B"            /* }ž�)üdŠoa…+Ù€ov. */
+        $"464D 4732 BD90 0E7D CABF 2B6F 2A78 8608"            /* FMG2½�.}Ê¿+o*x†. */
+        $"DEF5 406F D401 3FD4 AE82 058D D6C8 B980"            /* Þõ@oÔ.?Ô®‚.�Öȹ€ */
+        $"FECA D9B9 E7B6 3982 9FD3 81EA 544B 30BD"            /* þÊÙ¹ç¶9‚ŸÓ�êTK0½ */
+        $"7E56 FD78 66FD 5A41 D0BD 7714 5FAF 2A1E"            /* ~VýxfýZAнw._¯*. */
+        $"8FDA B705 EAAE F6F2 D69C 9812 7194 A56E"            /* �Ú·.ê®öòÖœ˜.q”¥n */
+        $"DB55 BF75 C4E4 BDCD 9FC2 ACAD C428 829F"            /* ÛU¿uÄä½ÍŸÂ¬­Ä(‚Ÿ */
+        $"2409 3BB2 A894 8020 A8E7 FC16 F4FF 4E84"            /* $Æ;²¨”€ ¨çü.ôÿN„ */
+        $"C06E 889C 1C74 96AD 5420 F825 1A2B 015C"            /* Ànˆœ.t–­T ø%.+.\ */
+        $"6BC2 31EE 64AB 7A44 15E5 3458 8040 AEEF"            /* kÂ1îd«zD.å4X€@®ï */
+        $"F6BD 7D58 6478 8344 018F D3C6 2E33 69A4"            /* ö½}XdxƒD.�ÓÆ.3i¤ */
+        $"E5E8 721A 5B2F 777B C0D8 0A05 2CE7 EEC8"            /* åèr.[/w{ÀØÂ.,çîÈ */
+        $"69EF 417B A960 D320 842E 84DE D442 AB2F"            /* iïA{©`Ó „.„ÞÔB«/ */
+        $"3B31 84FE DCFC A608 2E09 AA42 60F6 DB2E"            /* ;1„þÜü¦..ƪB`öÛ. */
+        $"DA5B C95D D10A 77BE AD48 B5FF 0557 A5AC"            /* Ú[É]ÑÂw¾­Hµÿ.W¥¬ */
+        $"327B F763 FDA1 32BF 7308 3EFC 0C2B 2D22"            /* 2{÷cý¡2¿s.>ü.+-" */
+        $"584A F9CA BFB4 78FF 6E67 42CC B491 492B"            /* XJùÊ¿´xÿngBÌ´‘I+ */
+        $"17C3 C746 9966 5780 BA6C 2798 472E 1CFF"            /* .ÃÇF™fW€ºl'˜G..ÿ */
+        $"6A32 69A0 86E0 44C6 1679 08F9 9928 48D9"            /* j2i †àDÆ.y.ù™(HÙ */
+        $"3DA0 CBA0 1E5E 2618 7162 51C9 DEF0 56A0"            /* = Ë .^&.qbQÉÞðV  */
+        $"1924 F126 CAAD F248 A1A4 2816 13A7 FE76"            /* .$ñ&Ê­òH¡¤(..§þv */
+        $"594E 647C 36C4 C014 CDC7 5C89 DBAB 9854"            /* YNd|6ÄÀ.ÍÇ\‰Û«˜T */
+        $"9094 FC96 5FED 7476 AA3C DF0B B47B C123"            /* �”ü–_ítvª<ß.´{Á# */
+        $"BE6D CD5A BA07 CC19 94FC DC37 B85C 0FD2"            /* ¾mÍZº.Ì.”üÜ7¸\.Ò */
+        $"9FED 62E6 F910 2F49 529E CE10 9738 D296"            /* Ÿíbæù./IRžÎ.—8Ò– */
+        $"A81C 1A0D 0FBF 7CAE DB93 40C0 3BC9 5A0C"            /* ¨....¿|®Û“@À;ÉZ. */
+        $"B23D FBD4 3863 C520 03A0 D966 5327 A0A2"            /* ²=ûÔ8cÅ . ÙfS' ¢ */
+        $"DD06 B7A1 942B 0A75 CB23 8664 4159 8647"            /* Ý.·¡”+ÂuË#†dAY†G */
+        $"2725 DAF6 693A 58D7 7A7D B34A 393D FE7A"            /* '%Úöi:X×z}³J9=þz */
+        $"C105 C374 193C 123C 130E 062C 8AB2 32FD"            /* Á.Ãt.<.<...,Š²2ý */
+        $"80E0 72E3 6AEA 2078 5D7C D3E5 4E20 D927"            /* €àrãjê x]|ÓåN Ù' */
+        $"157E 9DC5 1A29 2F0F C326 AFE3 3ACF C361"            /* .~�Å.)/.Ã&¯ã:ÏÃa */
+        $"8C45 D79C EB27 7441 E4C7 8BFD 5832 DB93"            /* ŒEלë'tAäÇ‹ýX2Û“ */
+        $"78F5 B9DB BA4E 329E A262 C467 88DC C540"            /* xõ¹ÛºN2ž¢bÄgˆÜÅ@ */
+        $"78E0 4E55 34F3 806E 2DEA B371 E9B5 D8DF"            /* xàNU4ó€n-ê³qéµØß */
+        $"5EDA B5B9 1C48 5A11 ECAB E4F8 67B7 C76E"            /* ^Úµ¹.HZ.ì«äøg·Çn */
+        $"460F 8E6A C7BA B5F8 75F2 9105 1480 FD1A"            /* F.ŽjǺµøuò‘..€ý. */
+        $"80EB DB48 6115 AA6E 9AEA A07C 57B0 1A7F"            /* €ëÛHa.ªnšê |W°.. */
+        $"0CBF D5DE 47A7 89BE 4CAE 19FE 7B79 5839"            /* .¿ÕÞG§‰¾L®.þ{yX9 */
+        $"232D 495E 476C E267 D9D2 5257 F0E6 3EB5"            /* #-I^GlâgÙÒRWðæ>µ */
+        $"F140 AAAF 1E36 BA04 086A EEC5 3232 7958"            /* ñ@ª¯.6º..jîÅ22yX */
+        $"72E3 FCC3 9488 B44C 0C15 EF6B 811B CF97"            /* rãüÔˆ´L..ïk�.Ï— */
+        $"0532 2B88 663D 8675 6050 AB94 A435 C0FC"            /* .2+ˆf=†u`P«”¤5Àü */
+        $"9E08 9873 92AF 6859 F7F5 64B0 0BA5 FA68"            /* ž.˜s’¯hY÷õd°.¥úh */
+        $"3557 0898 9E0D 5795 BF67 2866 5FB6 63C6"            /* 5W.˜ž.W•¿g(f_¶cÆ */
+        $"4F82 42CE A682 DC8D CB18 D4FE 6252 95D1"            /* O‚BΦ‚Ü�Ë.ÔþbR•Ñ */
+        $"C85C 6B2C 0FC0 7C9D 5A80 F93B 8900 F93A"            /* È\k,.À|�Z€ù;‰.ù: */
+        $"8EE6 7513 4AFA 1609 3CEE D5EB B420 A1CE"            /* Žæu.Jú.Æ<îÕë´ ¡Î */
+        $"318D 6F67 720A 7F84 4127 C0F2 9193 35CE"            /* 1�ogrÂ.„A'Àò‘“5Î */
+        $"6D97 9682 5E5D B9FC 5A97 3B71 AB1F 64AA"            /* m—–‚^]¹üZ—;q«.dª */
+        $"3383 1F0E C0E9 26BE E6EB 24CD 499F F2BA"            /* 3ƒ..Àé&¾æë$ÍIŸòº */
+        $"997D E886 6FF8 C6B5 0607 1259 7715 7539"            /* ™}è†oøƵ...Yw.u9 */
+        $"4B57 F7A9 56A7 A04B 031F 0786 6C02 E7BC"            /* KW÷©V§ K...†l.ç¼ */
+        $"8256 7F27 A39A B66D 6B95 6C11 CDE4 C580"            /* ‚V.'£š¶mk•l.ÍäÅ€ */
+        $"54DE 7E26 129C EB67 ABC8 455E 6CC3 453E"            /* TÞ~&.œëg«ÈE^lÃE> */
+        $"F9A8 3ED5 9B43 4EB8 384E 0F7B 28E0 16FF"            /* ù¨>Õ›CN¸8N.{(à.ÿ */
+        $"1342 18B1 31B6 EAEF 4C40 36F7 0CFF 6AFF"            /* .B.±1¶êïL@6÷.ÿjÿ */
+        $"8059 5D1C 275B 4F7D B392 4DB0 5E5D 4304"            /* €Y].'[O}³’M°^]C. */
+        $"4848 2A3A C93F BAD6 638D 315A 8771 1150"            /* HH*:É?ºÖc�1Z‡q.P */
+        $"1D41 B6A7 C9B8 782E 19D8 F8E7 07EB ED20"            /* .A¶§É¸x..Øøç.ëí  */
+        $"7D4E AFFF 5FD2 4FA0 2B48 B549 6A50 AD81"            /* }N¯ÿ_ÒO +HµIjP­� */
+        $"F11D 357F 7CB2 4B8B F28B 6C97 2C23 58A3"            /* ñ.5.|²K‹ò‹l—,#X£ */
+        $"92E8 2BFB 77F2 1ECE 7A2A C437 47E3 A833"            /* ’è+ûwò.Îz*Ä7Gã¨3 */
+        $"D60C C3CA 168A 85B8 620C 109C 4134 35BF"            /* Ö.ÃÊ.Š…¸b..œA45¿ */
+        $"ECCB 3629 944F AD29 444A C4B6 F019 F19B"            /* ìË6)”O­)DJĶð.ñ› */
+        $"4189 B1D3 8F28 65B9 85D8 C715 2E1A 267D"            /* A‰±Ó�(e¹…ØÇ...&} */
+        $"A7DB 4C90 9829 BC86 E14C 9F44 757D 5436"            /* §ÛL�˜)¼†áLŸDu}T6 */
+        $"9C38 979D 3654 9A63 E572 7864 E513 A083"            /* œ8—�6Tšcårxdå. ƒ */
+        $"C943 97C5 A88B 23A2 4ECC E4F1 AEED F3EC"            /* ÉC—Ũ‹#¢NÌäñ®íóì */
+        $"C57D F254 B087 7E1F 81B3 59E6 E2A0 E5CB"            /* Å}òT°‡~.�³Yæâ åË */
+        $"B710 EF71 0598 01BF 1400 3814 0759 EDA8"            /* ·.ïq.˜.¿..8..Yí¨ */
+        $"386C 3DF0 F1C5 CA93 612F C58D 71BA 6ED6"            /* 8l=ðñÅÊ“a/Å�qºnÖ */
+        $"FE35 90B4 9C10 A938 33B6 6987 E407 AE7B"            /* þ5�´œ.©83¶i‡ä.®{ */
+        $"5B1A 8E0E BE53 1C94 D747 9303 2ED9 13FA"            /* [.Ž.¾S.”×G“..Ù.ú */
+        $"226C F38A 7134 3CF6 1923 B85F A254 0048"            /* "lóŠq4<ö.#¸_¢T.H */
+        $"A765 B678 FC9C 1E2C E183 FC80 CA83 9572"            /* §e¶xüœ.,áƒü€Êƒ•r */
+        $"E573 B224 9894 7316 C931 4A49 C28F 6E33"            /* ås²$˜”s.É1JIÂ�n3 */
+        $"B579 EE14 84BC 61CC 351B 41FB 7095 5F8C"            /* µyî.„¼aÌ5.Aûp•_Œ */
+        $"1B15 6DAF FF7F F8EA 5A11 5453 6ECA 1C02"            /* ..m¯ÿ.øêZ.TSnÊ.. */
+        $"C8A4 F40F AD00 7BC9 EDFD AC3A 28E4 546F"            /* Ȥô.­.{Éíý¬:(äTo */
+        $"1E36 BE45 897E F5D5 BE25 E84B 57C6 9080"            /* .6¾E‰~õÕ¾%èKWÆ�€ */
+        $"B6C4 79B8 153B 110F D90B 215D 401C 0453"            /* ¶Äy¸.;..Ù.!]@..S */
+        $"8243 BF4A CDAE 9270 0658 462F E0C7 82A8"            /* ‚C¿JÍ®’p.XF/àÇ‚¨ */
+        $"E155 C547 D144 EBAD 74EC EAFF 7799 6D50"            /* áUÅGÑDë­tìêÿw™mP */
+        $"D0F9 6BA4 D8B3 0FBB B75B BC48 D5BA 8EAB"            /* Ðùk¤Ø³.»·[¼HÕºŽ« */
+        $"FF7F 3A2A 820F D817 FB8B 7590 ED4A 3D7B"            /* ÿ.:*‚.Ø.û‹u�íJ={ */
+        $"DAF8 C05F BDCF 1B7C 8862 53A8 95D6 C0DF"            /* ÚøÀ_½Ï.|ˆbS¨•ÖÀß */
+        $"4069 36DA 0739 783C C432 1E0C 7DA6 2D70"            /* @i6Ú.9x<Ä2..}¦-p */
+        $"B33A C5AD 810A FBBD E9BB B776 6463 9FDC"            /* ³:Å­�Âû½é»·vdcŸÜ */
+        $"B401 211D 81BA A9FA 8761 ED36 A1EF 439D"            /* ´.!.�º©ú‡aí6¡ïC� */
+        $"9880 BE88 E045 3068 F59F 7AD7 EFFF 7FFC"            /* ˜€¾ˆàE0hõŸz×ïÿ.ü */
+        $"5562 1F00 0818 22D6 5002 F762 7A20 0DC0"            /* Ub...."ÖP.÷bz .À */
+        $"3ADD FF5D 1851 D391 F011 0000 0000 0000"            /* :Ýÿ].QÓ‘ð....... */
+        $"0000 0000 0138 5715 ED61 F2C5 2C28 30C0"            /* .....8W.íaòÅ,(0À */
+        $"F669 9389 6153 3A95 E010 CCA0 2FEF B36F"            /* öi“‰aS:•à.Ì /ï³o */
+        $"9576 F8C0 F17B 27F6 F6FA 412C 70C7 CF14"            /* •vøÀñ{'ööúA,pÇÏ. */
+        $"7625 6871 7FE2 16C9 B6E9 5BF1 1A16 E2F0"            /* v%hq.â.ɶé[ñ..âð */
+        $"945D E51E CCF9 0970 E586 517C 475F 8856"            /* ”]å.ÌùÆpå†Q|G_ˆV */
+        $"CA0C 1DD9 E001 D7BC 1876 745C 8077 672D"            /* Ê..Ùà.×¼.vt\€wg- */
+        $"CECA FF0B 01D1 76FA 32F5 C047 26FB 451F"            /* ÎÊÿ..Ñvú2õÀG&ûE. */
+        $"5261 79B6 5990 79C9 4DF7 5B69 D548 E894"            /* Ray¶Y�yÉM÷[iÕHè” */
+        $"F249 0C84 D3F0 9555 7B99 EA27 FA38 184E"            /* òI.„Óð•U{™ê'ú8.N */
+        $"F863 AFA1 CE80 AEBC CB89 DD99 B8E2 0BEC"            /* øc¯¡Î€®¼Ë‰Ý™¸â.ì */
+        $"2F74 E534 3FF4 B50A 4B04 02B1 C178 B189"            /* /tå4?ôµÂK..±Áx±‰ */
+        $"D30F 77DC 8A15 8C9E AF87 1DCD D545 AC6B"            /* Ó.wÜŠ.Œž¯‡.ÍÕE¬k */
+        $"CAFB 832B E240 6752 8EF2 9BDF 76E8 621D"            /* Êûƒ+â@gRŽò›ßvèb. */
+        $"892E 384C 7BF0 4DE8 F910 7689 C3F0 E7E9"            /* ‰.8L{ðMèù.v‰Ãðçé */
+        $"E401 C781 F341 A84F 6922 E97B FC22 E259"            /* ä.Ç�óA¨Oi"é{ü"âY */
+        $"6B26 9B03 14A7 DFA1 B7BD CBED 9539 5DE3"            /* k&›..§ß¡·½Ëí•9]ã */
+        $"2041 2F5F A37A 2F23 00FC 6424 D7F8 902E"            /*  A/_£z/#.üd$×ø�. */
+        $"7261 227B B4EC F4D1 9C18 22C3 8CA5 EFF8"            /* ra"{´ìôÑœ."ÃŒ¥ïø */
+        $"5701 6734 9110 8B4E D9E0 EE8F 7FEA 202F"            /* W.g4‘.‹NÙàî�.ê / */
+        $"CFF7 5CC7 6107 0B22 B0BE A87B 32EF 0FA8"            /* Ï÷\Ça.."°¾¨{2ï.¨ */
+        $"3D2D 794E 556E 6089 ACBA D46C 17EC A9DC"            /* =-yNUn`‰¬ºÔl.ì©Ü */
+        $"0F4E D57D B8C8 EED1 F9D4 F96A 7BEE 3794"            /* .NÕ}¸ÈîÑùÔùj{î7” */
+        $"49DE 3AA7 EE2E 0B25 A47C 966A D90D C792"            /* IÞ:§î..%¤|–jÙ.Ç’ */
+        $"6304 7C05 C6EB A26D 83B8 3E0C AAF5 AFFE"            /* c.|.Æë¢mƒ¸>.ªõ¯þ */
+        $"FDC3 F7C4 C0A3 C3ED E8D2 0FAB AC58 1F56"            /* ýÃ÷ÄÀ£ÃíèÒ.«¬X.V */
+        $"FF40 F44B 4289 C6D7 CC17 A019 AD4A C889"            /* ÿ@ôKB‰Æ×Ì. .­Jȉ */
+        $"67AD 0673 32A0 B6BA 087E 7279 19C2 025F"            /* g­.s2 ¶º.~ry.Â._ */
+        $"DB0E 0E97 02D9 2268 5BCA CDE6 B94E 8D9B"            /* Û..—.Ù"h[ÊÍæ¹N�› */
+        $"03EB D786 1698 2D8A 2ECD 432E D615 931F"            /* .ë׆.˜-Š.ÍC.Ö.“. */
+        $"452B 5D40 0950 5BBE A70F BD95 9F0E 8B95"            /* E+]@ÆP[¾§.½•Ÿ.‹• */
+        $"86B7 47DE 0757 BFE4 9775 3082 9D22 863A"            /* †·GÞ.W¿ä—u0‚�"†: */
+        $"E404 B84C 5E88 8424 31DD 689A D234 88E2"            /* ä.¸L^ˆ„$1ÝhšÒ4ˆâ */
+        $"971F 9E59 429C 6C7E 3670 8F7C 8F86 A80D"            /* —.žYBœl~6p�|�†¨. */
+        $"848E E78B 5331 058E E444 FEC2 269A 7E23"            /* „Žç‹S1.ŽäDþÂ&š~# */
+        $"608D 0502 E075 F7A4 DACF 515F AA08 31C1"            /* `�..àu÷¤ÚÏQ_ª.1Á */
+        $"1275 02C0 F37E F465 ADE9 1918 F1F0 0E4F"            /* .u.Àó~ôe­é..ñð.O */
+        $"E5A4 41A5 F655 22D9 946A 7FEC 0720 3D3A"            /* å¤A¥öU"Ù”j.ì. =: */
+        $"4961 05B2 F02D 51D2 1212 084B B3EA 5DC9"            /* Ia.²ð-QÒ...K³ê]É */
+        $"F986 5763 A2AC E2AC 1144 5DC3 E6A5 D092"            /* ù†Wc¢¬â¬.D]Ãæ¥Ð’ */
+        $"3654 3737 A598 21C2 34FF 097C B8B8 5934"            /* 6T77¥˜!Â4ÿÆ|¸¸Y4 */
+        $"C947 05C9 B4BA F52B 99FF 3AFE 6B15 2CAE"            /* ÉG.É´ºõ+™ÿ:þk.,® */
+        $"06CF D962 CCDE D937 D4AE B3D9 7E92 E2AF"            /* .ÏÙbÌÞÙ7Ô®³Ù~’⯠*/
+        $"8F4E 31CE 06E7 0AD8 71DB 4456 7101 E221"            /* �N1Î.çÂØqÛDVq.â! */
+        $"74AC 1159 9EDF 9841 CFA3 E04F DECF 6FD3"            /* t¬.Yžß˜AÏ£àOÞÏoÓ */
+        $"90CC C22F 63B0 45CC C98B 3125 33C0 CFBA"            /* �ÌÂ/c°EÌÉ‹1%3ÀϺ */
+        $"4CE7 3FAD F2E4 85E7 0C74 35A5 97E9 8672"            /* Lç?­òä…ç.t5¥—é†r */
+        $"9180 E059 EF0F C416 E25F 0E83 095A 36AA"            /* ‘€àYï.Ä.â_.ƒÆZ6ª */
+        $"8E74 F1F7 11A8 49DD C47E 5098 D576 DC41"            /* Žtñ÷.¨IÝÄ~P˜ÕvÜA */
+        $"D6FC 7C37 E307 A2DB 997E A046 C114 CF04"            /* Öü|7ã.¢Û™~ FÁ.Ï. */
+        $"FD8E 32D1 2AC6 3A81 C8B6 C680 6E60 7826"            /* ýŽ2Ñ*Æ:�ȶƀn`x& */
+        $"9A40 9C80 BA1B 4DE8 854B 09D9 33B3 95BE"            /* š@œ€º.Mè…KÆÙ3³•¾ */
+        $"7CE5 CCA3 C463 5D1C 1F2B A160 E208 AA0A"            /* |åÌ£Äc]..+¡`â.ªÂ */
+        $"D00F 1933 5FB5 2705 4E9C 3733 0FD0 2AA0"            /* Ð..3_µ'.Nœ73.Ð*  */
+        $"D116 F240 05EA 53BB 5A5A 0A4B 3D9E FCB7"            /* Ñ.ò@.êS»ZZÂK=žü· */
+        $"FE35 1D0B 1E56 C4AA 9B6C 8CE6 10CA DAA5"            /* þ5...VĪ›lŒæ.ÊÚ¥ */
+        $"6DF1 6F74 C332 BD93 556E 89F5 A94A 232D"            /* mñotÃ2½“Un‰õ©J#- */
+        $"E9EF C950 666C 7D3E D1BA C98F 4489 3C5D"            /* éïÉPfl}>ѺÉ�D‰<] */
+        $"F7FC 88D4 C90E EE9D 7691 C976 2CFE 6BA0"            /* ÷üˆÔÉ.î�v‘Év,þk  */
+        $"B53E 5C59 749E FEBC 4AB4 490C A3B6 5187"            /* µ>\Ytžþ¼J´I.£¶Q‡ */
+        $"4A10 1076 6348 AEC1 054B 0A98 9196 29C3"            /* J..vcH®Á.K˜‘–)à */
+        $"F995 50E4 E003 F099 9495 7ECC 1C78 C536"            /* ù•Päà.ð™”•~Ì.xÅ6 */
+        $"AA8D 7305 BE7F FF72 99F7 25ED 4C38 0896"            /* ª�s.¾.ÿr™÷%íL8.– */
+        $"A1BE F2D4 016E B744 CBB7 9CEE 1C88 5E3D"            /* ¡¾òÔ.n·DË·œî.ˆ^= */
+        $"1B9E E3CB 29D2 AAA7 C3F6 41F4 B6C0 5861"            /* .žãË)Òª§ÃöAô¶ÀXa */
+        $"93D3 4773 858E 3470 E670 4F94 E206 FBA3"            /* “ÓGs…Ž4pæpO”â.û£ */
+        $"7050 2A3D 6DC0 004E 32D7 6043 4E5E C44F"            /* pP*=mÀ.N2×`CN^ÄO */
+        $"284A 3214 97B7 19DE 41C4 6204 56CB 1695"            /* (J2.—·.ÞAÄb.VË.• */
+        $"BAD8 C308 0FFE BEB7 FE14 C6AC CEE8 5022"            /* ºØÃ..þ¾·þ.ƬÎèP" */
+        $"C27A 2CCA 4714 4C52 3975 615D A1C8 62BF"            /* Âz,ÊG.LR9ua]¡Èb¿ */
+        $"C477 FF7E 2637 3B89 8C43 6E09 285B 2D1A"            /* Äwÿ~&7;‰ŒCnÆ([-. */
+        $"8E9E 4110 CE7B E30A E21C A140 02C8 D0AD"            /* ŽžA.Î{ãÂâ.¡@.ÈЭ */
+        $"630B 5488 7CE7 B884 393A 6FDD 5A68 7FB9"            /* c.Tˆ|縄9:oÝZh.¹ */
+        $"60EC C73B 143E 3F61 3E31 1A3E 8438 7944"            /* `ìÇ;.>?a>1.>„8yD */
+        $"B652 14AE 63CA 803C 9B67 C6FE 2F5D 4CD0"            /* ¶R.®cÊ€<›gÆþ/]LÐ */
+        $"3A63 1328 8809 A4AB B4A1 8664 FE90 F03E"            /* :c.(ˆÆ¤«´¡†dþ�ð> */
+        $"18E2 7982 7DDC A444 1306 4546 61B2 A710"            /* .ây‚}ܤD..EFa²§. */
+        $"CCED 529C 92CB D547 22F5 0DB0 B10F 8450"            /* ÌíRœ’ËÕG"õ.°±.„P */
+        $"E5AC 253A 6937 BFBD D0C6 8AED 14C7 787E"            /* å¬%:i7¿½ÐÆŠí.Çx~ */
+        $"21E7 860D 8567 633D A9E6 0466 93A5 6789"            /* !ç†.…gc=©æ.f“¥g‰ */
+        $"D643 2EEE 7542 7B02 086A 83C4 AD3C 785C"            /* ÖC.îuB{..jƒÄ­<x\ */
+        $"E3B4 BFC0 C27C 3762 1D98 0A0C B43D 8107"            /* ã´¿ÀÂ|7b.˜Â.´=�. */
+        $"3003 FF74 C626 1BC1 44AA 08A0 7A68 0ADE"            /* 0.ÿtÆ&.ÁDª. zhÂÞ */
+        $"E9BD 94DB 3644 AA13 CFCA A9CB 0E8F 9061"            /* é½”Û6Dª.ÏÊ©Ë.��a */
+        $"73BC 6A23 359D C129 F184 4EBA BE0F A772"            /* s¼j#5�Á)ñ„Nº¾.§r */
+        $"9AB6 7DDC C179 81DB 9FDC EDA3 E6C5 21E2"            /* š¶}ÜÁy�ÛŸÜí£æÅ!â */
+        $"7049 87BC 00E3 34F5 8066 3FFE 7CA7 A588"            /* pI‡¼.ã4õ€f?þ|§¥ˆ */
+        $"6277 30DE 8FC1 950A A652 5B12 B0A4 B8BE"            /* bw0Þ�Á•Â¦R[.°¤¸¾ */
+        $"2297 4261 CB90 AEBB F3CB 2BEE 2FA8 149E"            /* "—BaË�®»óË+î/¨.ž */
+        $"11E6 487B 3EFA 45B9 E4A8 17DF DF8E D5FF"            /* .æH{>úE¹ä¨.ßߎÕÿ */
+        $"750C 2E52 4F3F 5960 B3B7 3DEB CFE3 4EC3"            /* u..RO?Y`³·=ëÏãNà */
+        $"676F D76A F8C3 67EB 383B 042A C000 1CF5"            /* go×jøÃgë8;.*À..õ */
+        $"FB57 51DF 4E0F 9709 4A58 F371 8A53 79CD"            /* ûWQßN.—ÆJXóqŠSyÍ */
+        $"B935 29C8 5953 BBFB B216 24F0 FF5C F1BE"            /* ¹5)ÈYS»û².$ðÿ\ñ¾ */
+        $"1649 C9BE 754A CC45 62C3 44A2 3E12 A872"            /* .IɾuJÌEbÃD¢>.¨r */
+        $"736B 05DD F77C C7C6 F33D 8224 147E D163"            /* sk.Ý÷|ÇÆó=‚$.~Ñc */
+        $"02B4 0BC6 297A FA75 03A7 BFDD 709A A878"            /* .´.Æ)zúu.§¿Ýpš¨x */
+        $"734A 7236 791A BFF6 9F21 CC67 268D 160D"            /* sJr6y.¿öŸ!Ìg&�.. */
+        $"A6D0 7988 72CF 6475 146C 81EB 8249 518A"            /* ¦ÐyˆrÏdu.l�ë‚IQŠ */
+        $"49B7 0389 FDB6 9CEB DCA2 41ED 085D 4E85"            /* I·.‰ý¶œëÜ¢Aí.]N… */
+        $"03E4 3F4E D8CF 25E1 658D 38F6 8F88 A499"            /* .ä?NØÏ%áe�8ö�ˆ¤™ */
+        $"B64A DD79 FDF2 39FB 5CEC F29B 714A 733B"            /* ¶JÝyýò9û\ìò›qJs; */
+        $"76E4 94E5 F567 3A71 28F0 13A6 7A74 CD91"            /* vä”åõg:q(ð.¦ztÍ‘ */
+        $"5804 065E D3C7 09B7 ED19 51E5 0913 4436"            /* X..^ÓÇÆ·í.QåÆ.D6 */
+        $"9791 BB58 10F3 7183 5DB6 4874 65D2 AAD2"            /* —‘»X.óqƒ]¶HteÒªÒ */
+        $"DBA2 C761 A70F 3EEE 9256 2EF0 945D E52D"            /* Û¢Ça§.>î’V.ð”]å- */
+        $"34CF 10DF B2AF 8E14 A5A4 E24F 0051 F63E"            /* 4Ï.ß²¯Ž.¥¤âO.Qö> */
+        $"F11C 5DAC 6D8D DEDD A585 96FC A2AB A5FF"            /* ñ.]¬m�ÞÝ¥…–ü¢«¥ÿ */
+        $"5298 6349 DB41 9276 C1C6 F1E2 9ABF 822B"            /* R˜cIÛA’vÁÆñâš¿‚+ */
+        $"346F 8679 726C 666A 9638 246A EABE 54A9"            /* 4o†yrlfj–8$jê¾T© */
+        $"49DD F22A BC62 5867 51F2 FDBD B33B 40E0"            /* IÝò*¼bXgQòý½³;@à */
+        $"220F 075D 031C EAAE 3CDE 67CF 2269 E26D"            /* "..]..ê®<ÞgÏ"iâm */
+        $"BEF3 1873 E610 D43E 8F03 A14F F04F 980B"            /* ¾ó.sæ.Ô>�.¡OðO˜. */
+        $"69FF 1E4A 1925 DDE6 B473 84B5 6F53 75DD"            /* iÿ.J.%Ýæ´s„µoSuÝ */
+        $"CF71 C4C0 72DC 5403 7E7B 1A9B 6F16 BA87"            /* ÏqÄÀrÜT.~{.›o.º‡ */
+        $"A44D D4A2 8029 E15A 8C17 BE55 A30B 87B3"            /* ¤MÔ¢€)áZŒ.¾U£.‡³ */
+        $"DC5B CED9 2E4C A8F3 939B 6F82 8885 9BD5"            /* Ü[ÎÙ.L¨ó“›o‚ˆ…›Õ */
+        $"905B 6EE2 E3C9 D45E DE91 DD46 7EDD 23BB"            /* �[nâãÉÔ^Þ‘ÝF~Ý#» */
+        $"6852 2BD3 3D31 2755 2D1B 7431 35EB 6CBD"            /* hR+Ó=1'U-.t15ël½ */
+        $"638C 9E5D F0EB 9AE0 49BC D327 7536 BCB3"            /* cŒž]ðëšàI¼Ó'u6¼³ */
+        $"65F1 992B E073 9D25 980D A244 7F9E 749F"            /* eñ™+às�%˜.¢D.žtŸ */
+        $"53BD D08A C5EF 64A2 D672 7A55 9146 5CAD"            /* S½ÐŠÅïd¢ÖrzU‘F\­ */
+        $"7839 E1B6 7543 4556 146E C347 33E3 2798"            /* x9á¶uCEV.nÃG3ã'˜ */
+        $"4752 6F78 AAA5 AE5E 7B02 CD92 D5F1 FD30"            /* GRoxª¥®^{.Í’Õñý0 */
+        $"F78A 7BFB 03AB CF34 58BF 3810 B8A7 CDAB"            /* ÷Š{û.«Ï4X¿8.¸§Í« */
+        $"A573 658E 260A 7C50 000F 00AC D13F 618E"            /* ¥seŽ&Â|P...¬Ñ?aŽ */
+        $"A241 9458 3945 9D59 3F9B 13C5 04CC 600E"            /* ¢A”X9E�Y?›.Å.Ì`. */
+        $"FC51 8C8D FBA0 4150 5832 4539 730B 4631"            /* üQŒ�û APX2E9s.F1 */
+        $"0598 EE14 817C B560 97C5 B953 64D4 980D"            /* .˜î.�|µ`—ŹSdÔ˜. */
+        $"C379 6FFF 3E63 6746 7BE8 D3AB 5215 B47F"            /* Ãyoÿ>cgF{èÓ«R.´. */
+        $"3CAE 42E4 D4BF B7BF 6580 3319 6A71 C2E9"            /* <®BäÔ¿·¿e€3.jqÂé */
+        $"48AA 2C5E 9D78 B9C3 F8DA B858 D5AB 99F4"            /* Hª,^�x¹ÃøÚ¸XÕ«™ô */
+        $"B04F EAAC D0DE 2302 F874 7E64 A69B 89CE"            /* °Oê¬ÐÞ#.øt~d¦›‰Î */
+        $"AEAB A73F F815 0D06 B24E 39EC D8E9 EFB7"            /* ®«§?ø...²N9ìØéï· */
+        $"ED32 55A0 8E21 B52A E55C 17AE E07B 42F4"            /* í2U Ž!µ*å\.®à{Bô */
+        $"D451 CB7C E941 1578 3EE3 9565 087E 9A05"            /* ÔQË|éA.x>ã•e.~š. */
+        $"B5FC 403A AAA2 25CE 5AC1 B658 1EE9 9A53"            /* µü@:ª¢%ÎZÁ¶X.éšS */
+        $"4000 51DF 95E8 C605 97AC C7E1 A8B1 F86C"            /* @.Qß•èÆ.—¬Çᨱøl */
+        $"7C3F 0BCC E410 8FA7 78C0 7964 BDD0 E341"            /* |?.Ìä.�§xÀyd½ÐãA */
+        $"5DC5 D977 EF99 460C FC48 A51A B5CD DE47"            /* ]ÅÙwï™F.üH¥.µÍÞG */
+        $"F9E2 194D 1F2D B2B6 556B 0F68 BD1B 5BEA"            /* ùâ.M.-²¶Uk.h½.[ê */
+        $"9FDD 1280 92A3 EF96 132C 22F6 CA8A 1C20"            /* ŸÝ.€’£ï–.,"öÊŠ.  */
+        $"54DA F163 6119 BC02 7AE6 10CA A16B 993A"            /* TÚñca.¼.zæ.Ê¡k™: */
+        $"E22B CC58 D181 40E6 EA99 0897 5166 4C1F"            /* â+ÌXÑ�@æê™.—QfL. */
+        $"6D58 D092 5119 1AF5 0C2B 1DC6 029D F0E8"            /* mXÐ’Q..õ.+.Æ.�ðè */
+        $"1F6F 9F5C 17D8 68A0 F600 5C68 5C16 4269"            /* .oŸ\.Øh ö.\h\.Bi */
+        $"F5A9 4D97 32DE 3A9C 6609 86C2 1D0F BA56"            /* õ©M—2Þ:œfƆÂ..ºV */
+        $"3C8C 1046 E0DC 2ECB 9BDB D61E 6955 CE38"            /* <Œ.FàÜ.Ë›ÛÖ.iUÎ8 */
+        $"DB97 859B 9E73 78BF FDEB ED74 0C4E 4203"            /* Û—…›žsx¿ýëít.NB. */
+        $"431D 69C4 635D D1EA 1A9A 6462 BE48 DDB9"            /* C.iÄc]Ñê.šdb¾Hݹ */
+        $"6E63 C4D8 8886 51CB 19E6 A7C9 5941 8443"            /* ncÄ؈†QË.æ§ÉYA„C */
+        $"57E5 8C3B B907 FF17 4B41 08DA 7AFC 1B8B"            /* WåŒ;¹.ÿ.KA.Úzü.‹ */
+        $"9B05 622E 1F81 91D8 2C60 9C6A 3B23 608B"            /* ›.b..�‘Ø,`œj;#`‹ */
+        $"F2EC E527 70F9 D963 D302 D7AC 18E2 2692"            /* òìå'pùÙcÓ.׬.â&’ */
+        $"AE0C D915 7E30 5B09 305C 8F5D 1346 3FF2"            /* ®.Ù.~0[Æ0\�].F?ò */
+        $"8635 ECEC 1CB7 962D 0846 3FA9 5920 C1B0"            /* †5ìì.·–-.F?©Y Á° */
+        $"5582 FF3A 24E0 FAAE 8FAE 3843 DFCF B74F"            /* U‚ÿ:$àú®�®8CßÏ·O */
+        $"CAEC 5602 D1C5 1760 5ECD 92C8 1DD1 4ABE"            /* ÊìV.ÑÅ.`^Í’È.ÑJ¾ */
+        $"2336 8A90 E444 6753 D3E0 0F02 8E99 7393"            /* #6Š�äDgSÓà..Ž™s“ */
+        $"8B26 6C9F BFB4 64DE 7867 73F7 10F0 477A"            /* ‹&lŸ¿´dÞxgs÷.ðGz */
+        $"8383 ADA5 49C3 722B 1FD7 0BB5 4118 4714"            /* ƒƒ­¥IÃr+.×.µA.G. */
+        $"D5F9 6C20 CDD0 8151 EAB4 457F FF4E 314C"            /* Õùl ÍÐ�Qê´E.ÿN1L */
+        $"6E7F 04DB DE0C 611B 62AC 2A4E 869C 06FB"            /* n..ÛÞ.a.b¬*N†œ.û */
+        $"DB81 F238 C4FC 149E 8176 3F0C 4B83 0DFF"            /* Û�ò8Äü.ž�v?.Kƒ.ÿ */
+        $"7FB4 A5F5 80C7 E4F0 47AD 8D3F 5426 B12A"            /* .´¥õ€ÇäðG­�?T&±* */
+        $"8678 11E1 A0EF 5439 31D8 E97E 3AE9 E4DD"            /* †x.á ïT91Øé~:éäÝ */
+        $"3DB7 4A94 7FFF 7135 0C02 ACE2 70F5 626B"            /* =·J”.ÿq5..¬âpõbk */
+        $"271A 4401 DF00 AE70 E43B D3F8 75AD 0DAB"            /* '.D.ß.®pä;Óøu­.« */
+        $"794A C0C7 928F 8621 BE61 DA60 A89F 8E95"            /* yJÀÇ’�†!¾aÚ`¨ŸŽ• */
+        $"64E1 4B82 9CA5 D1CB 26FA 3B49 2FDF 8007"            /* dáK‚œ¥ÑË&ú;I/߀. */
+        $"60B1 1C23 B192 973E 87DD 9323 E697 CA76"            /* `±.#±’—>‡Ý“#æ—Êv */
+        $"03D6 B09A 33FA 5CEC 856D 1D12 5249 2492"            /* .Ö°š3ú\ì…m..RI$’ */
+        $"4924 9249 2492 4924 9231 8B0A C6C2 C882"            /* I$’I$’I$’1‹ÂÆÂÈ‚ */
+        $"FC66 E59C E646 38B0 B26F A097 FEA2 30FE"            /* üfåœæF8°²o —þ¢0þ */
+        $"F5B9 90DC 3FEF 3116 73C4 7B20 6C09 EA40"            /* õ¹�Ü?ï1.sÄ{ lÆê@ */
+        $"AB90 6257 8BAD 951C 002E 138D 7274 121D"            /* «�bW‹­•....�rt.. */
+        $"B91E 66F5 6038 8257 FD9A 18C9 0155 522C"            /* ¹.fõ`8‚Wýš.É.UR, */
+        $"D6CC 0F6A 6A4A 09F3 0C4A B702 47FF 7FFC"            /* ÖÌ.jjJÆó.J·.Gÿ.ü */
+        $"B504 0034 6682 CE19 CA7C 50BE F8B0 9DCB"            /* µ..4f‚Î.Ê|P¾ø°�Ë */
+        $"0092 4924 9248 F298 B4D2 A612 6CEE 878F"            /* .’I$’Hò˜´Ò¦.lî‡� */
+        $"FF7F FF5F 8F59 B3E0 FE9F A74E 506D C924"            /* ÿ.ÿ_�Y³àþŸ§NPmÉ$ */
+        $"9249 2492 4924 9249 2492 4924 924D 57A2"            /* ’I$’I$’I$’I$’MW¢ */
+        $"2CC8 426C 393A 96E4 50FB 0ACE 8874 7A86"            /* ,ÈBl9:–äPûÂΈtz† */
+        $"2B20 84D4 0F34 1532 DFF0 D633 0231 0F65"            /* + „Ô.4.2ßðÖ3.1.e */
+        $"91D1 8E19 A917 CD2A 8D35 89BE F64E D1A8"            /* ‘ÑŽ.©.Í*�5‰¾öNѨ */
+        $"926C AE06 3A49 80F9 C1FE 0E81 52D8 5A8C"            /* ’l®.:I€ùÁþ.�RØZŒ */
+        $"7A00 5EF2 9F04 3659 74EC D695 94B6 5B90"            /* z.^òŸ.6YtìÖ•”¶[� */
+        $"89C0 E661 DFC4 5E69 965B 4D1D 4B76 7C0E"            /* ‰ÀæaßÄ^i–[M.Kv|. */
+        $"89D2 C1E8 B1EF CF9E 5E96 3977 AEA6 532B"            /* ‰ÒÁè±ïÏž^–9w®¦S+ */
+        $"68B1 BD73 2BE6 BB5B 766E FA91 5C36 628C"            /* h±½s+æ»[vnú‘\6bŒ */
+        $"F45F FEEA C7DF 49F0 278F F459 E9B6 BDAC"            /* ô_þêÇßIð'�ôY鶽¬ */
+        $"1A28 F485 45C5 2761 DC37 C72A 8A17 2D08"            /* .(ô…EÅ'aÜ7Ç*Š.-. */
+        $"5130 E9D5 E1BD 2D59 07B5 2290 00F9 F737"            /* Q0éÕá½-Y.µ"�.ù÷7 */
+        $"C1F4 5C78 1058 C4C6 13AB AE5C 45DE ACB4"            /* Áô\x.XÄÆ.«®\EÞ¬´ */
+        $"7DC9 03C4 0F82 7850 6F9E 5FD3 9223 36FE"            /* }É.Ä.‚xPož_Ó’#6þ */
+        $"8A1D 1D99 FBB3 646B 206B FC7E 668E 4730"            /* Š..™û³dk kü~fŽG0 */
+        $"7C8C 79D9 A37A 427B 1E91 E7A1 DED2 E57D"            /* |ŒyÙ£zB{.‘ç¡ÞÒå} */
+        $"E167 967A 8B9F A6C0 A36F 68E8 D03C 84C6"            /* ág–z‹Ÿ¦À£ohèÐ<„Æ */
+        $"E952 3CAF 039F 18CD 236C 4AE1 FB74 D7F6"            /* éR<¯.Ÿ.Í#lJáût×ö */
+        $"DFBF B7A4 AFDB D27E 2FB7 7BBF 86F0 DF6F"            /* ß¿·¤¯ÛÒ~/·{¿†ðßo */
+        $"4F9F C3A7 EC7F 0D0F BEDB 1EFB 77AA FB77"            /* OŸÃ§ì...¾Û.ûwªûw */
+        $"2CED 1CDE F39E A2F3 567D 91E9 4703 B8A2"            /* ,í.Þóž¢óV}‘éG.¸¢ */
+        $"5006 2494 6271 81F3 3B95 0B89 EDD5 7FE8"            /* P.$”bq�ó;•.‰íÕ.è */
+        $"B864 3D84 75CD 7478 A5D6 28C8 D483 39EF"            /* ¸d=„uÍtx¥Ö(ÈÔƒ9ï */
+        $"86CA 5763 87CA 97CF A9D4 AFA9 0450 6744"            /* †ÊWc‡Ê—Ï©Ô¯©.PgD */
+        $"16E3 8C0B 0015 88DA 5244 1AB2 9790 35B0"            /* .ãŒ...ˆÚRD.²—�5° */
+        $"0489 B911 D871 2BB4 6576 C185 22B7 1F86"            /* .‰¹.Øq+´evÁ…"·.† */
+        $"230A 3CD3 ECB5 20A6 23BA A068 A53E 8EAD"            /* #Â<Óìµ ¦#º h¥>Ž­ */
+        $"3793 46B5 BA07 96A8 DF28 6A66 CE05 73CE"            /* 7“Fµº.–¨ß(jfÎ.sÎ */
+        $"1938 F9A6 9CBC 0D7F F193 E0D5 09CC 3426"            /* .8ù¦œ¼..ñ“àÕÆÌ4& */
+        $"4BB1 52B9 F337 0537 FA01 B010 5471 B015"            /* K±R¹ó7.7ú.°.Tq°. */
+        $"754C A1A6 E071 800C 1A26 243D 172B 1497"            /* uL¡¦àq€..&$=.+.— */
+        $"E5DF 1EB1 6A6C 6761 3BA6 52C0 C0B4 69BD"            /* åß.±jlga;¦RÀÀ´i½ */
+        $"E6B4 275E EB6E 42BF D693 8928 15A4 9DB2"            /* æ´'^ënB¿Ö“‰(.¤�² */
+        $"D8FA E273 6C04 CBB5 06A9 8096 5E97 5D11"            /* Øúâsl.˵.©€–^—]. */
+        $"0B1B 8E93 BDCC 1AE8 4CBA 9413 A729 F6A7"            /* ..Ž“½Ì.èLº”.§)ö§ */
+        $"F24D 467F 0316 BF60 F777 C2E3 7FAA DC07"            /* òMF...¿`÷wÂã.ªÜ. */
+        $"148F 5C26 91C3 20B8 F3A0 9088 F893 6D47"            /* .�\&‘à ¸ó �ˆø“mG */
+        $"7AC1 A0D9 5483 8281 5B98 28AE 9EAB 94F0"            /* zÁ ÙTƒ‚�[˜(®ž«”ð */
+        $"9B68 08E3 E3DA 7E3A AA84 9EED F083 117F"            /* ›h.ããÚ~:ª„žíðƒ.. */
+        $"FE75 781E E394 EEEC F9AC 21D6 FF5E DD57"            /* þux.ã”îìù¬!Öÿ^ÝW */
+        $"96CF A7DF 3C0D 7E2F F9E7 F212 83EE E629"            /* –ϧß<.~/ùçò.ƒîæ) */
+        $"9543 AA61 C10A 4B12 1DD8 6835 405A D739"            /* •CªaÁÂK..Øh5@Z×9 */
+        $"DBD7 1628 2816 909D 1DEB 81F2 16AF 8953"            /* Û×.((.��.ë�ò.¯‰S */
+        $"9239 B79D A64A 3275 E506 BFD3 0198 776C"            /* ’9·�¦J2uå.¿Ó.˜wl */
+        $"F4C2 39CD 4CF8 2482 D781 526A 7D82 0B83"            /* ôÂ9ÍLø$‚×�Rj}‚.ƒ */
+        $"120C B2AB 1FC0 2DAA 4A72 ACD9 B4C7 926A"            /* ..²«.À-ªJr¬Ù´Ç’j */
+        $"CE69 46FA C67E 904D 12D4 D6EC 2F77 AC43"            /* ÎiFúÆ~�M.ÔÖì/w¬C */
+        $"0A82 A09A 8FAC 59F0 D192 4F8F E6D1 A8B3"            /* ‚ š�¬YðÑ’O�æѨ³ */
+        $"26FD EAD1 7727 E253 F826 580D 8786 8EAD"            /* &ýêÑw'âSø&X.‡†Ž­ */
+        $"4561 33FC 6C93 72E4 3F53 3E92 5E78 9597"            /* Ea3ül“rä?S>’^x•— */
+        $"895F 61B9 D382 514D 839E D4E8 A40B 6F99"            /* ‰_a¹Ó‚QMƒžÔè¤.o™ */
+        $"0BEC 889F F976 6F24 AEAC 2A18 479B 9CD0"            /* .숟ùvo$®¬*.G›œÐ */
+        $"A58D E4A8 4940 D7A9 26A7 8649 C387 22EB"            /* ¥�ä¨I@ש&§†IÇ"ë */
+        $"10F3 AB7F 805D 57F4 6918 508A 429D FC32"            /* .ó«.€]Wôi.PŠB�ü2 */
+        $"0E49 3480 E5A6 0267 54A6 D677 422D 1B62"            /* .I4€å¦.gT¦ÖwB-.b */
+        $"4DFB C3A4 2E01 8C0D 029D D238 87B0 230E"            /* Mûä..Œ..�Ò8‡°#. */
+        $"AB6E AEFD 64F3 F7AE 7BD7 DA13 2BCC DCFB"            /* «n®ýdó÷®{×Ú.+ÌÜû */
+        $"13EC E7EE A36F 86C6 A2D8 DD70 6174 04FA"            /* .ìçî£o†Æ¢ØÝpat.ú */
+        $"B7F7 A3BF 9C4C F99C C177 9B27 9148 3998"            /* ·÷£¿œLùœÁw›'‘H9˜ */
+        $"013A 4B0C E3A5 6905 6ADC 739C 3586 7009"            /* .:K.ã¥i.jÜsœ5†pÆ */
+        $"38DA 0496 C25E DFB2 F2AB 34C0 F138 4F81"            /* 8Ú.–Â^ß²ò«4Àñ8O� */
+        $"7240 2774 4588 B153 267B DBBE DFDE AEAD"            /* r@'tEˆ±S&{Û¾ßÞ®­ */
+        $"1D90 BA71 2B83 D108 1CDB 8B36 7837 8AAA"            /* .�ºq+ƒÑ..Û‹6x7Šª */
+        $"299C 2916 D66C CC2E 2FCF B0E3 228A 88C1"            /* )œ).ÖlÌ./Ï°ã"ŠˆÁ */
+        $"568F 12D8 D599 AB3F 29DE 1FA6 9336 132F"            /* V�.ØÕ™«?)Þ.¦“6./ */
+        $"521E 8EB9 9BD4 30E4 362E 349E 209A 6EB6"            /* R.Ž¹›Ô0ä6.4ž šn¶ */
+        $"D5CC 985B E51E 8A74 B9A0 1718 2753 A1E0"            /* Õ̘[å.Št¹ ..'S¡à */
+        $"BDCC 77CC 5697 641D B916 AB08 C12F 102F"            /* ½ÌwÌV—d.¹.«.Á/./ */
+        $"59A0 4283 27A8 9F9E 1980 381A 4785 E896"            /* Y Bƒ'¨Ÿž.€8.G…è– */
+        $"B9C8 A383 0C1E EBDE A8DC D1A0 00FB 61C2"            /* ¹È£ƒ..ëÞ¨ÜÑ .ûa */
+        $"70F1 84C8 8368 337E DA6C 7A1A 014F 77C3"            /* pñ„ȃh3~Úlz..Owà */
+        $"EFFF 0CCC F88E E539 B4FF 3187 54EA 4B2E"            /* ïÿ.ÌøŽå9´ÿ1‡TêK. */
+        $"27BF 1121 0DCD 456F 5AB4 E115 9E30 8B1C"            /* '¿.!.ÍEoZ´á.ž0‹. */
+        $"FCFB 8634 E35F E3F0 2A65 8EC0 775F C0EE"            /* üû†4ã_ãð*eŽÀw_Àî */
+        $"37B2 6C5A AA44 2B7C 889A 5854 FBB4 DC29"            /* 7²lZªD+|ˆšXTû´Ü) */
+        $"E875 94AB D4F4 19C2 5989 594D 6B55 CB5E"            /* èu”«Ôô.ÂY‰YMkUË^ */
+        $"012C A350 BF1C 322E 6DC6 6CFB 052A B48D"            /* .,£P¿.2.mÆlû.*´� */
+        $"2FFE D908 D443 2FB2 706F 13A8 B2BF 2E97"            /* /þÙ.ÔC/²po.¨²¿.— */
+        $"D7EF 6FE2 7D0B 4D6C 89E6 24BB D547 A266"            /* ×ïoâ}.Ml‰æ$»ÕG¢f */
+        $"3B92 FF58 BE83 0D95 D587 B51D B83A B360"            /* ;’ÿX¾ƒ.•Õ‡µ.¸:³` */
+        $"DF16 A55F 5D17 5ED7 C7D7 88FD D24B 89C4"            /* ß.¥_].^×Ç׈ýÒK‰Ä */
+        $"17FF 1CE0 2FC5 E332 79FF 6532 D599 2C36"            /* .ÿ.à/Åã2yÿe2Õ™,6 */
+        $"7360 56F2 6017 1165 F8CD AC09 6435 530F"            /* s`Vò`..eøͬÆd5S. */
+        $"8E48 0152 06AE 7F31 9D5A A12E EC4A 26BD"            /* ŽH.R.®.1�Z¡.ìJ&½ */
+        $"1D28 2D81 EBF2 625A 03C8 8240 FAB0 343C"            /* .(-�ëòbZ.È‚@ú°4< */
+        $"3460 4650 A369 CBAF D533 EC55 DB4D 46F7"            /* 4`FP£i˯Õ3ìUÛMF÷ */
+        $"45C4 1B75 581D CC26 9E29 8B0F C424 5512"            /* EÄ.uX.Ì&ž)‹.Ä$U. */
+        $"9417 F11C 77C1 F3FD 57B1 487F D8F8 A086"            /* ”.ñ.wÁóýW±H.Øø † */
+        $"E60E 2356 E9E1 F3EC 7F31 52E1 E3DB C75E"            /* æ.#Véáóì.1RáãÛÇ^ */
+        $"7A4B 2D19 8F06 AB86 5A88 F23D C312 C565"            /* zK-.�.«†Zˆò=Ã.Åe */
+        $"1AF0 4B35 F0D9 D100 6634 A377 90C1 A69A"            /* .ðK5ðÙÑ.f4£w�Á¦š */
+        $"1C64 495A BEF2 5A5C 1714 0504 2639 71A2"            /* .dIZ¾òZ\....&9q¢ */
+        $"5989 FF6E F887 5ADD 9843 A719 60CC 5185"            /* Y‰ÿnø‡ZݘC§.`ÌQ… */
+        $"B308 2551 F63A 7543 2A92 3949 FCC5 5023"            /* ³.%Qö:uC*’9IüÅP# */
+        $"5A92 FE32 A26E FF00 9CFC 0CFF 4A08 60C7"            /* Z’þ2¢nÿ.œü.ÿJ.`Ç */
+        $"F76C 480A E682 3C58 66B8 7045 CDBA 616C"            /* ÷lHÂæ‚<Xf¸pEͺal */
+        $"9995 BEC1 809B 0892 A7EC 43EC 7FE8 F49F"            /* ™•¾Á€›.’§ìCì.èôŸ */
+        $"9E4B AFD6 66BB 0B88 38ED B165 9C1D F096"            /* žK¯Öf».ˆ8í±eœ.ð– */
+        $"64EC FD43 9A7A BC84 8CEF 2E65 F99B 4B43"            /* dìýCšz¼„Œï.eù›KC */
+        $"7D47 3AE8 D0DB A066 308B 201D FF3F ABC1"            /* }G:èÐÛ f0‹ .ÿ?«Á */
+        $"CD0D B822 3734 A23E AF05 D1E1 F9F5 AF09"            /* Í.¸"74¢>¯.Ñáùõ¯Æ */
+        $"6428 F517 1201 C3F1 1B80 0DD2 DCD9 CA31"            /* d(õ...Ãñ.€.ÒÜÙÊ1 */
+        $"B022 DAFB D990 A8B1 6FF1 004E 4847 E5C8"            /* °"ÚûÙ�¨±oñ.NHGåÈ */
+        $"0580 DA86 704F E2FF 7E83 5167 5C3F ADB2"            /* .€Ú†pOâÿ~ƒQg\?­² */
+        $"4C44 A9D9 DB84 C360 68ED 1BF0 068E 04BF"            /* LD©ÙÛ„Ã`hí.ð.Ž.¿ */
+        $"D16E B55F 0701 3739 42FA E15C 0EA2 BF81"            /* Ñnµ_..79Búá\.¢¿� */
+        $"31C1 F1A3 A766 CAB8 C82E C96B 4868 D491"            /* 1Áñ£§fʸÈ.ÉkHhÔ‘ */
+        $"5ACB 6EED 4027 0C73 AACA 730C ECA6 DE42"            /* ZËní@'.sªÊs.ì¦ÞB */
+        $"38DA E07E CE64 BC49 7FDD FCCB 07B3 45BF"            /* 8Úà~Îd¼I.ÝüË.³E¿ */
+        $"B9DC FF13 039F D40E 43BB ACE4 B8F8 31F5"            /* ¹Üÿ..ŸÔ.C»¬ä¸ø1õ */
+        $"6743 9390 0B87 C9B1 194A 0200 FB53 29CD"            /* gC“�.‡É±.J..ûS)Í */
+        $"3141 15F5 3C38 9F70 2B7E 0E46 B5A7 5C94"            /* 1A.õ<8Ÿp+~.Fµ§\” */
+        $"AED4 E415 1639 7B49 20DA 1541 9742 A3A6"            /* ®Ôä..9{I Ú.A—B£¦ */
+        $"B873 4C7C 9112 1322 7D7F 5F6E 14AB 57FC"            /* ¸sL|‘.."}._n.«Wü */
+        $"A01D 94EC BC05 F45B C4C4 1FC3 D61B F5D3"            /*  .”ì¼.ô[ÄÄ.ÃÖ.õÓ */
+        $"0E62 9C2F CAE6 C609 B0D2 803B AF5F CC7F"            /* .bœ/ÊæÆÆ°Ò€;¯_Ì. */
+        $"4085 5B49 F81B 0AB3 DB0C 27C1 7A95 45D6"            /* @…[Iø.³Û.'Áz•EÖ */
+        $"CDDD 4F06 1A20 A7FE 22F6 EA13 EB6E C723"            /* ÍÝO.. §þ"öê.ënÇ# */
+        $"87B9 A058 CAF9 9F59 C9C9 6AAD 8358 5147"            /* ‡¹ XÊùŸYÉÉj­ƒXQG */
+        $"2B3E 2FD8 506F A48B 305C 97C7 5D25 5C75"            /* +>/ØPo¤‹0\—Ç]%\u */
+        $"C5B1 E7B4 CBC7 C76A 2FE5 1669 302C 2318"            /* űç´ËÇÇj/å.i0,#. */
+        $"CB1D BB38 5B47 3563 F041 0F00 C23A B1E9"            /* Ë.»8[G5cðA..Â:±é */
+        $"1972 D9C9 2F2F 4013 F8EF A6CA 7E8E 705C"            /* .rÙÉ//@.øï¦Ê~Žp\ */
+        $"0CB6 1301 5ED4 25E6 F7D9 999D AB8F 4CAC"            /* .¶..^Ô%æ÷Ù™�«�L¬ */
+        $"6FF2 04C8 8307 016C 6E46 645B 5488 79C0"            /* oò.ȃ..lnFd[TˆyÀ */
+        $"C0E5 8A2A 46EB DB4C 65A0 27FC 6230 781C"            /* ÀåŠ*FëÛLe 'üb0x. */
+        $"EDB8 4666 1604 1937 9603 A2AA D8C3 43A6"            /* í¸Ff...7–.¢ªØÃC¦ */
+        $"E254 D745 866F D24A DD91 397E C575 F187"            /* âT×E†oÒJÝ‘9~Åuñ‡ */
+        $"193B F5F5 819B 7D57 EC83 0871 ED1B 64F6"            /* .;õõ�›}Wìƒ.qí.dö */
+        $"E47A E1B0 65F9 67DF 5680 3642 52AA BB4B"            /* äzá°eùgßV€6BRª»K */
+        $"BA52 D8BA 8AF7 0A96 412A 92B2 045F 9739"            /* ºRغŠ÷–A*’²._—9 */
+        $"3A52 D961 6BC6 1D2E D90D 29A7 E9DE 2651"            /* :RÙakÆ..Ù.)§éÞ&Q */
+        $"CE3F 9921 03BC 7A7A CBFD 63E2 4C7C 9025"            /* Î?™!.¼zzËýcâL|�% */
+        $"BCC3 D509 745E 9AE4 1675 0242 26EE E4F6"            /* ¼ÃÕÆt^šä.u.B&îäö */
+        $"B04B CFB3 E37F EADB 2840 E47E 0209 C8C5"            /* °Kϳã.êÛ(@ä~.ÆÈÅ */
+        $"56FC 6228 BB57 F43A BE32 0753 73FB EAE2"            /* Vüb(»Wô:¾2.Ssûêâ */
+        $"55B4 D581 42C8 10B8 AEA9 67C4 F685 982C"            /* U´Õ�BÈ.¸®©gÄö…˜, */
+        $"3104 095F DCBD 3701 8749 9CBA A7A5 B714"            /* 1.Æ_ܽ7.‡Iœº§¥·. */
+        $"FDED FAA3 F034 54D8 728F 8640 4A61 560C"            /* ýíú£ð4TØr�†@JaV. */
+        $"50D4 B224 A5F1 6715 6C8B 7EC6 BF5C 120D"            /* PÔ²$¥ñg.l‹~Æ¿\.. */
+        $"8797 B25E B0E1 C57E 69AF 1FF2 99C3 44B5"            /* ‡—²^°áÅ~i¯.ò™ÃDµ */
+        $"0508 0061 1F44 795F 27C0 511E 0796 9740"            /* ...a.Dy_'ÀQ..–—@ */
+        $"14FF 4C51 5651 34F3 658D 4CA8 3FBF 43CC"            /* .ÿLQVQ4óe�L¨?¿CÌ */
+        $"8813 D372 1723 7DB5 6D44 4524 4E91 B644"            /* ˆ.Ór.#}µmDE$N‘¶D */
+        $"4B7D CDEC E0E0 8468 622D 87FE 80E3 E097"            /* K}Íìàà„hb-‡þ€ãà— */
+        $"303D 8894 1FFF 7FA6 9AAB C6E0 0B83 3EDD"            /* 0=ˆ”.ÿ.¦š«Æà.ƒ>Ý */
+        $"86A5 43D3 C650 0008 D364 A800 0000 0000"            /* †¥CÓÆP..Ód¨..... */
+        $"0000 07D7 8F92 61B9 E6E0 BCBF CD4A AB76"            /* ...×�’a¹æ༿ÍJ«v */
+        $"5B6E 246A 8DFB D274 41F9 3583 773D 5165"            /* [n$j�ûÒtAù5ƒw=Qe */
+        $"2139 B773 476E DF91 33F0 8CDA F420 613F"            /* !9·sGnß‘3ðŒÚô a? */
+        $"9B35 33C9 8298 A661 A5DB 2CEF 1A1C BC3E"            /* ›53É‚˜¦a¥Û,ï..¼> */
+        $"09B4 5415 8511 4FE5 3FF8 B88C 339D C169"            /* Æ´T.….Oå?ø¸Œ3�Ái */
+        $"9608 FF62 B2D6 285A 80A2 22C9 E4AA 5A99"            /* –.ÿb²Ö(Z€¢"ÉäªZ™ */
+        $"B3F5 E9D4 7FFF 7FF4 7D5C 4CC0 788F 0EB6"            /* ³õéÔ.ÿ.ô}\LÀx�.¶ */
+        $"8024 0000 0A1E 1F40 0000 0000 0000 0000"            /* €$..Â..@........ */
+        $"CA54 CF6A 897B B6D7 9C90 87E9 FF6A 22A0"            /* ÊTÏj‰{¶×œ�‡éÿj"  */
+        $"0765 4AE8 B827 B7A1 C412 4000 0000 0000"            /* .eJè¸'·¡Ä.@..... */
+        $"0000 2222 DAB7 AEED C4EB AFCB FF79 6610"            /* ..""Ú·®íÄë¯Ëÿyf. */
+        $"A362 D5F2 1401 DA9F 8978 3FC3 FF60 341C"            /* £bÕò..ÚŸ‰x?Ãÿ`4. */
+        $"524C CBF3 AF64 9BA4 637F F217 CA8C A4CE"            /* RLËó¯d›¤c.ò.ÊŒ¤Î */
+        $"A881 46DE C63F CB0B 4C86 F71C CDFF 6CDC"            /* ¨�FÞÆ?Ë.L†÷.ÍÿlÜ */
+        $"3C86 AFD6 02EF 25B3 E392 0238 14ED F9FF"            /* <†¯Ö.ï%³ã’.8.íùÿ */
+        $"71EA 1A7B 7848 281D C18D 83C1 F0D1 C115"            /* qê.{xH(.Á�ƒÁðÑÁ. */
+        $"C525 7E38 9E60 32A4 CED2 A5DE 8006 1212"            /* Å%~8ž`2¤ÎÒ¥Þ€... */
+        $"7136 14A1 74D1 9C7D F74C 708E 43DE 4154"            /* q6.¡tÑœ}÷LpŽCÞAT */
+        $"2939 179A 87BB 2AAF 7401 4404 CB30 458F"            /* )9.š‡»*¯t.D.Ë0E� */
+        $"F1B7 EE42 3E46 458F B220 6F30 EE24 7D86"            /* ñ·îB>FE�² o0î$}† */
+        $"2D28 3CA7 C184 60D3 4EBC 9C79 C402 02FC"            /* -(<§Á„`ÓN¼œyÄ..ü */
+        $"553C C62D DDC0 3D0C F12B C1FF 546D A4FF"            /* U<Æ-ÝÀ=.ñ+ÁÿTm¤ÿ */
+        $"5885 6B1B 9EF6 2206 8FB5 1CB0 2D3D B922"            /* X…k.žö".�µ.°-=¹" */
+        $"644F D104 0152 70F8 BF41 4D6E 4F05 B928"            /* dOÑ..Rpø¿AMnO.¹( */
+        $"396A 4A92 9B1B 24AB 4611 6D95 87D6 2D7C"            /* 9jJ’›.$«F.m•‡Ö-| */
+        $"7546 B839 A3B1 C612 0F2A 796E 7911 5FF9"            /* uF¸9£±Æ..*yny._ù */
+        $"03C4 D13E EF00 2DEF 9CFE FDDE 3A2C FF3E"            /* .ÄÑ>ï.-ïœþýÞ:,ÿ> */
+        $"4567 F432 3673 3F84 8787 B65C 7A4F 2007"            /* Egô26s?„‡‡¶\zO . */
+        $"FF7C D894 A762 3872 8FA4 9563 D178 5039"            /* ÿ|Ø”§b8r�¤•cÑxP9 */
+        $"C4BD 2EB4 0491 2A80 0000 0000 0000 0001"            /* Ľ.´.‘*€........ */
+        $"F172 6FA1 09F2 9F35 F3BC 2E0B 8E46 2557"            /* ñro¡ÆòŸ5ó¼..ŽF%W */
+        $"67C5 4F12 D1CF F08C BC61 0F89 E4A4 9249"            /* gÅO.ÑÏðŒ¼a.‰ä¤’I */
+        $"2492 4924 9249 221B 4708 65ED 84CA FDD2"            /* $’I$’I".G.eí„ÊýÒ */
+        $"D193 7C69 0CA3 95EF DDF2 33FF 556E D976"            /* Ñ“|i.£•ïÝò3ÿUnÙv */
+        $"2E4D FDCE E0FC 8669 83FF 768E 3CBB 179B"            /* .MýÎàü†iƒÿvŽ<».› */
+        $"DBB9 253D BFFF 79F1 5006 27BF 5548 40B9"            /* Û¹%=¿ÿyñP.'¿UH@¹ */
+        $"BADC F963 10BA 8BD9 367F E03A 6E29 5908"            /* ºÜùc.º‹Ù6.à:n)Y. */
+        $"0000 0000 0000 0000 0028 8080 0000 000A"            /* .........(€€... */
+        $"6370 D000 0142 83C0 0000 0011 CD3F D940"            /* cpÐ..BƒÀ....Í?Ù@ */
+        $"0022 C990 C912 501C 14FC 1926 5412 0E88"            /* ."É�É.P..ü.&T..ˆ */
+        $"C32F B2ED E7A4 9249 2492 4924 9249 247E"            /* Ã/²í礒I$’I$’I$~ */
+        $"FB2C 999E D2ED 6DFF 783B 4C3A 3DB7 14A5"            /* û,™žÒímÿx;L:=·.¥ */
+        $"872C 2B85 8FC2 72EA 3412 FCA8 32E0 7A2E"            /* ‡,+…�Ârê4.ü¨2àz. */
+        $"B109 F66C 3F99 7C32 2761 1522 7B9C 1851"            /* ±Æöl?™|2'a."{œ.Q */
+        $"B3CB 5373 0652 CE79 D8C5 B721 03D7 CD81"            /* ³ËSs.RÎyØÅ·!.×Í� */
+        $"A03A CD5F CECF B58A 4122 7ED2 9FFF 7FFF"            /*  :Í_ÎϵŠA"~ÒŸÿ.ÿ */
+        $"1575 DF0B 430B 0A6C 6108 B421 B33F E9FA"            /* .uß.C.Âla.´!³?éú */
+        $"AC06 391C EB01 17F4 3BF4 4CDA 87DA 516F"            /* ¬.9.ë..ô;ôLÚ‡ÚQo */
+        $"EFA3 E7F9 651A 6902 C269 AF79 2EA4 D861"            /* ï£çùe.i.Âi¯y.¤Øa */
+        $"CBC1 7F37 146D 4163 38BB B16B AAD4 9AC2"            /* ËÁ.7.mAc8»±kªÔšÂ */
+        $"424A B3CE 1368 78EF B4B0 FE68 2FBA 0CB2"            /* BJ³Î.hxï´°þh/º.² */
+        $"E672 A89D 999E 64CD 417A 98A3 8458 0603"            /* ær¨�™ždÍAz˜£„X.. */
+        $"C03D 9F9E B15E 8418 0FC6 F3E0 BA39 A3C1"            /* À=Ÿž±^„..Æóàº9£Á */
+        $"9929 0547 9C29 FC76 57CA B1E5 F887 AE73"            /* ™).Gœ)üvWʱåø‡®s */
+        $"78AA BA9F FF7F C07C 00F0 28E9 7533 0FC1"            /* xªºŸÿ.À|.ð(éu3.Á */
+        $"097C 4ABC F3CB 6604 EEC2 5194 A1F2 A201"            /* Æ|J¼óËf.îÂQ”¡ò¢. */
+        $"D6B0 C5F3 4AA3 8FD8 34DC A382 0CD4 134E"            /* Ö°ÅóJ£�Ø4Ü£‚.Ô.N */
+        $"8275 37F5 2388 74C6 1A6C F889 1037 A348"            /* ‚u7õ#ˆtÆ.lø‰.7£H */
+        $"ACB4 EFF5 B446 564C C6DC 75F7 8445 013F"            /* ¬´ïõ´FVLÆÜu÷„E.? */
+        $"79FF 407B 05EE 9C66 8A53 FF7A 367A 6D06"            /* yÿ@{.îœfŠSÿz6zm. */
+        $"9ADF CBDD 25B5 0629 78A0 A071 35BA EE49"            /* šßËÝ%µ.)x  q5ºîI */
+        $"64E9 3EA3 9A07 917A 66E3 090C B916 3BF5"            /* dé>£š.‘zfãÆ.¹.;õ */
+        $"10D7 77D5 7281 248E 3F09 0C0F 319E 7F71"            /* .×wÕr�$Ž?Æ..1ž.q */
+        $"98DA A34A C823 06A4 6BFD 8EA1 8C71 EB25"            /* ˜Ú£JÈ#.¤kýŽ¡Œqë% */
+        $"E5FC 0BA1 DB35 9514 A229 56F0 7E42 9FD0"            /* åü.¡Û5•.¢)Vð~BŸÐ */
+        $"5435 3CB7 AED9 0A4F 625B A493 D1B2 C654"            /* T5<·®ÙÂOb[¤“ѲÆT */
+        $"F691 87F9 F8E9 7459 1823 E06B 57D6 C638"            /* ö‘‡ùøétY.#àkWÖÆ8 */
+        $"7EE2 8CA0 1D79 4000 0000 0000 0000 0000"            /* ~⌠.y@......... */
+        $"0000 0000 442A 0D8C 8522 4E1A 3752 5040"            /* ....D*.Œ…"N.7RP@ */
+        $"E53D EE69 0B70 A6BF 9D0D D725 D66E 8D50"            /* å=îi.p¦¿�.×%Ön�P */
+        $"10DB 966B 649B 0CA3 958B 6457 90CC 214A"            /* .Û–kd›.£•‹dW�Ì!J */
+        $"C4C0 27A2 95F4 98AD 14C2 1892 EBE7 864B"            /* ÄÀ'¢•ô˜­.Â.’ëç†K */
+        $"18AA 55C7 50D2 4A15 7F4E 566A 9C13 9C52"            /* .ªUÇPÒJ..NVjœ.œR */
+        $"AC77 FE86 B3A2 5D92 D112 516C BA99 60EE"            /* ¬wþ†³¢]’Ñ.Qlº™`î */
+        $"221A F194 D9DF FF5F FF6B 77F9 4B01 4F8F"            /* ".ñ”Ùßÿ_ÿkwùK.O� */
+        $"F681 8614 2F3E 31E3 EABB 7C34 6025 A491"            /* ö�†./>1ãê»|4`%¤‘ */
+        $"9BC1 A348 628D 34AE 751A F8F7 7521 7F48"            /* ›Á£Hb�4®u.ø÷u!.H */
+        $"68A4 6B9C F66F 252D 6021 9C97 39AB B637"            /* h¤kœöo%-`!œ—9«¶7 */
+        $"3B5D E8FB 56EE 824A F65D C84D E23C 7BF2"            /* ;]èûVî‚Jö]ÈMâ<{ò */
+        $"5400 0000 0000 0000 0000 0000 0014 080D"            /* T............... */
+        $"B05B 4688 1F60 376D 2209 1DE1 7E75 CD30"            /* °[Fˆ.`7m"Æ.á~uÍ0 */
+        $"5D2F 627B A077 8D86 2001 62AF 1031 6853"            /* ]/b{ w�† .b¯.1hS */
+        $"2A8E 0308 16F6 C4EC E5B6 814A 1DF2 23EB"            /* *Ž...öÄìå¶�J.ò#ë */
+        $"8C16 64F9 A1ED 8A1F 346E 2E1C 5ACB 4376"            /* Œ.dù¡íŠ.4n..ZËCv */
+        $"5014 B885 5212 5294 8F4F DF56 7339 8A5D"            /* P.¸…R.R”�OßVs9Š] */
+        $"03C0 A05F D60B 5D58 2677 CD67 A4EE 3803"            /* .À _Ö.]X&wÍg¤î8. */
+        $"B2B1 9AD5 A41A C3EF 3281 3FFF 780A A5BD"            /* ²±šÕ¤.Ãï2�?ÿxÂ¥½ */
+        $"861B 62F7 456F 1021 93CD A115 BD61 7E4C"            /* †.b÷Eo.!“Í¡.½a~L */
+        $"2306 D6BF D5D9 18AF 12BB 22D9 E32E 6976"            /* #.Ö¿ÕÙ.¯.»"Ùã.iv */
+        $"9282 5E47 A842 7983 2C87 64C5 6215 A0D9"            /* ’‚^G¨Byƒ,‡dÅb. Ù */
+        $"E45A EFAE 74F3 E5E5 7679 A7C0 D366 649C"            /* äZï®tóååvy§ÀÓfdœ */
+        $"9EF3 D763 2D6C D0AD 48E5 7A2A 9454 8B34"            /* žó×c-lЭHåz*”T‹4 */
+        $"B7FF 7FCD F604 90E4 2716 1C40 DD8A 8B1A"            /* ·ÿ.Íö.�ä'..@ÝŠ‹. */
+        $"24C8 2F0C 06AC 999A 58B7 C15E E6B1 431B"            /* $È/..¬™šX·Á^æ±C. */
+        $"73D1 FEC5 5182 4A2D 33CB E920 AFBE 9F5A"            /* sÑþÅQ‚J-3Ëé ¯¾ŸZ */
+        $"0478 C2F3 80D7 241A 2E07 8BF3 FD3F 471A"            /* .xÂó€×$...‹óý?G. */
+        $"7C53 1C79 2F17 C32F D5C6 B977 E2F9 9D80"            /* |S.y/.Ã/Õƹwâù�€ */
+        $"558B 7336 75BC 5945 3986 BD1C CE95 EA07"            /* U‹s6u¼YE9†½.Εê. */
+        $"7152 C778 65AD 73E9 F1B7 24D4 BDB0 7F24"            /* qRÇxe­séñ·$Ô½°.$ */
+        $"BACD 3C51 D344 33D7 21C7 BE9A 915D 2808"            /* ºÍ<QÓD3×!Ǿš‘](. */
+        $"3E68 3F1B 43AE 8F30 CE7F FF67 1C78 8498"            /* >h?.C®�0Î.ÿg.x„˜ */
+        $"08D8 E1D9 3F1A E50B EB7C E564 6F4C 57F3"            /* .ØáÙ?.å.ë|ådoLWó */
+        $"9E60 5F9B 244E 83A9 33C9 668A 3951 7E33"            /* ž`_›$Nƒ©3ÉfŠ9Q~3 */
+        $"31D7 01E7 0342 6BC0 7FD1 7488 2BE1 9AD1"            /* 1×.ç.BkÀ.Ñtˆ+ášÑ */
+        $"1938 BBD8 7710 BAD3 BB92 2C80 A162 B2EF"            /* .8»Øw.ºÓ»’,€¡b²ï */
+        $"3FEA 6FC2 47D2 0D0E 28AB 03DA 4B34 4027"            /* ?êoÂGÒ..(«.ÚK4@' */
+        $"7FFD 87BC 9D96 E076 3C00 0000 0000 0000"            /* .ý‡¼�–àv<....... */
+        $"0000 0000 0000 136C 1721 95F0 1991 3F80"            /* .......l.!•ð.‘?€ */
+        $"65DC 1F3F AEA0 BE5C 71D2 94CE C7FF 7FFF"            /* eÜ.?® ¾\qÒ”ÎÇÿ.ÿ */
+        $"7917 BEAD D458 935A 563C CC9C 6C0D CFFF"            /* y.¾­ÔX“ZV<Ìœl.Ïÿ */
+        $"55DA 93C2 F199 3D1E C4C2 3C5F A7BC D48E"            /* UÚ“Âñ™=.ÄÂ<_§¼ÔŽ */
+        $"4980 037B 9FCC F7BC 6E1E 78CD 2838 DC58"            /* I€.{ŸÌ÷¼n.xÍ(8ÜX */
+        $"F156 C827 88EA BFF7 BD95 BBD6 FE11 C305"            /* ñVÈ'ˆê¿÷½•»Öþ.Ã. */
+        $"A1D2 FA2A EA0B E56B 285B 91FE 551E F5E2"            /* ¡Òú*ê.åk([‘þU.õâ */
+        $"687C 5A51 1A67 64D3 BD76 4937 F455 4C94"            /* h|ZQ.gdÓ½vI7ôUL” */
+        $"6A7E B888 CB40 7AA3 DDEE 8BD8 2D9F 1EB6"            /* j~¸ˆË@z£Ýî‹Ø-Ÿ.¶ */
+        $"48DF 9C66 6BF3 A26A 3CC4 2D4D E47A 6D9A"            /* Hßœfkó¢j<Ä-Mäzmš */
+        $"DAB1 1DA4 083A D994 4416 C0D2 2E63 539E"            /* Ú±.¤.:Ù”D.ÀÒ.cSž */
+        $"7274 3C04 85F4 D7B5 EDEF 507A B2B7 1832"            /* rt<.…ô×µíïPz²·.2 */
+        $"6615 A186 4A80 0000 0000 0000 0000 0000"            /* f.¡†J€.......... */
+        $"07CF BF6C 3626 7453 BF7D 8B57 26C9 F556"            /* .Ï¿l6&tS¿}‹W&ÉõV */
+        $"1F12 0BB9 5DC4 797D 3C69 7DB2 2FFF 7F33"            /* ...¹]Äy}<i}²/ÿ.3 */
+        $"81FC E4ED 4BF8 9180 3FD2 0142 3F2D 1DF0"            /* �üäíKø‘€?Ò.B?-.ð */
+        $"097B D61C 019A C409 B506 26FC D55D 7AE9"            /* Æ{Ö..šÄƵ.&üÕ]zé */
+        $"3464 6C57 13E7 565F 2553 70C3 3EC7 87AC"            /* 4dlW.çV_%SpÃ>LJ¬ */
+        $"3161 5289 3A6A FC0B E254 CAFA 6A32 2F8C"            /* 1aR‰:jü.âTÊúj2/Œ */
+        $"8B76 FA87 DADD 0333 2250 0058 F5C6 21CD"            /* ‹vú‡ÚÝ.3"P.XõÆ!Í */
+        $"D094 5CD5 10DD 2FA0 B74B 06FB AA9B 2B62"            /* Д\Õ.Ý/ ·K.ûª›+b */
+        $"E36D 708E B8F5 0739 3097 7F03 47BE 48F5"            /* ãmpŽ¸õ.90—..G¾Hõ */
+        $"D079 1641 CA5D DF28 C92B 0EFA B18F CE6F"            /* Ðy.AÊ]ß(É+.ú±�Îo */
+        $"6648 DB26 DE5C 1D17 2BD3 28AF DD89 801C"            /* fHÛ&Þ\..+Ó(¯Ý‰€. */
+        $"AB0D 40D1 9016 D542 63A0 8222 9D7A F0F5"            /* «.@Ñ�.ÕBc ‚"�zðõ */
+        $"A171 2D28 3D2C C22E 09AB 3AA9 C50B 7545"            /* ¡q-(=,Â.Æ«:©Å.uE */
+        $"4C64 18E8 8E67 3A7D DDBE 36CE 2F97 5AD0"            /* Ld.èŽg:}ݾ6Î/—ZÐ */
+        $"E4F0 8AFB 6071 6268 E5F6 09EA 245F 9F87"            /* äðŠû`qbhåöÆê$_Ÿ‡ */
+        $"E304 242C 234C 9FF7 1D0A 11C7 4FE7 20BC"            /* ã.$,#LŸ÷.Â.ÇOç ¼ */
+        $"EC58 1A4B 5A8E DE45 0E5F 4A03 4C8A 5051"            /* ìX.KZŽÞE._J.LŠPQ */
+        $"E410 4405 321B BD82 AC69 94F7 AA5E 5C65"            /* ä.D.2.½‚¬i”÷ª^\e */
+        $"436F 861A C95F 1AB0 2E2B 9689 AA43 B247"            /* Co†.É_.°.+–‰ªC²G */
+        $"6DE3 4E9E F205 F221 D175 86BB 4434 C0EE"            /* mãNžò.ò!Ñu†»D4Àî */
+        $"C472 EA2B 499D 63FA B4C8 FAB3 91F3 060D"            /* Ärê+I�cú´Èú³‘ó.. */
+        $"C203 A636 1D98 6B00 D678 0D3C BE92 309E"            /* Â.¦6.˜k.Öx.<¾’0ž */
+        $"759A 11D4 B514 24FB E4D2 7089 76DE 42DD"            /* uš.Ôµ.$ûäÒp‰vÞBÝ */
+        $"5338 4798 5943 4A6B 500A 472E 77BE AEBD"            /* S8G˜YCJkPÂG.w¾®½ */
+        $"93B0 117A 0E2D A8E4 DFED 5A76 1775 2BFF"            /* “°.z.-¨äßíZv.u+ÿ */
+        $"1A84 CBE1 B007 D3EA 11B0 9BB8 4B3F BB56"            /* .„Ëá°.Óê.°›¸K?»V */
+        $"33F6 B242 4C5C A63D 638F 1BA5 0AC5 698D"            /* 3ö²BL\¦=c�.¥ÂÅi� */
+        $"45B3 D343 D769 FEEE C45D 50B0 9AAA 4146"            /* E³ÓC×iþîÄ]P°šªAF */
+        $"0BFA F8CC 694B A42D FC1E C3F1 54F0 D3F9"            /* .úøÌiK¤-ü.ÃñTðÓù */
+        $"F051 5182 D373 5210 38AA F9B0 D3F3 6B07"            /* ðQQ‚ÓsR.8ªù°Óók. */
+        $"C944 7FCA 2126 D17A 01B1 7763 CDE8 D5FF"            /* ÉD.Ê!&Ñz.±wcÍèÕÿ */
+        $"00F4 08D7 4060 339C D8E2 7EA4 B00D 3171"            /* .ô.×@`3œØâ~¤°.1q */
+        $"ABB0 7F47 D146 13B9 398E 14B3 C55D 10AF"            /* «°.GÑF.¹9Ž.³Å].¯ */
+        $"8D0A 2444 26A0 EFEA 6CB2 51FD EA28 0FD7"            /* �Â$D& ïêl²Qýê(.× */
+        $"4E2F F54F 0066 62F2 66F3 334C 5D9D 77ED"            /* N/õO.fbòfó3L]�wí */
+        $"F3D0 12ED 7A95 89A1 B928 8429 DCFB 8C68"            /* óÐ.íz•‰¡¹(„)ÜûŒh */
+        $"C35C 3C77 5D7D 5180 A012 ADA3 AE60 AAE0"            /* Ã\<w]}Q€ .­£®`ªà */
+        $"0D88 09A4 4F7B FAC4 A2FD 327D E109 4F0B"            /* .ˆÆ¤O{úÄ¢ý2}áÆO. */
+        $"3343 C0ED D985 7402 93E2 7A2E 09B4 09A6"            /* 3CÀíÙ…t.“âz.ƴƦ */
+        $"5348 2E51 C037 BE62 C1A7 15C4 B9C8 7F4B"            /* SH.QÀ7¾bÁ§.ĹÈ.K */
+        $"FC22 3596 D989 C701 6701 5488 1001 22B2"            /* ü"5–Ù‰Ç.g.Tˆ.."² */
+        $"C06A A5D5 2C94 6BA9 D1C6 2B33 5910 8B1F"            /* Àj¥Õ,”k©ÑÆ+3Y.‹. */
+        $"0B0D 5531 BE0F 3E72 9C60 75A8 2669 220D"            /* ..U1¾.>rœ`u¨&i". */
+        $"E140 D538 7CD4 5763 D708 6D5E 45C0 AE61"            /* á@Õ8|ÔWc×.m^EÀ®a */
+        $"EC8B E180 1D9C 712C 4DB9 F177 6733 0F76"            /* ì‹á€.œq,M¹ñwg3.v */
+        $"9A72 7AD0 D18D 2BE6 9DCE 6294 4092 CE8E"            /* šrzÐÑ�+æ�Îb”@’ÎŽ */
+        $"ACED 8B00 B050 AE53 C09C 98D6 CFD1 4208"            /* ¬í‹.°P®SÀœ˜ÖÏÑB. */
+        $"DEB2 AF01 5ED7 E1F4 4EAA 0B09 2263 FE09"            /* Þ²¯.^×áôNª.Æ"cþÆ */
+        $"2771 6EB7 9181 1DFE A5DD 9A12 4592 02FD"            /* 'qn·‘�.þ¥Ýš.E’.ý */
+        $"5F2D D4D6 5C15 B454 B07C 9B6A B9F9 AEC2"            /* _-ÔÖ\.´T°|›j¹ù®Â */
+        $"D883 1F5F B9B1 8258 6732 C7E3 5C90 DB16"            /* ؃._¹±‚Xg2Çã\�Û. */
+        $"42EC D875 2B9D FEAF 1FED BD80 261D BAAE"            /* BìØu+�þ¯.í½€&.º® */
+        $"3799 FDC7 DBE5 E769 A11C 3304 5D3B 419C"            /* 7™ýÇÛåçi¡.3.];Aœ */
+        $"5844 E615 EE7A 5DCE 272E D055 121D 1F84"            /* XDæ.îz]Î'.ÐU...„ */
+        $"2EC6 E6B1 A7DA D03A D600 6D58 4FF0 9196"            /* .Æ汧ÚÐ:Ö.mXOð‘– */
+        $"FBCA CDDC 1B8D 9D1A BB7B 3782 0F3F 626C"            /* ûÊÍÜ.��.»{7‚.?bl */
+        $"26AA AF34 6A20 8210 1E96 ED21 5A26 EF04"            /* &ª¯4j ‚..–í!Z&ï. */
+        $"5F66 5C2D A8A4 F3BC 1871 AD1D FE4D 8C8B"            /* _f\-¨¤ó¼.q­.þMŒ‹ */
+        $"F1E5 A382 654B 08C7 EFC4 BFBA C29B 5C73"            /* ñ壂eK.ÇïÄ¿ºÂ›\s */
+        $"2420 9390 3B75 6DE6 0208 6F4F BB53 B2AA"            /* $ “�;umæ..oO»S²ª */
+        $"AD28 4360 1A8A 4301 088C 6F17 68CC 9180"            /* ­(C`.ŠC..Œo.hÌ‘€ */
+        $"D757 7012 3BE3 C4AB DF05 97B9 4B57 B6FC"            /* ×Wp.;ãÄ«ß.—¹KW¶ü */
+        $"7693 36DE 89E8 E2AB 4352 A782 4520 DA28"            /* v“6Þ‰èâ«CR§‚E Ú( */
+        $"F1F2 34D6 2EAE E401 ED61 1E2E 4E74 D4EB"            /* ñò4Ö.®ä.ía..NtÔë */
+        $"98A9 94AD F856 8EE1 E3D0 06FC AA37 31E5"            /* ˜©”­øVŽáãÐ.üª71å */
+        $"1047 113E C151 CE86 B6A4 0F82 E5D9 CE50"            /* .G.>ÁQΆ¶¤.‚åÙÎP */
+        $"57A8 8F86 AFAD 21D1 2C4C F181 8BD7 106C"            /* W¨�†¯­!Ñ,Lñ�‹×.l */
+        $"3C77 649E 038E 3C63 66F4 EE1A 2906 755C"            /* <wdž.Ž<cfôî.).u\ */
+        $"EDD8 6093 6868 531C 9FA3 C5C9 3F3C 7786"            /* íØ`“hhS.Ÿ£ÅÉ?<w† */
+        $"BCC4 440C 13F9 0BCB 76BA 9364 A3CC 344F"            /* ¼ÄD..ù.Ëvº“d£Ì4O */
+        $"128B D594 CB9D A2DC 6C03 CA48 2D9E 9706"            /* .‹Õ”Ë�¢Ül.ÊH-ž—. */
+        $"A281 5170 A91B 0033 4552 2A9A BF6F D4A9"            /* ¢�Qp©..3ER*š¿oÔ© */
+        $"61B6 F6C1 7959 FDD2 8F3F C94B 2B90 29BB"            /* a¶öÁyYýÒ�?ÉK+�)» */
+        $"9FAA A83B FEFF 80A3 1EC2 B2D9 77CF 963B"            /* Ÿª¨;þÿ€£.²ÙwÏ–; */
+        $"85FF 5728 5CDD 2F01 7556 8155 F8AA 7984"            /* …ÿW(\Ý/.uV�Uøªy„ */
+        $"7543 0C18 A1FC 0353 DF5F D368 41E9 E0EF"            /* uC..¡ü.Sß_ÓhAéàï */
+        $"C363 A78F 3FE9 41E9 5F77 19A4 A811 FF43"            /* Ãc§�?éAé_w.¤¨.ÿC */
+        $"8EE8 3FBA 00FA 54F6 15F5 CF3B 39A6 0984"            /* Žè?º.úTö.õÏ;9¦Æ„ */
+        $"CC99 7AE1 8E5B 71A9 1575 DB95 F166 D52F"            /* Ì™záŽ[q©.uÛ•ñfÕ/ */
+        $"A270 08D4 9515 3B89 2EA1 A097 12A3 B4E9"            /* ¢p.Ô•.;‰.¡ —.£´é */
+        $"5BFB AE47 8FD7 60F0 33DA E91B 234B 5D2F"            /* [û®G�×`ð3Úé.#K]/ */
+        $"7C4B 00C2 60F1 7260 B78A 1835 B440 611B"            /* |K.Â`ñr`·Š.5´@a. */
+        $"042D F768 F9C9 8785 50AD 8421 77D4 B97A"            /* .-÷hùɇ…P­„!wÔ¹z */
+        $"6B02 828C E758 8B31 1E92 DF7F BE67 3DAB"            /* k.‚ŒçX‹1.’ß.¾g=« */
+        $"E5F8 F1FB FD8C 34F4 4B2F 98BF 24A9 4DF2"            /* åøñûýŒ4ôK/˜¿$©Mò */
+        $"32A9 A661 B01E F960 12E1 9C18 F197 CEA7"            /* 2©¦a°.ù`.áœ.ñ—Χ */
+        $"E1C4 4AB4 7CEB 2CE2 33F3 C23C F3FD 2CF9"            /* áÄJ´|ë,â3óÂ<óý,ù */
+        $"F132 8395 3D39 FD9D 983D 4454 9758 856B"            /* ñ2ƒ•=9ý�˜=DT—X…k */
+        $"6556 B234 72B0 C2CA 71CA 9CEB 7AE4 FD7C"            /* eV²4r°ÂÊqÊœëzäý| */
+        $"0E3F 1930 6B17 7074 C216 3D9C 24BF 5B97"            /* .?.0k.ptÂ.=œ$¿[— */
+        $"A7EA 25F0 9DCC AFA5 BBEF 47E9 D7E6 7B0E"            /* §ê%ð�̯¥»ïGé×æ{. */
+        $"E02F 87A2 EF87 68FC 9BF7 F274 5F00 FC3D"            /* à/‡¢ï‡hü›÷òt_.ü= */
+        $"A5F8 7AC7 F0FA A5F8 7D42 C03F 0F42 FE1D"            /* ¥øzÇðú¥ø}BÀ?.Bþ. */
+        $"ABF0 F7CF E1EE 40ED 1CBC E67A C7C3 33E9"            /* «ð÷Ïáî@í.¼æzÇÃ3é */
+        $"75CE 6202 697A FF68 B299 C0A6 2F39 4F64"            /* uÎb.izÿh²™À¦/9Od */
+        $"6775 1459 6387 68C9 941E E328 B150 8D7C"            /* gu.Yc‡hÉ”.ã(±P�| */
+        $"24C4 D953 4443 9A50 E4CC 4E41 B3A9 F28A"            /* $ÄÙSDCšPäÌNA³©òŠ */
+        $"BB0E 943C 0DAB C98A 023C 332B AE2D AF60"            /* ».”<.«ÉŠ.<3+®-¯` */
+        $"4D30 BA77 9D1A 93DC CEBB 7560 EA33 084C"            /* M0ºw�.“Üλu`ê3.L */
+        $"BCFD 2F47 685E 4CC9 8A76 F1C8 04AB 126F"            /* ¼ý/Gh^LÉŠvñÈ.«.o */
+        $"B9FD 4A34 E181 4147 9F56 2AB4 EB2C 50EF"            /* ¹ýJ4á�AGŸV*´ë,Pï */
+        $"D652 4543 763B B857 210B 2B4A BB50 0EAE"            /* ÖRECv;¸W!.+J»P.® */
+        $"90BD EEEC F92B DD18 0881 9B3A C6DF A028"            /* �½îìù+Ý..�›:Æß ( */
+        $"45EB 36D7 50B4 D756 FB49 9F08 D74D 037B"            /* Eë6×P´×VûIŸ.×M.{ */
+        $"83A1 001C 0977 1DCC 81D0 B6B9 828A 6851"            /* ƒ¡..Æw.Ì�ж¹‚ŠhQ */
+        $"3CAC B3FF 572B 543A 4C73 3F35 0561 EC81"            /* <¬³ÿW+T:Ls?5.aì� */
+        $"A8D4 82BC 9148 5E30 FF3E 3164 C43E 5461"            /* ¨Ô‚¼‘H^0ÿ>1dÄ>Ta */
+        $"4BD0 139E 6390 0E05 4793 56B8 5080 CBF6"            /* KÐ.žc�..G“V¸P€Ëö */
+        $"9E70 BEA1 FB26 DD1E AEE1 E78D 0D32 FA02"            /* žp¾¡û&Ý.®áç�.2ú. */
+        $"43FC FBC6 7464 2C9A 14AD 2C7C 0969 995F"            /* CüûÆtd,š.­,|Æi™_ */
+        $"6363 3037 9C34 C5F8 42DF B339 D2B0 5C45"            /* cc07œ4ÅøBß³9Ò°\E */
+        $"6130 509D 28E7 D3A7 9308 74ED 9265 B7F9"            /* a0P�(çÓ§“.tí’e·ù */
+        $"0F54 D265 33D9 EB57 07C4 852B E3C8 771F"            /* .TÒe3ÙëW.Ä…+ãÈw. */
+        $"21F8 ADA3 D807 625C 513A E395 604B 0D6A"            /* !ø­£Ø.b\Q:ã•`K.j */
+        $"A9FC 297E 63AF 7622 23B6 63E1 EF25 F572"            /* ©ü)~c¯v"#¶cáï%õr */
+        $"01B0 400D 18C6 C9FA 6AF5 3E26 4199 6E68"            /* .°@..ÆÉújõ>&A™nh */
+        $"99B5 B3A9 F861 3419 C6C7 B65C D0F6 353B"            /* ™µ³©øa4.ÆǶ\Ðö5; */
+        $"6551 1B0A 9D82 1F07 4185 8C46 5867 DC22"            /* eQ.Â�‚..A…ŒFXgÜ" */
+        $"BD38 AFF7 27BA 1114 9266 5EF4 1EA9 89B4"            /* ½8¯÷'º..’f^ô.©‰´ */
+        $"A634 E917 65E5 502E 8028 D24E 725F 0C22"            /* ¦4é.eåP.€(ÒNr_." */
+        $"1513 7B38 5FEA 3150 520B 6D8A 03D8 F796"            /* ..{8_ê1PR.mŠ.Ø÷– */
+        $"D183 D8FA 82E2 C147 B662 593B 9FC8 A2A0"            /* уØú‚âÁG¶bY;ŸÈ¢  */
+        $"C63B D151 D905 072C 02E5 919B 0BE9 6D76"            /* Æ;ÑQÙ..,.å‘›.émv */
+        $"4BEF 7D51 FF67 C2F2 BB61 DDD2 7981 0B7E"            /* Kï}QÿgÂò»aÝÒy�.~ */
+        $"D406 3679 DFA4 FAE3 A33C 28AC 06C6 93C1"            /* Ô.6yߤúã£<(¬.Æ“Á */
+        $"B82F 53DB 1EB8 A6F3 5A24 A44A 1A76 9204"            /* ¸/SÛ.¸¦óZ$¤J.v’. */
+        $"6543 FC80 18DA 3C5D 395B 01DC D7E8 C21E"            /* eCü€.Ú<]9[.Ü×èÂ. */
+        $"A66C 9AE3 08D6 DBFC EE95 9E73 F71D 7CCA"            /* ¦lšã.ÖÛüî•žs÷.|Ê */
+        $"2A6A F6D2 11D9 AC28 BEDE 8E1B 65EF A995"            /* *jöÒ.Ù¬(¾ÞŽ.eï©• */
+        $"F7B5 B19D 5F63 F42B D0AD D69A BD47 1EED"            /* ÷µ±�_cô+Э֚½G.í */
+        $"2E5C 0276 3AEA F6D9 6E3F 314C 7F5F 52C3"            /* .\.v:êöÙn?1L._RÃ */
+        $"093D C8A9 23E4 C154 5587 294A 98A9 0643"            /* Æ=È©#äÁTU‡)J˜©.C */
+        $"AF18 0D20 51A4 6FE1 F326 11E7 5A91 2919"            /* ¯.. Q¤oáó&.çZ‘). */
+        $"DD53 B13B 2CB3 DE77 FAB9 420E BAFB 305B"            /* ÝS±;,³Þwú¹B.ºû0[ */
+        $"E9AB 7A2B 623B 78FE 346D 8BB6 BA40 AE40"            /* é«z+b;xþ4m‹¶º@®@ */
+        $"5B6D 6D53 81A1 076D 7058 E792 E410 3FA7"            /* [mmS�¡.mpXç’ä.?§ */
+        $"AD06 7E2E 5158 D129 9233 6E1D 6B7C C701"            /* ­.~.QXÑ)’3n.k|Ç. */
+        $"D61D 42D8 472F D5E2 2710 0B6C 828A 2352"            /* Ö.BØG/Õâ'..l‚Š#R */
+        $"D400 65FA E227 A938 1832 18CC 2BCE 19A8"            /* Ô.eúâ'©8.2.Ì+Î.¨ */
+        $"773C 3CB1 C6BD D722 8EE1 8AE2 4D4B 97D4"            /* w<<±Æ½×"ŽáŠâMK—Ô */
+        $"1763 37E4 2F93 8578 534E 0BA9 B493 3B80"            /* .c7ä/“…xSN.©´“;€ */
+        $"F018 28BE 2A52 15B2 8499 08A8 005F F028"            /* ð.(¾*R.²„™.¨._ð( */
+        $"ADFD ACEB 238F 922A 75E4 1C65 F2C3 F14B"            /* ­ý¬ë#�’*uä.eòÃñK */
+        $"213D 7263 4A9A 1C80 12BD 5895 0EC8 B955"            /* !=rcJš.€.½X•.ȹU */
+        $"8CD0 FB81 63CF FF7F B545 85DF E201 36A9"            /* ŒÐû�cÏÿ.µE…ßâ.6© */
+        $"E524 1BD6 EDDA 7C33 8CD2 E114 BA93 51E0"            /* å$.ÖíÚ|3ŒÒá.º“Qà */
+        $"A113 A12A FBEA 8570 B5FE E1B6 7963 5B31"            /* ¡.¡*ûê…pµþá¶yc[1 */
+        $"512A 99B1 3A59 E50E C584 DD7F FF7F FF7E"            /* Q*™±:Yå.Å„Ý.ÿ.ÿ~ */
+        $"D3C9 019B 1FBC DB70 2C2A 14A6 E7F1 0147"            /* ÓÉ.›.¼Ûp,*.¦çñ.G */
+        $"5F3A A36C 6F8A 9038 ABD8 EB8F FF7F FE79"            /* _:£loŠ�8«Øë�ÿ.þy */
+        $"6C12 2D6F FD6D F9A0 0392 0E82 0296 3C14"            /* l.-oýmù .’.‚.–<. */
+        $"FEFA 803C A3D4 1049 CF30 E22F 6542 7ABF"            /* þú€<£Ô.IÏ0â/eBz¿ */
+        $"378E 66B2 9091 D396 B953 DCF5 66D3 C5B5"            /* 7Žf²�‘Ó–¹SÜõfÓŵ */
+        $"7719 028C 5C0F F898 00A1 0C1D E181 F9C7"            /* w..Œ\.ø˜.¡..á�ùÇ */
+        $"2E46 06D4 D623 1256 EFAE 89E3 4FFF 7FDD"            /* .F.ÔÖ#.VﮉãOÿ.Ý */
+        $"F00D 4E11 65D5 B8F9 7C0B A045 AC4A 1E42"            /* ð.N.eÕ¸ù|. E¬J.B */
+        $"221C B512 5480 EF2D CB80 A089 3603 2CA1"            /* ".µ.T€ï-Ë€ ‰6.,¡ */
+        $"391C 7925 C817 92E3 8438 C438 08D1 0637"            /* 9.y%È.’ã„8Ä8.Ñ.7 */
+        $"9FCD F4C2 C04C 40BB A484 5043 0C1E 7C85"            /* ŸÍôÂÀL@»¤„PC..|… */
+        $"D7F6 1F6D BFC7 60AA 4D18 A399 9A13 CCD0"            /* ×ö.m¿Ç`ªM.£™š.ÌÐ */
+        $"26DA 3F97 24CB E902 0668 67F7 FE63 7A2E"            /* &Ú?—$Ëé..hg÷þcz. */
+        $"16D6 987F FF7F AFC1 5C35 E63D BA36 6227"            /* .Ö˜.ÿ.¯Á\5æ=º6b' */
+        $"FF7C FD39 8B8B 1A5F 6026 831B 0764 8805"            /* ÿ|ý9‹‹._`&ƒ..dˆ. */
+        $"E40B 0F19 7FFF 7FFC DEBC DD5B 9008 0000"            /* ä....ÿ.üÞ¼Ý[�... */
+        $"0C24 1D44 4641 3BC8 4248 E229 62D2 088D"            /* .$.DFA;ÈBHâ)bÒ.� */
+        $"117F DE8D 0B52 C3FD 1DD9 3823 F138 4C98"            /* ..Þ�.RÃý.Ù8#ñ8L˜ */
+        $"58A8 2683 519C F914 4961 5226 891F F863"            /* X¨&ƒQœù.IaR&‰.øc */
+        $"3FF2 B19F 113D BFEF 9D12 30C6 66BD E2A6"            /* ?ò±Ÿ.=¿ï�.0Æf½â¦ */
+        $"5D8C BE7E BE19 3D8F 03F2 5D26 FF7F FF7E"            /* ]Œ¾~¾.=�.ò]&ÿ.ÿ~ */
+        $"A82B 5E03 E7A8 E8F1 8C4D B6F1 F0E2 FC36"            /* ¨+^.ç¨èñŒM¶ñðâü6 */
+        $"DE7A 2F55 38B1 B436 2E50 7D25 E3F0 82C8"            /* Þz/U8±´6.P}%ãð‚È */
+        $"580F 0D19 C280 415C 2A7F FCD9 C720 E649"            /* X...€A\*.üÙÇ æI */
+        $"4064 2624 04AC 0B71 41FD 3937 8359 4137"            /* @d&$.¬.qAý97ƒYA7 */
+        $"8CA9 B642 C318 BD37 82D3 B786 8217 3252"            /* Œ©¶BÃ.½7‚Ó·†‚.2R */
+        $"44EA 4598 57D2 2F66 957F 39FE D712 F449"            /* DêE˜WÒ/f•.9þ×.ôI */
+        $"213A BEBB B6CC F551 FF7F EB0A AE45 8497"            /* !:¾»¶ÌõQÿ.ë®E„— */
+        $"0F4C FD34 4090 01FE CFC8 51AA C32A 7D95"            /* .Lý4@�.þÏÈQªÃ*}• */
+        $"D414 2609 E22F 1B7D E10E 97BB 05D1 9D04"            /* Ô.&Æâ/.}á.—».Ñ�. */
+        $"0592 9271 0D39 AB59 F165 0D09 549C B4E3"            /* .’’q.9«Yñe.ÆTœ´ã */
+        $"AEE5 555F 00A3 5E0A E4D3 BAFE 1EC6 2FCE"            /* ®åU_.£^ÂäÓºþ.Æ/Î */
+        $"FB04 C9BC 71D8 A42D 2F70 9FE1 EC17 C31D"            /* û.ɼqؤ-/pŸáì.Ã. */
+        $"ECB2 0A82 EFB1 914C F6D2 E54C 5316 B6C4"            /* ì²Â‚ﱑLöÒåLS.¶Ä */
+        $"4FFF 653B FD6E 27A6 9959 244B F458 B35C"            /* Oÿe;ýn'¦™Y$KôX³\ */
+        $"865C EB94 2CD7 7343 B74C C211 8A4D 2A99"            /* †\ë”,×sC·LÂ.ŠM*™ */
+        $"732E 3B43 CEAC C300 A520 924D 6F1F 8295"            /* s.;CάÃ.¥ ’Mo.‚• */
+        $"DF36 1FD4 E8F0 9221 6313 1B33 0C98 2721"            /* ß6.Ôèð’!c..3.˜'! */
+        $"8F55 5BA1 0E46 A755 1D7F A914 458D 9FFF"            /* �U[¡.F§U..©.E�Ÿÿ */
+        $"33CF 4CE3 AFC6 3383 BC4D A7E9 F546 FDCB"            /* 3ÏLã¯Æ3ƒ¼M§éõFýË */
+        $"8276 7778 2BBA EF7C 3677 6251 58C0 9EFF"            /* ‚vwx+ºï|6wbQXÀžÿ */
+        $"526C C883 6CFF 7FFF 7D4C 3F9F BD74 6BE9"            /* Rlȃlÿ.ÿ}L?Ÿ½tké */
+        $"B6EB 9003 823B 235D 6AD9 B382 FC45 F10C"            /* ¶ë�.‚;#]jÙ³‚üEñ. */
+        $"8282 90ED 9D47 E949 FADC 7B04 1C1C 9EF1"            /* ‚‚�í�GéIúÜ{...žñ */
+        $"1ABB 270D 07BE 1943 4E14 70E0 48FF 81EE"            /* .»'..¾.CN.pàHÿ�î */
+        $"CE8A 5AAD 3CE9 090D 3126 F96A AEBA 5853"            /* ΊZ­<éÆ.1&ùj®ºXS */
+        $"D02E ADE8 4614 E2B7 2E7E 3DB6 DE6A 77A8"            /* Ð.­èF.â·.~=¶Þjw¨ */
+        $"48D0 2DBB BAF4 E94C 735D 27D6 87FF 7F80"            /* HÐ-»ºôéLs]'Ö‡ÿ.€ */
+        $"5BCC 3CA6 1168 D9E0 38B4 22B2 2154 02AA"            /* [Ì<¦.hÙà8´"²!T.ª */
+        $"A1FF 6D87 EB2B F3EB 3814 9F74 DEF3 4D86"            /* ¡ÿm‡ë+óë8.ŸtÞóM† */
+        $"ED68 7E75 9E81 1FD9 170B E013 7E4D 97B3"            /* íh~už�.Ù..à.~M—³ */
+        $"51B0 6B2A 42AF EEB4 899B D2A2 6AC9 8EBF"            /* Q°k*B¯î´‰›Ò¢jÉŽ¿ */
+        $"2858 9FFC 5050 3364 8F2D 313E 94A9 5ED5"            /* (XŸüPP3d�-1>”©^Õ */
+        $"6213 E9DD 6FF6 5813 72DA FE40 0F70 06C4"            /* b.éÝoöX.rÚþ@.p.Ä */
+        $"FF7D 053C 3E69 C976 DDFF 02D9 4688 D8D7"            /* ÿ}.<>iÉvÝÿ.ÙFˆØ× */
+        $"8DEF 5187 FCA3 40EE 3167 B6DD 7EE6 42AB"            /* �ïQ‡ü£@î1g¶Ý~æB« */
+        $"B07A DB20 DC1D 7016 631F 8FB0 C83A 9CC2"            /* °zÛ Ü.p.c.�°È:œÂ */
+        $"66B9 304B 74F5 03F7 217C D3E3 6000 ECE6"            /* f¹0Ktõ.÷!|Óã`.ìæ */
+        $"A319 FD9E 4131 7E74 59C6 FB3F 1B51 FE89"            /* £.ýžA1~tYÆû?.Qþ‰ */
+        $"52D3 C845 1BF0 4BFE 3BAE 4940 9830 8E9C"            /* RÓÈE.ðKþ;®I@˜0Žœ */
+        $"F843 F6A2 218E B2E2 8092 8E0E 3889 8137"            /* øCö¢!Ž²â€’Ž.8‰�7 */
+        $"583C 394F CCE6 3D1B 37B8 C9A4 D805 B9E4"            /* X<9OÌæ=.7¸É¤Ø.¹ä */
+        $"A037 E45D 1167 9627 81E0 538C 1B6D EA0E"            /*  7ä].g–'�àSŒ.mê. */
+        $"18CD 8E3C EE0C 5E0C B048 8DD2 C804 CA38"            /* .ÍŽ<î.^.°H�ÒÈ.Ê8 */
+        $"8678 CAA9 5EE1 8B6C E7D9 FDE1 5C14 D52A"            /* †xÊ©^á‹lçÙýá\.Õ* */
+        $"67F3 8A12 F698 857A 5692 1FB3 FF27 FE1B"            /* góŠ.ö˜…zV’.³ÿ'þ. */
+        $"7E31 5D25 B4A2 3647 FF07 064A 4D7B F160"            /* ~1]%´¢6Gÿ..JM{ñ` */
+        $"62D7 81CE 0940 AE5F CAEB F1A6 10C4 CB0E"            /* b×�ÎÆ@®_Êëñ¦.ÄË. */
+        $"3D77 2C40 0146 8C72 B765 F6A9 3047 E748"            /* =w,@.FŒr·eö©0GçH */
+        $"0239 A725 8B4C 56F0 7E86 9A24 53D7 4832"            /* .9§%‹LVð~†š$S×H2 */
+        $"7924 73CB 4431 4977 0487 03FC F1B3 A21C"            /* y$sËD1Iw.‡.üñ³¢. */
+        $"2792 0B05 8183 8348 8EC0 2635 47D9 B51D"            /* '’..�ƒƒHŽÀ&5GÙµ. */
+        $"CE40 1FA4 20C5 93A8 BEB4 B8CD 93D8 A79E"            /* Î@.¤ Å“¨¾´¸Í“اž */
+        $"62C5 846C 964D 0404 BE21 3AA5 9EC3 4450"            /* bÅ„l–M..¾!:¥žÃDP */
+        $"FAEE 938A A428 E4D0 7F1B 46A8 7AEC 97FB"            /* úî“Š¤(äÐ..F¨zì—û */
+        $"1AFF 71DA F26D B5B1 E6F2 66B4 865E 1F12"            /* .ÿqÚòmµ±æòf´†^.. */
+        $"CE0F 3A8A EDF1 6321 BC5A 22D5 D3D6 BE19"            /* Î.:Šíñc!¼Z"ÕÓÖ¾. */
+        $"671A 38C3 11E8 FC9D 93AC 895A 1B84 7C9B"            /* g.8Ã.èü�“¬‰Z.„|› */
+        $"979F 5DC5 BBE6 19A8 5D03 BE83 6FA4 B8F2"            /* —Ÿ]Å»æ.¨].¾ƒo¤¸ò */
+        $"AFCD 8115 B21B C1D5 80B4 5E20 3B19 9E48"            /* ¯Í�.².ÁÕ€´^ ;.žH */
+        $"29C0 68DA F799 EC0D 56B3 7049 5EC1 11CB"            /* )ÀhÚ÷™ì.V³pI^Á.Ë */
+        $"CBAF FA0A 5AF1 22F1 3A4C 6F13 635A C681"            /* ˯úÂZñ"ñ:Lo.cZÆ� */
+        $"06DA 8B44 A35B CF31 9B6F 57E6 AEC2 8D59"            /* .Ú‹D£[Ï1›oWæ®Â�Y */
+        $"1556 A43E A289 74DC C398 B209 31B9 8CD0"            /* .V¤>¢‰tÜزÆ1¹ŒÐ */
+        $"07BE D253 76AB 7D79 4F26 D099 7AE8 E52C"            /* .¾ÒSv«}yO&Йzèå, */
+        $"EA35 D7BB E968 CAA0 5F61 EAE5 E9A1 E903"            /* ê5×»éhÊ _aêåé¡é. */
+        $"100E ED2C 5A66 21E2 1426 BE74 7A19 8C98"            /* ..í,Zf!â.&¾tz.Œ˜ */
+        $"3D67 A4D2 370F C95D 7131 2D31 0971 6022"            /* =g¤Ò7.É]q1-1Æq`" */
+        $"F4F2 359E 1FBD D23A CD94 4467 205E F7B1"            /* ôò5ž.½Ò:Í”Dg ^÷± */
+        $"5D18 EE91 9078 176B ADC2 65EB EECF D1A8"            /* ].î‘�x.k­ÂeëîÏѨ */
+        $"F1B3 B999 E7CC 3079 BD9C 82D8 DF6E 29E0"            /* ñ³¹™çÌ0y½œ‚Øßn)à */
+        $"9502 EC8D 5C13 629B 109E A7C0 F438 6674"            /* •.ì�\.b›.ž§Àô8ft */
+        $"C48B E75A 7CAC 28AE 3E9C 0ECF 9ADF F7BF"            /* Ä‹çZ|¬(®>œ.Ïšß÷¿ */
+        $"C51A E20D 64F1 B1DD C986 0C6F 6BFF 5102"            /* Å.â.dñ±ÝɆ.okÿQ. */
+        $"B233 B826 EBC9 35E2 9799 0A0F E81D 0816"            /* ²3¸&ëÉ5â—™Â.è... */
+        $"E01C B1A8 E4D9 1CCF 7F2E 4DB3 371B 83C0"            /* à.±¨äÙ.Ï..M³7.ƒÀ */
+        $"9DFD A603 83D6 4412 7DCF 2E2F 85D8 8259"            /* �ý¦.ƒÖD.}Ï./…Ø‚Y */
+        $"DC97 798F 2E8A 09F5 C1A7 1E56 55F3 BFD0"            /* Ü—y�.ŠÆõÁ§.VUó¿Ð */
+        $"34CE 311A 98BE C87C 8CCE 6EDF C85C A788"            /* 4Î1.˜¾È|ŒÎnßÈ\§ˆ */
+        $"AA7E 47D5 72AF 1842 5C5F 9D6A C586 CA4C"            /* ª~GÕr¯.B\_�jņÊL */
+        $"34D3 6315 D6CA 0D6D 5B75 6C85 551B E270"            /* 4Óc.ÖÊ.m[ul…U.âp */
+        $"E9DD 6127 C363 1F5A 0AA4 8F55 114F 9ED3"            /* éÝa'Ãc.Z¤�U.OžÓ */
+        $"034E A968 1BF1 513A 2F0D 3E61 612A 15E6"            /* .N©h.ñQ:/.>aa*.æ */
+        $"B89F 1877 F38E 8C96 20C3 1952 A559 62AE"            /* ¸Ÿ.w󎌖 Ã.R¥Yb® */
+        $"20E0 BE7D BF7C FAA3 F56C FF75 6D5E 07E7"            /*  à¾}¿|ú£õlÿum^.ç */
+        $"EB87 E7E9 BFE7 EE37 E7EE B60B E7DA F7CF"            /* ë‡çé¿çî7çî¶.çÚ÷Ï */
+        $"A6FF 2B5C 2F9F AC00 ED1C BCF0 084D B6D5"            /* ¦ÿ+\/Ÿ¬.í.¼ð.M¶Õ */
+        $"A3F8 3A1B 179B 5659 AE02 A536 8D65 B1A0"            /* £ø:..›VY®.¥6�e±  */
+        $"F806 81C6 9453 B9E5 1E84 EF36 3D8C 9922"            /* ø.�Æ”S¹å.„ï6=Œ™" */
+        $"A841 EBC7 584D 175D A8CF 5AE5 52F4 364A"            /* ¨AëÇXM.]¨ÏZåRô6J */
+        $"CACB F4FA 59D1 6C18 1FE0 5F96 0F70 465A"            /* ÊËôúYÑl..à_–.pFZ */
+        $"7CFD 0C37 59FF 6248 10C6 4872 8573 D54E"            /* |ý.7YÿbH.ÆHr…sÕN */
+        $"7839 337E D900 4336 CF58 B59C BCC4 602F"            /* x93~Ù.C6ÏXµœ¼Ä`/ */
+        $"EA1A 205F CD8D 635B AE0D 5750 3316 72C7"            /* ê. _Í�c[®.WP3.rÇ */
+        $"A765 C2F2 CF8C 52FB 1892 F55E B7A5 6D85"            /* §eÂòÏŒRû.’õ^·¥m… */
+        $"5782 FAB6 FBB5 CDF3 2DC2 0256 2927 4F4F"            /* W‚ú¶ûµÍó-Â.V)'OO */
+        $"1F92 5F99 B540 87DD 7A80 991B 0677 AB00"            /* .’_™µ@‡Ýz€™..w«. */
+        $"2D82 C5F6 11F7 F21B 2652 B798 75D5 42A6"            /* -‚Åö.÷ò.&R·˜uÕB¦ */
+        $"7757 E0E7 3C3F DBA5 6106 9F44 1800 E044"            /* wWàç<?Û¥a.ŸD..àD */
+        $"5844 8C9D 83C0 C5D3 6B95 CE2A 3EBC D7FD"            /* XDŒ�ƒÀÅÓk•Î*>¼×ý */
+        $"B79B E645 6FD3 A5EE ECE2 C9A7 53C7 B2E3"            /* ·›æEoÓ¥îìâɧSDzã */
+        $"C659 D5C5 0FBD 7C88 93C3 D3D9 D81F 0AEB"            /* ÆYÕÅ.½|ˆ“ÃÓÙØ.Âë */
+        $"5784 8BF9 DAD7 993D 0C8B 9873 08A4 254B"            /* W„‹ùÚ×™=.‹˜s.¤%K */
+        $"2452 F95D 29CA 8B3E D48D 18FB C813 4ECB"            /* $Rù])Ê‹>Ô�.ûÈ.NË */
+        $"D118 E3FA 926C 7A5F E5CC F774 D1DB B5C1"            /* Ñ.ãú’lz_åÌ÷tÑÛµÁ */
+        $"579A 2647 619A 67A0 423D 6C64 B3A6 9357"            /* Wš&Gašg B=ld³¦“W */
+        $"B8C6 8FBE A3AC E380 E548 5ED3 D83D 7DB9"            /* ¸Æ�¾£¬ã€åH^ÓØ=}¹ */
+        $"93E8 9071 F6E0 168F 6BEC F674 6D08 F4DA"            /* “è�qöà.�kìötm.ôÚ */
+        $"C1F7 11FD DEF8 2420 30DA 71E2 C605 81EB"            /* Á÷.ýÞø$ 0ÚqâÆ.�ë */
+        $"565B D461 AF6E 3127 34AC BA64 C660 14E1"            /* V[Ôa¯n1'4¬ºdÆ`.á */
+        $"F6AB DA92 386B 3E7B BD42 90E9 ABA2 6EE7"            /* ö«Ú’8k>{½B�é«¢nç */
+        $"8D0D 373C D280 46EC 6746 310C EA41 862B"            /* �.7<Ò€FìgF1.êA†+ */
+        $"6D1B 7BE9 93AF 17F6 1D3A E7AB CA55 8A4B"            /* m.{铯.ö.:ç«ÊUŠK */
+        $"E867 6EF3 29DF FF5F B839 75E1 FA04 DD81"            /* ègnó)ßÿ_¸9uáú.Ý� */
+        $"B6C9 DA44 D268 3B1A FF63 60F5 37A5 DDCB"            /* ¶ÉÚDÒh;.ÿc`õ7¥ÝË */
+        $"1AB3 5275 7692 7F15 F8E8 6A96 CEB4 D9E5"            /* .³Ruv’..øèj–δÙå */
+        $"3E5A 0E16 B1D0 B056 D0D2 0360 0900 5773"            /* >Z..±Ð°VÐÒ.`Æ.Ws */
+        $"BB3F C215 FD55 C9BF E3FC 48A1 CFAB BD39"            /* »?Â.ýUÉ¿ãüH¡Ï«½9 */
+        $"CD3D 906E 21CB C3DD E4D3 548C 4731 E777"            /* Í=�n!ËÃÝäÓTŒG1çw */
+        $"EE15 C0DE CEBC 0F2F 85A6 9822 F1FF 7B2F"            /* î.ÀÞμ./…¦˜"ñÿ{/ */
+        $"2530 48C7 0C39 3659 CD03 06C5 7C8E 3D49"            /* %0HÇ.96YÍ..Å|Ž=I */
+        $"FED5 7B72 4652 772C 39C7 8F1B 63E8 2DC1"            /* þÕ{rFRw,9Ç�.cè-Á */
+        $"1242 CA35 E396 6103 15DF D939 0597 B8D4"            /* .BÊ5ã–a..ßÙ9.—¸Ô */
+        $"8858 ACE3 3C32 6EE5 69A3 8512 3447 2B3B"            /* ˆX¬ã<2nåi£….4G+; */
+        $"0647 8C1F 2D31 4E57 0D03 BE26 5235 5275"            /* .GŒ.-1NW..¾&R5Ru */
+        $"74E8 B8F6 CF32 E077 8C51 41DB ED67 EE30"            /* tè¸öÏ2àwŒQAÛígî0 */
+        $"AD97 7956 D279 B0A8 768D 00E3 F604 A240"            /* ­—yVÒy°¨v�.ãö.¢@ */
+        $"9656 5BCD B309 D0CD 3ECE C477 31EC F88D"            /* –V[ͳÆÐÍ>ÎÄw1ìø� */
+        $"782F 8B9E 37FA A741 C636 7B55 D047 64A4"            /* x/‹ž7ú§AÆ6{UÐGd¤ */
+        $"E2EC C69D F609 F38F 821E 8D20 8709 87FF"            /* âìÆ�öÆó�‚.� ‡Æ‡ÿ */
+        $"3C3A B1ED C420 1F0B 52E3 8999 C684 30F3"            /* <:±íÄ ..R㉙Ƅ0ó */
+        $"C4ED 7FA9 3A2C D0E7 AE48 1AC2 7196 9347"            /* Äí.©:,Ðç®H.Âq–“G */
+        $"6BC9 BEE1 4112 4209 93CA 307A 7FF7 8B12"            /* kɾáA.BÆ“Ê0z.÷‹. */
+        $"EE76 8890 A529 33CC F435 A84F 9414 A719"            /* îvˆ�¥)3Ìô5¨O”.§. */
+        $"BFB2 6305 201F 372D 567F 30DF 2E47 D0B9"            /* ¿²c. .7-V.0ß.Gй */
+        $"C68F 5126 7EAA D95A 12D0 DA8A 8CF4 8A2A"            /* Æ�Q&~ªÙZ.ÐÚŠŒôŠ* */
+        $"CBAE 0509 B614 A9E1 2CA2 D0E0 F017 E395"            /* Ë®.ƶ.©á,¢Ðàð.ã• */
+        $"AF82 85B5 4509 E75C 8E4D 5465 7DF2 CF39"            /* ¯‚…µEÆç\ŽMTe}òÏ9 */
+        $"ACFB DD5B C683 62C0 0B1C B7B9 EAEC 049C"            /* ¬ûÝ[ƃbÀ..·¹êì.œ */
+        $"8045 0178 6757 E317 872D ABC2 B077 6EF6"            /* €E.xgWã.‡-«Â°wnö */
+        $"3612 4132 3DD7 D39B B49A 04A8 207D 6135"            /* 6.A2=×Ó›´š.¨ }a5 */
+        $"C64F 3A0F 5028 7B6B 953E 8F19 920A 718F"            /* ÆO:.P({k•>�.’Âq� */
+        $"08E9 A079 EC51 A08F 4A77 5130 C807 9BC2"            /* .é yìQ �JwQ0È.›Â */
+        $"B37B 4C7B 9BAA 40F3 4E94 BE51 C027 32B5"            /* ³{L{›ª@óN”¾QÀ'2µ */
+        $"751F 4793 7271 226E 82F3 CF14 8BC3 F927"            /* u.G“rq"n‚óÏ.‹Ãù' */
+        $"4C81 7F29 AB70 8B3B E948 86D6 569F FEC2"            /* L�.)«p‹;éH†ÖVŸþÂ */
+        $"BF6C 92F9 1011 3BE3 9E91 6458 1634 34A3"            /* ¿l’ù..;ãž‘dX.44£ */
+        $"3042 520F 5D64 6429 32CE 04FD 1B98 0698"            /* 0BR.]dd)2Î.ý.˜.˜ */
+        $"3A36 655C 86C7 C272 4B02 E259 0537 4DB8"            /* :6e\†ÇÂrK.âY.7M¸ */
+        $"C6C2 6980 ECFB 0FC1 C6D9 0A2C D00F 282A"            /* ÆÂi€ìû.ÁÆÙÂ,Ð.(* */
+        $"7A0B D91F 08CA 762C A629 048E 9BCC CFD2"            /* z.Ù..Êv,¦).Ž›ÌÏÒ */
+        $"1EBC 8F60 2F64 F24D F1FB 81C6 8AEC CFDB"            /* .¼�`/dòMñû�ÆŠìÏÛ */
+        $"623A 01A9 35D2 B5E1 B80A 2D32 084E 3857"            /* b:.©5Òµá¸Â-2.N8W */
+        $"C025 BCDA 4728 F3AD 35AD 9AAA E054 21B7"            /* À%¼ÚG(ó­5­šªàT!· */
+        $"A47E 62C5 9921 02C0 09E3 440D 063A 3789"            /* ¤~bÅ™!.ÀÆãD..:7‰ */
+        $"5072 E54A 4654 E148 AC2E 4A99 C6A5 3923"            /* PråJFTáH¬.J™Æ¥9# */
+        $"49B5 6906 6531 FD5E 7CCE 1C4B EEDE 7482"            /* Iµi.e1ý^|Î.KîÞt‚ */
+        $"9E3F 73AE C777 0214 C921 3131 C5CB 9F61"            /* ž?s®Çw..É!11ÅËŸa */
+        $"64A4 4E70 57C2 5C04 E25B 266E 6887 7477"            /* d¤NpWÂ\.â[&nh‡tw */
+        $"FCCB 1F0C 89F2 6CF6 713E 4D08 8AC8 9B0C"            /* üË..‰òlöq>M.ŠÈ›. */
+        $"00AC D9D7 A28A C219 B52B B46A D704 F919"            /* .¬Ù×¢ŠÂ.µ+´j×.ù. */
+        $"2050 6CCA 215A 299B 9129 9739 DA6F 3A67"            /*  PlÊ!Z)›‘)—9Úo:g */
+        $"FE12 2BF1 4F8B 26ED D21F F727 5B59 22F3"            /* þ.+ñO‹&íÒ.÷'[Y"ó */
+        $"2E05 F4A0 9754 F431 9AED 1B65 038C CD7F"            /* ..ô —Tô1ší.e.ŒÍ. */
+        $"8254 E3AE 035C 18D7 0E28 6300 0DF0 998D"            /* ‚Tã®.\.×.(c..ð™� */
+        $"0191 85AF C71B B3CF F0D6 3A8F B1AA 5E99"            /* .‘…¯Ç.³ÏðÖ:�±ª^™ */
+        $"BAB8 7C7F 0214 F864 4744 E747 7248 3C94"            /* º¸|...ødGDçGrH<” */
+        $"3AC8 CE04 1019 11ED 4BCC 76E9 FE4E 5728"            /* :ÈÎ....íKÌvéþNW( */
+        $"5BB0 986C D763 A3C7 AF8A 14E9 D24A AD17"            /* [°˜l×c£Ç¯Š.éÒJ­. */
+        $"FF66 611F B77C 0830 9093 A560 06FA E9CF"            /* ÿfa.·|.0�“¥`.úéÏ */
+        $"054B 5846 1681 5DBF 34F9 49A9 45E0 8F20"            /* .KXF.�]¿4ùI©Eà�  */
+        $"7FFD 6264 2193 031D A60F A111 B0B7 CFEE"            /* .ýbd!“..¦.¡.°·Ïî */
+        $"DE49 EC80 C0F1 D7F6 A495 900B 4126 40BE"            /* ÞIì€Àñ×ö¤•�.A&@¾ */
+        $"185B DFFE C7B0 12AC C143 AA85 70E5 81EF"            /* .[ßþÇ°.¬ÁCª…på�ï */
+        $"79CE 1662 08E4 203F 1706 40FB CC39 CA8F"            /* yÎ.b.ä ?..@ûÌ9Ê� */
+        $"8002 1CFA 3BCC 6B79 5C83 A4D2 7147 E38F"            /* €..ú;Ìky\ƒ¤ÒqGã� */
+        $"C93B F2E8 6A15 6D30 C314 E898 81E3 FF7B"            /* É;òèj.m0Ã.è˜�ãÿ{ */
+        $"5FC5 EE13 0449 1985 2CBC 73C7 C569 DCB1"            /* _Åî..I.…,¼sÇÅiܱ */
+        $"8024 F7CA CC7A FE3B CC15 4BCE 5B92 1BBB"            /* €$÷ÊÌzþ;Ì.KÎ[’.» */
+        $"0048 F291 579F FD20 F11A 1934 CC11 9C3F"            /* .Hò‘WŸý ñ..4Ì.œ? */
+        $"CE49 027A 9763 9E57 A2FF 7FFD 53E4 E50B"            /* ÎI.z—cžW¢ÿ.ýSäå. */
+        $"C747 02FF 7869 0537 1482 221E 0220 79D5"            /* ÇG.ÿxi.7.‚".. yÕ */
+        $"45B1 2E48 6A6C 8486 571F E1F1 BF39 0797"            /* E±.Hjl„†W.áñ¿9.— */
+        $"5D21 6964 EA9B 13F1 E6B7 C4B5 A2B7 E2BD"            /* ]!idê›.ñæ·Äµ¢·â½ */
+        $"09C2 B200 0000 0000 003E A392 6527 69B6"            /* Ʋ......>£’e'i¶ */
+        $"B189 8365 F55D 7A2B 0398 4196 BB60 D4F0"            /* ±‰ƒeõ]z+.˜A–»`Ôð */
+        $"06B6 100C 5B60 D76F 8FEE EFFB D525 0E2B"            /* .¶..[`×o�îïûÕ%.+ */
+        $"3535 B765 22E7 F77C CF5C 8907 7626 62C0"            /* 55·e"ç÷|Ï\‰.v&bÀ */
+        $"3B04 A170 EEA6 A399 F26B CD7E 92BC 9E13"            /* ;.¡p™òkÍ~’¼ž. */
+        $"9D2D 6907 B06F 6B9A 957D 3C57 DC9F 06E6"            /* �-i.°okš•}<WÜŸ.æ */
+        $"C3B6 16AD C91B E868 E000 1848 3BE4 5C3A"            /* ö.­É.èhà..H;ä\: */
+        $"1162 2272 401F 600B A973 281E 62B3 2654"            /* .b"r@.`.©s(.b³&T */
+        $"74B0 287C C53E A3DA 2A14 E38F 9FFE 3A8E"            /* t°(|Å>£Ú*.ã�Ÿþ:Ž */
+        $"0D69 7E9D 5B07 1396 ED52 69BC 3971 5630"            /* .i~�[..–íRi¼9qV0 */
+        $"7C63 8DA9 7A40 F364 CC6A FCAC DC7C 59DC"            /* |c�©z@ódÌjü¬Ü|YÜ */
+        $"278A 92E3 6FBF F936 7157 2583 232E E558"            /* 'Š’ão¿ù6qW%ƒ#.åX */
+        $"0000 C241 6B90 4DCB 6421 F85A B681 4812"            /* ..ÂAk�MËd!øZ¶�H. */
+        $"9165 5C06 0195 F213 DB9F 5E2F 4BDE A075"            /* ‘e\..•ò.ÛŸ^/KÞ u */
+        $"BD9A 741B 971B 3411 1F73 7FF8 D719 BA55"            /* ½št.—.4..s.ø×.ºU */
+        $"8048 404F FEEA FC74 AEB1 84FD 03F9 5D43"            /* €H@Oþêüt®±„ý.ù]C */
+        $"BE42 E61F FF7F F4CA BA56 9654 B757 FF60"            /* ¾Bæ.ÿ.ôʺV–T·Wÿ` */
+        $"CA39 3290 054C E785 0EA7 F04D AF3E B342"            /* Ê92�.Lç….§ðM¯>³B */
+        $"A80A 815D 3954 73F2 871A 51FF 7488 20CD"            /* ¨Â�]9Tsò‡.Qÿtˆ Í */
+        $"90F3 23B8 80FE C6BF 726C 5426 83F2 5400"            /* �ó#¸€þÆ¿rlT&ƒòT. */
+        $"0000 0000 0000 0000 BFA5 D802 777C F954"            /* ........¿¥Ø.w|ùT */
+        $"286B A586 76CF 26CE 72CA 6FE7 BD43 DB36"            /* (k¥†vÏ&ÎrÊoç½CÛ6 */
+        $"A826 870E 2EEF E2C4 2E22 E63C FF7F AF51"            /* ¨&‡..ïâÄ."æ<ÿ.¯Q */
+        $"40C1 B727 22F3 9ACC 894D 0C49 EC7A D998"            /* @Á·'"óšÌ‰M.IìzÙ˜ */
+        $"64A9 DD22 2545 B85C D621 0609 B73A 9D9F"            /* d©Ý"%E¸\Ö!.Æ·:�Ÿ */
+        $"FF7F FF7F C0F7 00E1 B069 1D76 3BA1 E98C"            /* ÿ.ÿ.À÷.á°i.v;¡éŒ */
+        $"5F1B 1E11 B6F6 EB6D 6316 9DBC D1B2 DC90"            /* _...¶öëmc.�¼Ñ²Ü� */
+        $"5E1D 5EE0 3C65 57D0 B69C 3782 D1BE 3A77"            /* ^.^à<eWжœ7‚Ѿ:w */
+        $"436E 462B 45B7 FF61 4FA4 A45B 8C34 39D8"            /* CnF+E·ÿaO¤¤[Œ49Ø */
+        $"1B35 B876 A5F1 F2AD 3F78 D289 1C2E E3B4"            /* .5¸v¥ñò­?xÒ‰..ã´ */
+        $"A28B 64FA 1E2C 0CCD 0B1C AD42 8866 DDD6"            /* ¢‹dú.,.Í..­BˆfÝÖ */
+        $"62F0 225B 8DF7 32B3 FC3C 79E9 000B 1CA9"            /* bð"[�÷2³ü<yé...© */
+        $"2C82 4874 34AB B158 47CD FA9F EBC8 0923"            /* ,‚Ht4«±XGÍúŸëÈÆ# */
+        $"B291 7229 8C3F E7FD 193C 330B A3B4 6969"            /* ²‘r)Œ?çý.<3.£´ii */
+        $"FCF6 E1BA 4C4A E64C B1BC 5BAF F402 C828"            /* üöáºLJæL±¼[¯ô.È( */
+        $"3A51 CC67 A851 E207 5A7C 3733 1031 FD5C"            /* :QÌg¨Qâ.Z|73.1ý\ */
+        $"E4D3 B69F FF67 2C6D 3FC7 D5B4 E63F 55B9"            /* äÓ¶Ÿÿg,m?ÇÕ´æ?U¹ */
+        $"FD5F 3DB1 4589 6ADF 54F0 F42A 498F 61C8"            /* ý_=±E‰jßTðô*I�aÈ */
+        $"4872 5CD7 F70D 9C80 8880 EB9A 1FE7 C715"            /* Hr\×÷.œ€ˆ€ëš.çÇ. */
+        $"E57A 280F 96CF 014C 0411 EF44 C4F2 C64F"            /* åz(.–Ï.L..ïDÄòÆO */
+        $"F91B A9D6 EB9E F615 096F E5C0 5B30 BB79"            /* ù.©Öëžö.ÆoåÀ[0»y */
+        $"D645 BF4F B70A 2C40 3D24 A4C4 5A01 F3DB"            /* ÖE¿O·Â,@=$¤ÄZ.óÛ */
+        $"8879 D458 F558 4C8E 3C87 E83C 9C30 F0C3"            /* ˆyÔXõXLŽ<‡è<œ0ðà */
+        $"F7EB BE6A 2B3B B9CB 4F2E 3B49 CA98 6025"            /* ÷ë¾j+;¹ËO.;Iʘ`% */
+        $"D6C7 6B39 ED18 A784 5410 F9CD 4FB5 9E32"            /* ÖÇk9í.§„T.ùÍOµž2 */
+        $"EABF F72F 6ECC 217F E295 4BDA F0C8 2678"            /* ê¿÷/nÌ!.â•KÚðÈ&x */
+        $"B0F7 3381 2299 1033 5300 BB1C E72F 1EE0"            /* °÷3�"™.3S.».ç/.à */
+        $"75D6 68D0 8C87 A574 580B 4AD8 7BC8 E1C4"            /* uÖhÐŒ‡¥tX.JØ{ÈáÄ */
+        $"64D3 76AA A080 1E28 FD04 890B B9A1 7E5C"            /* dÓvª €.(ý.‰.¹¡~\ */
+        $"79E2 31B9 1C3E DBAE 8BC6 DB23 53A4 0F06"            /* yâ1¹.>Û®‹ÆÛ#S¤.. */
+        $"74AA 7920 6233 E3BF B281 AFAA 957D FDFB"            /* tªy b3㿲�¯ª•}ýû */
+        $"216A 3ECE 3139 37DF 8885 620B 5D55 D0FD"            /* !j>Î197߈…b.]UÐý */
+        $"F796 6A70 CEFD 33D8 B369 178E 99C0 9FFF"            /* ÷–jpÎý3سi.Ž™ÀŸÿ */
+        $"7FD2 27D4 D615 4840 B836 A0B5 1D6F 2A5A"            /* .Ò'ÔÖ.H@¸6 µ.o*Z */
+        $"1338 2369 83A0 D409 0FA7 77EF 19B9 21E6"            /* .8#iƒ ÔÆ.§wï.¹!æ */
+        $"3E21 0CB0 D4D3 362A EA6F 6340 8D73 27FB"            /* >!.°ÔÓ6*êoc@�s'û */
+        $"C3EF 7823 33DF 7A8C 5C69 20C4 5816 72E4"            /* Ãïx#3ßzŒ\i ÄX.rä */
+        $"712C 3345 6755 76F3 FEAF 494B D0B4 3C8F"            /* q,3EgUvóþ¯IKд<� */
+        $"B83F A050 C3E9 4CA2 6A6E 7AD0 D7FF 5860"            /* ¸? PÃéL¢jnzÐ×ÿX` */
+        $"548E 54E7 C3B9 6DDF 462C 54BE 5EF9 1A41"            /* TŽTçùmßF,T¾^ù.A */
+        $"6A46 A4FB 1C36 1CA4 77EC 2899 F147 3422"            /* jF¤û.6.¤wì(™ñG4" */
+        $"843C 7FAE 123E 6894 9B7F 3125 EB0F 3129"            /* „<.®.>h”›.1%ë.1) */
+        $"9DC1 8469 CE90 BB6E 4F2C 385A 0FD1 9AC7"            /* �Á„iÎ�»nO,8Z.ÑšÇ */
+        $"3318 3BF0 B1AA A51A 9022 A143 29FF 7FC1"            /* 3.;𱪥.�"¡C)ÿ.Á */
+        $"0F0F 6570 67C4 7FA7 9906 DE4E 5439 A278"            /* ..epgÄ.§™.ÞNT9¢x */
+        $"34E1 3D57 BB0E 086E 4C71 4406 DA9D CA56"            /* 4á=W»..nLqD.Ú�ÊV */
+        $"3EFD D077 5DA5 CD7D C244 9128 F408 1F03"            /* >ýÐw]¥Í}ÂD‘(ô... */
+        $"0C8F FF4B 9274 2EC6 E208 13C5 EE1B 3CEA"            /* .�ÿK’t.Æâ..Åî.<ê */
+        $"C5C0 06F5 0FA1 11FF 7FE3 A446 32E6 F4DA"            /* ÅÀ.õ.¡.ÿ.ã¤F2æôÚ */
+        $"23EC 5108 3AE0 CD16 AFFF 3965 8196 56E2"            /* #ìQ.:àÍ.¯ÿ9e�–Vâ */
+        $"2881 4EB9 CA14 5C4A 8091 B176 8823 BF09"            /* (�N¹Ê.\J€‘±vˆ#¿Æ */
+        $"CED5 0D88 E6BB DD95 1B72 36E8 809C D432"            /* ÎÕ.ˆæ»Ý•.r6耜Ô2 */
+        $"872D C08C 7DCB B30E 548B AE16 0D85 6B49"            /* ‡-ÀŒ}˳.T‹®..…kI */
+        $"9B28 D491 ECD6 F598 691A 0891 135A 63A0"            /* ›(Ô‘ìÖõ˜i..‘.Zc  */
+        $"593C 1FFD 8A54 4FB9 F2AB 20FC 5CF3 1B88"            /* Y<.ýŠTO¹ò« ü\ó.ˆ */
+        $"EE7E 8355 45D6 87C8 28CE 7B33 92A2 D8D6"            /* î~ƒUEÖ‡È(Î{3’¢ØÖ */
+        $"E8DF EF94 500A 0D78 DE9F 8657 F7BD 7F40"            /* èßï”PÂ.xÞŸ†W÷½.@ */
+        $"5E07 0789 EDC7 F3A5 A0BF 3929 6B19 A460"            /* ^..‰íÇó¥ ¿9)k.¤` */
+        $"7A50 91FF 42EA 5F12 DFA5 E0A0 84CC E869"            /* zP‘ÿBê_.ߥࠄÌèi */
+        $"BB1F 6EDA 2238 5DB0 7F22 3521 F04B FF6B"            /* ».nÚ"8]°."5!ðKÿk */
+        $"6827 722A DD5F 3C9D D3F4 2BE3 614D 0A3F"            /* h'r*Ý_<�Óô+ãaMÂ? */
+        $"62C4 E6AC 95CA 5946 37E8 BC76 97FD 5167"            /* bÄ欕ÊYF7è¼v—ýQg */
+        $"C970 D4C7 0655 C470 5913 DBBD AA8C 87A4"            /* ÉpÔÇ.UÄpY.Û½ªŒ‡¤ */
+        $"3C63 0B7F 54CD 391E 574D F2D5 C728 20B7"            /* <c..TÍ9.WMòÕÇ( · */
+        $"9955 DAC8 72A5 DBBB F7ED 4C9F 6FFE 3A4E"            /* ™UÚÈr¥Û»÷íLŸoþ:N */
+        $"E165 1831 C0E5 8285 96C2 3959 1BE7 E884"            /* áe.1Àå‚…–Â9Y.çè„ */
+        $"E568 89C1 FD03 D443 F6D1 A7C9 4CFE F7B9"            /* åh‰Áý.ÔCöѧÉLþ÷¹ */
+        $"A0BA 5040 19D5 965F 0EB5 E503 4B32 E6C8"            /*  ºP@.Õ–_.µå.K2æÈ */
+        $"B9C1 DEBB B8B7 47DC A850 AF44 D3B7 F562"            /* ¹ÁÞ»¸·GܨP¯DÓ·õb */
+        $"4210 4DFF 42A0 3D9A 7C63 8124 22A9 B258"            /* B.MÿB =š|c�$"©²X */
+        $"2256 6243 3077 FF57 7389 3FB6 A096 0EAB"            /* "VbC0wÿWs‰?¶ –.« */
+        $"DD33 EF25 C4B0 7338 F6D7 8730 FF2E DD0A"            /* Ý3ï%Ä°s8öׇ0ÿ.Ý */
+        $"BBDA 7A6E EFE8 58EE D64B A09E 2B00 EC04"            /* »ÚznïèXîÖK ž+.ì. */
+        $"09C9 A9F4 82A0 3132 4829 65CA E93B B827"            /* ÆÉ©ô‚ 12H)eÊé;¸' */
+        $"E81F B387 132B 5D15 E526 6FEC 2CB1 407F"            /* è.³‡.+].å&oì,±@. */
+        $"8485 FF32 4933 D357 FC45 0E44 EE66 D960"            /* „…ÿ2I3ÓWüE.DîfÙ` */
+        $"5AA3 A13A FC0B D8E2 622E 0BEE 714F 2672"            /* Z£¡:ü.Øâb..îqO&r */
+        $"3850 26C4 E626 F9BA 418C BC8A 7481 C6BE"            /* 8P&Äæ&ùºAŒ¼Št�ƾ */
+        $"BFA6 0D72 0603 3452 46C0 9FDB BE63 34D9"            /* ¿¦.r..4RFÀŸÛ¾c4Ù */
+        $"9599 7519 804B F1CE 0FC8 7572 F58E EB32"            /* •™u.€KñÎ.ÈurõŽë2 */
+        $"3501 CBB0 C05B 5643 485A 0012 64C2 8022"            /* 5.Ë°À[VCHZ..d€" */
+        $"BD39 EB39 2B57 0AA3 3931 93D4 885E CDF2"            /* ½9ë9+W£91“Ôˆ^Íò */
+        $"818D 7734 36C2 BEE1 4F55 116C 47A9 DC40"            /* ��w46¾áOU.lG©Ü@ */
+        $"A8A8 4532 7C33 9D7E 070A BA9E 36F7 2445"            /* ¨¨E2|3�~.ºž6÷$E */
+        $"074C 181A 07B2 C470 FA15 8CCB C069 AD0F"            /* .L...²Äpú.ŒËÀi­. */
+        $"9DD2 8B21 6F22 7300 34B4 4378 25AB D9D2"            /* �Ò‹!o"s.4´Cx%«ÙÒ */
+        $"1D9B B7F7 2F9C C3B1 926F DE61 4463 90BD"            /* .›·÷/œÃ±’oÞaDc�½ */
+        $"BC76 27E7 A5B5 826F 908E 31BA 048F 97C1"            /* ¼v'祵‚o�Ž1º.�—Á */
+        $"1884 67A9 C4BA 4B2B 4A58 D0EE 0269 6832"            /* .„g©ÄºK+JXÐî.ih2 */
+        $"E8C6 03AA D2A2 D034 27AA D49E 9C01 069A"            /* èÆ.ªÒ¢Ð4'ªÔžœ..š */
+        $"1BDC C40B 3BA7 5F8D 0468 152D E505 7EC0"            /* .ÜÄ.;§_�.h.-å.~À */
+        $"6BBF C4F4 2F45 99CB 1872 C713 FA0D 055F"            /* k¿Äô/E™Ë.rÇ.ú.._ */
+        $"551D 6E4D 5794 CC71 BAB5 C560 4D20 9464"            /* U.nMW”ÌqºµÅ`M ”d */
+        $"9F8C 94BA 1C96 0987 1AB4 61BB BA86 751B"            /* ŸŒ”º.–Ƈ.´a»º†u. */
+        $"9B79 D06A 7A3D A663 FB31 8B86 E588 5D15"            /* ›yÐjz=¦cû1‹†åˆ]. */
+        $"4A09 8B2B 81FC AE85 0D5A 1D8C A5B7 6DD9"            /* JÆ‹+�ü®….Z.Œ¥·mÙ */
+        $"02F5 50CE 7017 1BDD 3D3D 86CB 250B 491B"            /* .õPÎp..Ý==†Ë%.I. */
+        $"AA1F 2D21 A416 E8E7 9A53 4299 8CDE CD59"            /* ª.-!¤.èçšSB™ŒÞÍY */
+        $"C678 B559 D85C C580 6795 AD5F F578 C9EE"            /* ÆxµYØ\Å€g•­_õxÉî */
+        $"73B2 8F4B 6EEA 6F07 F785 C1B3 374B E51F"            /* s²�Knêo.÷…Á³7Kå. */
+        $"46DC 728C 05A4 6932 792A DB50 4E9A FD82"            /* FÜrŒ.¤i2y*ÛPNšý‚ */
+        $"A8A2 5EB8 024D C558 D6BC 350C 97B0 B2E8"            /* ¨¢^¸.MÅXÖ¼5.—°²è */
+        $"8F42 92FD 604D 6FB7 74B6 6EBE 97F6 CE03"            /* �B’ý`Mo·t¶n¾—öÎ. */
+        $"0DFA C340 31C3 4C5E 0041 088B E097 383B"            /* .úÃ@1ÃL^.A.‹à—8; */
+        $"A236 97CC 8D2B 6F6D 0E58 4E56 1D49 32EC"            /* ¢6—Ì�+om.XNV.I2ì */
+        $"626C C303 42BB D30B B8DE 5868 3C2F E39B"            /* blÃ.B»Ó.¸ÞXh</ã› */
+        $"A07A 236D 0F21 C0DD 1A0A 933A 7710 6605"            /*  z#m.!ÀÝ.“:w.f. */
+        $"343E 8D1A 9384 4F16 C01E 5AF7 DF53 0B38"            /* 4>�.“„O.À.Z÷ßS.8 */
+        $"3615 80D7 428E 90F6 4620 02EA 4590 DF22"            /* 6.€×BŽ�öF .êE�ß" */
+        $"4B70 2FB2 CADA A529 F7FA E7C6 BC99 DFCD"            /* Kp/²ÊÚ¥)÷úçƼ™ßÍ */
+        $"5EE7 D677 B5BE F819 6A55 6070 E1A9 DF53"            /* ^çÖwµ¾ø.jU`pá©ßS */
+        $"3F82 0229 B6B7 D247 1967 8313 056F 9D27"            /* ?‚.)¶·ÒG.gƒ..o�' */
+        $"753E E4DD EB7F 1372 C0F7 D72E 349B 2F9B"            /* u>äÝë..rÀ÷×.4›/› */
+        $"686C C9AF 0896 0865 7A3A 5A9D 807F 292A"            /* hlɯ.–.ez:Z�€.)* */
+        $"8DDA A776 4B3C 0993 532D D682 A41B 9DC2"            /* �Ú§vK<Æ“S-Ö‚¤.� */
+        $"5113 9D60 934B 2055 D671 C6C4 1252 3CEF"            /* Q.�`“K UÖqÆÄ.R<ï */
+        $"C72F AC19 4BED 185D BC60 5957 F81B 8278"            /* Ç/¬.Kí.]¼`YWø.‚x */
+        $"20B5 9173 4A1B FDC9 295D 54B7 8AFE 6938"            /*  µ‘sJ.ýÉ)]T·Šþi8 */
+        $"FE49 BA78 3225 49A1 4243 823C 52B9 8489"            /* þIºx2%I¡BC‚<R¹„‰ */
+        $"9BDF 0AA1 9A6B 667D DCE2 FE18 C386 4EE9"            /* ›ß¡škf}Üâþ.ÆNé */
+        $"8AF7 92D0 4405 227C BD4C B9E4 34A7 2533"            /* Š÷’ÐD."|½L¹ä4§%3 */
+        $"D3C6 E915 D57B 681B B6DC FF03 D5D4 F1DD"            /* ÓÆé.Õ{h.¶Üÿ.ÕÔñÝ */
+        $"4FB5 BA54 262A 73C2 1CF4 4CD1 D842 E8C2"            /* OµºT&*sÂ.ôLÑØBè */
+        $"8169 3555 13EC 6A25 6DE0 3614 EC2E D1BB"            /* �i5U.ìj%mà6.ì.Ñ» */
+        $"E597 BFC6 2ACB 6879 11D1 870D E79E 8422"            /* å—¿Æ*Ëhy.ч.çž„" */
+        $"C01D 4032 8887 6DBA FBEC 3077 F220 49E3"            /* À.@2ˆ‡mºûì0wò Iã */
+        $"8693 0B00 9F45 0F57 0A39 DA8E EAA5 CD48"            /* †“..ŸE.WÂ9ÚŽê¥ÍH */
+        $"2C93 C3EC BDE0 71D5 5749 0952 441C E3F8"            /* ,“Ãì½àqÕWIÆRD.ãø */
+        $"597F C1E6 FB6B BBED AD71 FC34 CFF8 5877"            /* Y.Áæûk»í­qü4ÏøXw */
+        $"DB67 5F6D 798F E163 5F6B 1CFA A87B ED7C"            /* Ûg_my�ác_k.ú¨{í| */
+        $"F176 3065 72FF 443D BA6B 8FBD 9E85 806A"            /* ñv0erÿD=ºk�½ž…€j */
+        $"2A1B 368C 7A9E B1B1 93DE ABD8 263F 31B3"            /* *.6Œzž±±“Þ«Ø&?1³ */
+        $"1739 58F1 7233 FE7C 4EC4 32AA CDDB CF11"            /* .9Xñr3þ|NÄ2ªÍÛÏ. */
+        $"C519 9C61 B756 AF62 D55D 5D48 6AF7 4364"            /* Å.œa·V¯bÕ]]Hj÷Cd */
+        $"205E F14D AAD6 EFF5 2F0D CBE4 0F19 3159"            /*  ^ñMªÖïõ/.Ëä..1Y */
+        $"94F4 910E 4217 990B CABE EBF5 2B67 2EF6"            /* ”ô‘.B.™.ʾëõ+g.ö */
+        $"FE41 0C44 1C50 43EA 69F5 4E73 5569 82A1"            /* þA.D.PCêiõNsUi‚¡ */
+        $"C13C 4899 3AA9 5E13 5F76 BF98 2105 1842"            /* Á<H™:©^._v¿˜!..B */
+        $"AF34 9AFD CFC8 D1E7 3479 E1F3 C86F D06F"            /* ¯4šýÏÈÑç4yáóÈoÐo */
+        $"9ED9 9DD8 E2E0 4B44 19F4 03E6 9CC0 3474"            /* žÙ�ØâàKD.ô.æœÀ4t */
+        $"DFBD 078F D140 1C06 5F8C B6E2 665C 703A"            /* ß½.�Ñ@.._Œ¶âf\p: */
+        $"2841 642E F538 C531 697D 5064 11AD 9E8C"            /* (Ad.õ8Å1i}Pd.­žŒ */
+        $"5A53 3174 7302 762E 9708 BEF5 AD41 0C01"            /* ZS1ts.v.—.¾õ­A.. */
+        $"D744 85FC D963 416A 9A3A 6898 F067 5B1C"            /* ×D…üÙcAjš:h˜ðg[. */
+        $"873B 42B6 72C4 FF18 337A 8A24 EDCE 6B8B"            /* ‡;B¶rÄÿ.3zŠ$íÎk‹ */
+        $"BF06 0EA4 0227 A131 8620 B03C A2B9 729E"            /* ¿..¤.'¡1† °<¢¹rž */
+        $"1242 EC64 E340 5C5C 9BFF 120A BB1B 75E5"            /* .Bìdã@\\›ÿ.».uå */
+        $"385B 68AF C7B7 8BA5 1E7B 6FC1 DDB2 F642"            /* 8[h¯Ç·‹¥.{oÁݲöB */
+        $"FF56 4D21 66B3 EA8C 7095 8FBD 92CC 7315"            /* ÿVM!f³êŒp•�½’Ìs. */
+        $"665F B398 608C ADD4 11E0 DA38 734A C3DB"            /* f_³˜`Œ­Ô.àÚ8sJÃÛ */
+        $"9249 4640 27D6 D057 426E 651D BF14 F0DE"            /* ’IF@'ÖÐWBne.¿.ðÞ */
+        $"9130 2D17 8D66 9689 79BD 9A6D 5AF9 6C7C"            /* ‘0-.�f–‰y½šmZùl| */
+        $"94BF 8531 6507 5621 1C11 8D8F F3A5 83D9"            /* ”¿…1e.V!..��ó¥ƒÙ */
+        $"7EE3 1E6D 9B0A 8D44 F466 DE49 E606 E143"            /* ~ã.m›Â�DôfÞIæ.áC */
+        $"7E77 D417 D49D 9CF2 89AA B0FA 84A4 33A5"            /* ~wÔ.Ô�œò‰ª°ú„¤3¥ */
+        $"8279 A26A 82C5 27CF FB64 D227 994E C6A7"            /* ‚y¢j‚Å'ÏûdÒ'™NƧ */
+        $"531C 7B7D D333 20D4 F79E 7C21 CC1E 7ADA"            /* S.{}Ó3 Ô÷ž|!Ì.zÚ */
+        $"F978 DEBB 1FF2 7420 A72D DE6B AB74 8DC6"            /* ùxÞ».òt §-Þk«t�Æ */
+        $"DD0F 0386 BF57 5F23 4926 C874 D598 47A3"            /* Ý..†¿W_#I&ÈtÕ˜G£ */
+        $"FBC8 E9B0 38BB C695 B7F4 82A1 CC5F 1E22"            /* ûÈé°8»Æ•·ô‚¡Ì_." */
+        $"767C 20D5 E64D 44F1 B2D4 2298 C6A1 1842"            /* v| ÕæMDñ²Ô"˜Æ¡.B */
+        $"8139 0CC8 B9C5 284F 9FC8 945B 5342 94A8"            /* �9.ȹÅ(OŸÈ”[SB”¨ */
+        $"1A57 3351 E00E DB28 D5E3 9712 4346 6DBA"            /* .W3Qà.Û(Õã—.CFmº */
+        $"CC9B A1ED CD9B 778D 4523 1E9A AC69 8ED9"            /* Ì›¡íÍ›w�E#.š¬iŽÙ */
+        $"67C4 C16D A548 A029 0075 0185 8D06 B7F0"            /* gÄÁm¥H ).u.…�.·ð */
+        $"8258 D26A EB95 D437 F0D2 8E91 D536 F534"            /* ‚XÒjë•Ô7ðÒŽ‘Õ6õ4 */
+        $"30A1 6DE7 E4B8 48DF 246E 6A43 4FE6 AED0"            /* 0¡mçä¸Hß$njCOæ®Ð */
+        $"48A0 5E1E C339 6C40 BE36 CEB8 870B F9EB"            /* H ^.Ã9l@¾6θ‡.ùë */
+        $"5ED8 3CA2 B3FA 8CD9 2D26 FF79 6468 862D"            /* ^Ø<¢³úŒÙ-&ÿydh†- */
+        $"6B87 3072 15D5 5640 D5D4 B4BA EAD3 84F1"            /* k‡0r.ÕV@ÕÔ´ºêÓ„ñ */
+        $"6A43 F378 100E 8088 A3FE 989B E75B F67F"            /* jCóx..€ˆ£þ˜›ç[ö. */
+        $"5B25 3AE2 C08C 8CB0 08DD A37F 94DD 7F03"            /* [%:âÀŒŒ°.Ý£.”Ý.. */
+        $"35C9 DF27 9A9A B829 6326 A95D 91F7 0BA3"            /* 5Éß'šš¸)c&©]‘÷.£ */
+        $"7220 E220 F062 D8DE ADE2 2AD6 DDFD C9E4"            /* r â ðbØÞ­â*ÖÝýÉä */
+        $"FAAE 543D 3CCB 5230 74F7 3120 02FD 6B45"            /* ú®T=<ËR0t÷1 .ýkE */
+        $"A2AB 805B 13FB 1879 6060 5600 1847 98E5"            /* ¢«€[.û.y``V..G˜å */
+        $"BF65 2CD4 ACD7 15D0 B77E 5A0F 8095 95CA"            /* ¿e,Ô¬×.з~Z.€••Ê */
+        $"1847 D25F 7D32 1AE2 89EA 9D49 074D A3E5"            /* .GÒ_}2.â‰ê�I.M£å */
+        $"201E 8AC7 CB9C 43BC 0732 70E0 3C4F E625"            /*  .ŠÇËœC¼.2pà<Oæ% */
+        $"88E3 74DB 6FB7 7BE2 7006 F9E7 1F76 DBF3"            /* ˆãtÛo·{âp.ùç.vÛó */
+        $"C988 D665 F7AA 21E2 A5C1 E969 2917 3BA3"            /* ɈÖe÷ª!â¥Áéi).;£ */
+        $"17BF 925F F835 9827 813E DA4F EE9B 2DF3"            /* .¿’_ø5˜'�>ÚOî›-ó */
+        $"B640 95E8 70A5 B577 8C1D 99D5 797D D482"            /* ¶@•èp¥µwŒ.™Õy}Ô‚ */
+        $"E23A 56DD 644D 9623 FEE2 63D2 A3DB E146"            /* â:VÝdM–#þâcÒ£ÛáF */
+        $"FC39 35A7 6C28 63D8 5240 0C80 0000 0000"            /* ü95§l(cØR@.€.... */
+        $"0001 4095 99D3 7A7A 0A05 B673 69BC DA9C"            /* ..@•™ÓzzÂ.¶si¼Úœ */
+        $"A108 DDEA EE48 6385 0790 FEA1 1AFC 2CED"            /* ¡.ÝêîHc….�þ¡.ü,í */
+        $"2225 BE73 2ED7 00BB 2301 80FE 09DF E78E"            /* "%¾s.×.»#.€þÆßçŽ */
+        $"6FE6 4743 A0EE 0A03 4C9E F046 CDD8 E7F1"            /* oæGC îÂ.LžðFÍØçñ */
+        $"DB3F 1B67 F6E1 1F31 8096 90DF 5110 40B0"            /* Û?.göá.1€–�ßQ.@° */
+        $"0000 0000 0000 0000 C0B9 E0FC 41FB A11C"            /* ........À¹àüAû¡. */
+        $"4696 89A0 DE42 F8C7 27D0 3F03 AA51 70FD"            /* F–‰ ÞBøÇ'Ð?.ªQpý */
+        $"DC5F D7B9 AFD3 A0F3 7BAA A910 9E5C 259E"            /* Ü_×¹¯Ó ó{ª©.ž\%ž */
+        $"E4FB 8F8E 01C1 96E2 0768 FE5A 0A43 E2F8"            /* äû�Ž.Á–â.hþZÂCâø */
+        $"DA74 9500 C241 D1F6 3EFF 3F06 586F A511"            /* Út•.ÂAÑö>ÿ?.Xo¥. */
+        $"CCFE 8FE7 61E1 C392 D001 3F52 1CA8 CC23"            /* Ìþ�çaáÃ’Ð.?R.¨Ì# */
+        $"93F0 27DF 893F 4AC1 06C3 34DA 8953 BBC0"            /* “ð'߉?JÁ.Ã4Ú‰S»À */
+        $"84C0 4843 27E0 067E 5EBF FF7A 1540 4C0E"            /* „ÀHC'à.~^¿ÿz.@L. */
+        $"FA6C 44A1 A7BC DB24 6AD7 C367 EC93 33BF"            /* úlD¡§¼Û$j×Ãgì“3¿ */
+        $"FECB C1DF 83CC 5BF7 A7C0 DF62 2EFA 4283"            /* þËÁ߃Ì[÷§Àßb.úBƒ */
+        $"6E49 2492 4924 9249 2492 4924 9246 A4A5"            /* nI$’I$’I$’I$’F¤¥ */
+        $"7754 9685 B091 D8FF 1549 CF90 2079 3AFB"            /* wT–…°‘Øÿ.IÏ� y:û */
+        $"E925 85CC 62A2 E49B 476B 47B9 319B 630F"            /* é%…Ìb¢ä›GkG¹1›c. */
+        $"A6B8 182C E282 D1CD 920A 4EB3 21BF 943C"            /* ¦¸.,â‚ÑÍ’ÂN³!¿”< */
+        $"27BF CCDE BD6E 481A 188C F70B C257 8118"            /* '¿ÌÞ½nH..Œ÷.ÂW�. */
+        $"FBF7 FF78 F422 A3DB AE81 4980 0000 0000"            /* û÷ÿxô"£Û®�I€.... */
+        $"0000 0000 0000 1EE1 BFBB C300 0000 0000"            /* .......á¿»Ã..... */
+        $"0000 0000 0000 14FB 3FE1 1B7A D142 E13F"            /* .......û?á.zÑBá? */
+        $"5B6F 704A 61CF 957D 258E F744 FB26 8356"            /* [opJaÏ•}%Ž÷Dû&ƒV */
+        $"74AD 1DDB 02F2 CF85 7AEB 3A06 6F12 084E"            /* t­.Û.òÏ…zë:.o..N */
+        $"8E93 D6DA E4FE 9FBE 2D16 1C87 701F 55C3"            /* Ž“ÖÚäþŸ¾-..‡p.Uà */
+        $"9966 3E8F 36CB 6D9F F3F6 F8D3 B3B9 E2C1"            /* ™f>�6ËmŸóöøÓ³¹âÁ */
+        $"1019 C6E6 8FFF 7FDC 6948 D3AB C944 C64A"            /* ..Ææ�ÿ.ÜiHÓ«ÉDÆJ */
+        $"8000 0000 0000 0000 000A B0CB 3806 445C"            /* €........°Ë8.D\ */
+        $"7110 4CDE 3651 AC94 777C 8AB0 5382 04AF"            /* q.LÞ6Q¬”w|Š°S‚.¯ */
+        $"32E5 68C2 122F 8A5B 12A8 FF39 CF5E 72FB"            /* 2åhÂ./Š[.¨ÿ9Ï^rû */
+        $"EFD4 1669 47C6 525E 88EF 0AAC 1EE1 98B6"            /* ïÔ.iGÆR^ˆï¬.ᘶ */
+        $"0BFF 7FAF 8A4B 7158 F7D7 1707 DE93 841E"            /* .ÿ.¯ŠKqX÷×..Þ“„. */
+        $"3C82 3260 1FFF 1C8B 6A6E 8C66 0000 0000"            /* <‚2`.ÿ.‹jnŒf.... */
+        $"0000 0000 0000 0121 EF03 234C 3124 0000"            /* .......!ï.#L1$.. */
+        $"0000 0000 0000 0000 077C 5957 204B A2ED"            /* .........|YW K¢í */
+        $"59B8 F3C4 CC60 8A58 7E23 0B9F A0FD 1DC8"            /* Y¸óÄÌ`ŠX~#.Ÿ ý.È */
+        $"8E0F FE2B 5F9F 12D8 09B3 57BB 7818 3CF5"            /* Ž.þ+_Ÿ.ØƳW»x.<õ */
+        $"D579 D427 5198 BD86 E2FC 8775 915B 37A5"            /* ÕyÔ'Q˜½†âü‡u‘[7¥ */
+        $"B2E6 6BD8 8404 31D9 4C54 3621 6561 5C3E"            /* ²ækØ„.1ÙLT6!ea\> */
+        $"4A80 0000 0000 0000 0000 0014 D22D 6758"            /* J€..........Ò-gX */
+        $"336C 63A1 C13F 3E94 9877 8E90 4E5D 0C70"            /* 3lc¡Á?>”˜wŽ�N].p */
+        $"F80A 4262 C2CC C7E4 DAE8 526F 393F 4558"            /* øÂBbÂÌÇäÚèRo9?EX */
+        $"5CC9 5DDA B2FF 7ED5 F809 3A02 F1EE 2760"            /* \É]Ú²ÿ~ÕøÆ:.ñî'` */
+        $"FF7E 5037 F054 4A1B 9602 92EA 8D26 A198"            /* ÿ~P7ðTJ.–.’ê�&¡˜ */
+        $"9C4F 8238 A60E 7734 20F8 18FE 478F 5403"            /* œO‚8¦.w4 ø.þG�T. */
+        $"1658 618B A80F 879F 4A98 E809 DEB2 7CE9"            /* .Xa‹¨.‡ŸJ˜èÆÞ²|é */
+        $"9724 407B B8C8 A48D 4F33 9126 751B 9FC2"            /* —$@{¸È¤�O3‘&u.ŸÂ */
+        $"0283 44C3 5AFD 9546 FCE2 4212 4F5B 01D4"            /* .ƒDÃZý•FüâB.O[.Ô */
+        $"6E53 A032 DA91 40F4 4BDE 0C23 FF1E D5DE"            /* nS 2Ú‘@ôKÞ.#ÿ.ÕÞ */
+        $"B543 59DC C0DC 759A 6043 5883 A5FE C785"            /* µCYÜÀÜuš`CXƒ¥þÇ… */
+        $"BA68 9F46 C21A 4C50 20E3 0488 FB34 1043"            /* ºhŸFÂ.LP ã.ˆû4.C */
+        $"FC68 562B 635A EE8D E334 0C6F 25A9 E4C9"            /* ühV+cZî�ã4.o%©äÉ */
+        $"3484 2AC2 6188 7242 E3F6 AEAC 6F86 2DE2"            /* 4„*ÂaˆrBãö®¬o†-â */
+        $"C377 BD02 CB1C 9553 5485 6A5B E118 9BBD"            /* Ãw½.Ë.•ST…j[á.›½ */
+        $"DC6B 2C92 C6CC C866 6E7F FE63 AB01 FE7D"            /* Ük,’ÆÌÈfn.þc«.þ} */
+        $"FF7F BB81 EA94 87BE B101 F468 0E30 F111"            /* ÿ.»�ꔇ¾±.ôh.0ñ. */
+        $"7BC9 FA0D F87F BDD0 811B 8588 1AE7 8387"            /* {Éú.ø.½Ð�.…ˆ.烇 */
+        $"5C06 B3A9 E2ED 6E5B B524 35AA CBFF 50D6"            /* \.³©âín[µ$5ªËÿPÖ */
+        $"49D9 6918 3837 59BD E7CC 8796 B0AF 2729"            /* IÙi.87Y½ç̇–°¯') */
+        $"0512 5A97 66FF 1A85 E004 1882 0108 EA41"            /* ..Z—fÿ.…à..‚..êA */
+        $"BBCC 15E0 254C 59AF 877D 0722 15FB ADA1"            /* »Ì.à%LY¯‡}.".û­¡ */
+        $"84C2 9B83 DD5B C6B1 EE29 084C 08F7 06C8"            /* „›ƒÝ[Ʊî).L.÷.È */
+        $"4F07 9818 6BF2 66E2 582B 2F7D 29AD BAFA"            /* O.˜.kòfâX+/})­ºú */
+        $"8F9E 0AC8 60AE D10E 3E49 17BF E015 0C5E"            /* �žÂÈ`®Ñ.>I.¿à..^ */
+        $"5C51 5D5B 5BC1 6C83 C428 4505 E9BB 61CB"            /* \Q][[ÁlƒÄ(E.é»aË */
+        $"D7C2 F3C6 C102 73F5 409E D0CF B43E E497"            /* ×ÂóÆÁ.sõ@žÐÏ´>ä— */
+        $"C1E0 707B 3F6F EAA8 2F10 9285 7D9D 9F81"            /* Áàp{?oê¨/.’…}�Ÿ� */
+        $"303D 3A70 2B3F 4A45 558D 63F6 EEB9 CF21"            /* 0=:p+?JEU�cöî¹Ï! */
+        $"52C1 27C2 8439 0BE2 BE1F A553 A1C7 E44C"            /* RÁ'„9.â¾.¥S¡ÇäL */
+        $"5422 9BC0 356D 1B40 E53B 3064 AA69 F464"            /* T"›À5m.@å;0dªiôd */
+        $"7AA7 4E56 F7E2 7AE5 CB6E E538 8582 1927"            /* z§NV÷âzåËnå8…‚.' */
+        $"019D B4B0 E6D9 0F0E 9670 7723 62CF C422"            /* .�´°æÙ..–pw#bÏÄ" */
+        $"DD53 ED12 92AE 20B0 6B63 6CB3 C596 4F4E"            /* ÝSí.’® °kcl³Å–ON */
+        $"18B6 FD06 93B2 6F73 A740 770D C39F B873"            /* .¶ý.“²os§@w.߸s */
+        $"598F 3667 6F7A 29E9 9E6F 9D04 48DD A175"            /* Y�6goz)éžo�.HÝ¡u */
+        $"2AFC 61BD D706 2A8E 9789 F513 B8AF B8EA"            /* *üa½×.*Ž—‰õ.¸¯¸ê */
+        $"2426 7EDF 1EFA 1D19 7A50 D22F D15E 76FE"            /* $&~ß.ú..zPÒ/Ñ^vþ */
+        $"CD34 19AD 8126 775C A5FB B209 9658 F850"            /* Í4.­�&w\¥û²Æ–XøP */
+        $"F2FD A65F B487 9F50 7FF0 12FD BA8B FB6E"            /* òý¦_´‡ŸP.ð.ýº‹ûn */
+        $"49F5 50DF C349 B4F9 F4D7 EDEB 53BE DEB0"            /* IõPßÃI´ùô×íëS¾Þ° */
+        $"7F85 29FB 5DFF 36B9 BEDA 9BF8 3CF2 FDAE"            /* .…)û]ÿ6¹¾Ú›ø<òý® */
+        $"DFB5 ABBE D3DB ED2B FDBA CFFB 7606 FB74"            /* ßµ«¾ÓÛí+ýºÏûv.ût */
+        $"D3F8 6B96 83BA F7ED EB3F 7EDE AFE0 EECD"            /* Óøk–ƒº÷íë?~Þ¯àîÍ */
+        $"FB5E 7F6E 807E DB9B F6BD F0FE D32B EA21"            /* û^.n€~Û›ö½ðþÓ+ê! */
+        $"EFA8 1EFA 823F 6DCF FB6C 8BEA 6CFD B5AF"            /* ï¨.ú‚?mÏûl‹êlýµ¯ */
+        $"0774 CFDB D337 FB7A 3F83 BA5D F51F DF55"            /* .tÏÛÓ7ûz?ƒº]õ.ßU */
+        $"47FB 690F DA86 F791 DDD6 2CCB E6B8 C536"            /* Gûi.Ú†÷‘ÝÖ,Ëæ¸Å6 */
+        $"D512 AD5E 1B08 0B8A 8D03 2F75 60E5 6BF8"            /* Õ.­^...Š�./u`åkø */
+        $"447B C66A 7EC2 7912 B45F 8E48 277C D8E1"            /* D{Æj~Ây.´_ŽH'|Øá */
+        $"809C 5755 D718 BAAC F891 2AE5 F97C 3F5E"            /* €œWU×.º¬ø‘*åù|?^ */
+        $"0116 3A00 99F4 5896 E0EA B189 F5A5 7929"            /* ..:.™ôX–à걉õ¥y) */
+        $"C491 B57F 2232 B0C2 52F8 89B1 DB2F B284"            /* Ä‘µ."2°ÂRø‰±Û/²„ */
+        $"C1EE 0C43 EF76 FD94 F871 4077 7E19 EC36"            /* Áî.Cïvý”øq@w~.ì6 */
+        $"BBFA 6DFF 3C0B 5A98 89B4 84BB 56DB 5FC2"            /* »úmÿ<.Z˜‰´„»VÛ_ */
+        $"16C2 351A B46E AF45 AAC7 DD2E 97ED 970C"            /* .Â5.´n¯EªÇÝ.—í—. */
+        $"76D8 F8D0 42EB E639 28E8 BE33 A530 3B58"            /* vØøÐBëæ9(è¾3¥0;X */
+        $"2374 6B1C 97B0 1CD5 ACD5 615F FD30 62C6"            /* #tk.—°.Õ¬Õa_ý0bÆ */
+        $"899A 977D 4B74 CAB1 E9EE 6588 4E67 8733"            /* ‰š—}KtʱéîeˆNg‡3 */
+        $"B359 BCC7 DC7B 9884 E4A8 78CB 77E7 675D"            /* ³Y¼ÇÜ{˜„ä¨xËwçg] */
+        $"FF2D FCE4 7744 BDD1 A833 6BEC C481 2DA8"            /* ÿ-üäwD½Ñ¨3kìÄ�-¨ */
+        $"3D1C 5D57 7595 1DEB 2278 31AE 4188 B1F2"            /* =.]Wu•.ë"x1®Aˆ±ò */
+        $"54E1 113D DA75 96ED 71FF 1577 7820 4D22"            /* Tá.=Úu–íqÿ.wx M" */
+        $"2BD9 3841 A416 96A4 2549 1A9D 3A55 8E39"            /* +Ù8A¤.–¤%I.�:UŽ9 */
+        $"A929 4B4E E11F 0F88 8BB6 7E08 2210 9D21"            /* ©)KNá..ˆ‹¶~.".�! */
+        $"92BF 623B B974 D371 0208 1489 5713 0F66"            /* ’¿b;¹tÓq...‰W..f */
+        $"3C4C 8394 72A6 08A1 3D86 BA0C 198B CE8B"            /* <Lƒ”r¦.¡=†º..‹Î‹ */
+        $"FB71 18D8 E044 CE7C A642 F1E5 DC8B F8E6"            /* ûq.ØàDÎ|¦BñåÜ‹øæ */
+        $"2405 66E0 B6C5 6A4F B1AE 2231 3060 11D4"            /* $.fà¶ÅjO±®"10`.Ô */
+        $"9963 5EF4 BB3D 1F61 0807 0AE1 0DFC 4718"            /* ™c^ô»=.a..Âá.üG. */
+        $"6C97 80A7 D438 6A81 B76A 6E7E 7A64 87A1"            /* l—€§Ô8j�·jn~zd‡¡ */
+        $"1D7A 8744 3227 F565 4B4A E311 FA0F B477"            /* .z‡D2'õeKJã.ú.´w */
+        $"9DD6 0662 8844 7138 BDF8 CBCC 007F BDB6"            /* �Ö.bˆDq8½øËÌ..½¶ */
+        $"07C4 98CC 226B 9762 33D0 99EF 54D9 5800"            /* .ĘÌ"k—b3ЙïTÙX. */
+        $"509D C37B 39A7 E11B 8771 0999 AB8B AAA6"            /* P�Ã{9§á.‡qÆ™«‹ª¦ */
+        $"C463 6C38 7FB0 9121 2CA2 7634 BBEE 41FB"            /* Äcl8.°‘!,¢v4»îAû */
+        $"4F3B B050 3E38 15C4 98A6 216D 31C2 7057"            /* O;°P>8.ʦ!m1ÂpW */
+        $"0B3D 429A 6CFB 0819 EB4D B9D2 549F 6601"            /* .=Bšlû..ëM¹ÒTŸf. */
+        $"2436 5BEA 9DAC BBDA AB3A AB4F ABFF 768D"            /* $6[ê�¬»Ú«:«O«ÿv� */
+        $"E220 E451 7E45 49C5 21FD B2E6 DEFD 2505"            /* â äQ~EIÅ!ý²æÞý%. */
+        $"836B 3500 54D8 50B8 7538 C5BF B951 7FB2"            /* ƒk5.TØP¸u8Å¿¹Q.² */
+        $"F927 CBB1 7AA1 D0BD 51E2 D7F7 C440 5DA0"            /* ù'˱z¡Ð½Qâ×÷Ä@]  */
+        $"89EF FEEE BF2E A5E4 F98A B652 F25A D1DC"            /* ‰ïþî¿.¥äùŠ¶RòZÑÜ */
+        $"482A 40CB A288 250A 22CA BCB4 815D 077E"            /* H*@Ë¢ˆ%Â"ʼ´�].~ */
+        $"229E 59B2 8249 D336 A3C1 5D5B FAE5 483C"            /* "žY²‚IÓ6£Á][úåH< */
+        $"67F3 255E 1530 AFB1 D900 48FE 254B C54E"            /* gó%^.0¯±Ù.Hþ%KÅN */
+        $"42DC EE54 066B CE83 B1C9 F021 2031 8DF1"            /* BÜîT.k΃±Éð! 1�ñ */
+        $"FE58 9315 B761 79CA 409A 6CD6 337A 14A9"            /* þX“.·ayÊ@šlÖ3z.© */
+        $"8622 90BC 3474 727C 66CE 09C5 61B4 A386"            /* †"�¼4tr|fÎÆÅa´£† */
+        $"7509 819F 6EEB 5FCC C0A7 084A 7742 A6E3"            /* uÆ�Ÿnë_ÌÀ§.JwB¦ã */
+        $"F69A 90CA 24AD EB53 60AB 5FD0 FD6F 3DE6"            /* öš�Ê$­ëS`«_Ðýo=æ */
+        $"44CF 80FB A400 B71F 1DD4 C690 A3DB 54CF"            /* DÏ€û¤.·..ÔÆ�£ÛTÏ */
+        $"F492 7EC7 540C 048F 3D35 FD63 7593 751B"            /* ô’~ÇT..�=5ýcu“u. */
+        $"F88F 4B7D E355 6685 FD5F 2743 8DF3 D839"            /* ø�K}ãUf…ý_'C�óØ9 */
+        $"0894 99DB 1FAA 22B2 8800 8C9F D91F E60B"            /* .”™Û.ª"²ˆ.ŒŸÙ.æ. */
+        $"0EEE 2870 2932 2AE5 F401 11F0 8B2B 53DB"            /* .î(p)2*åô..ð‹+SÛ */
+        $"8028 E39D 744F E70B 11F3 A220 ABF4 FCD5"            /* €(ã�tOç..ó¢ «ôüÕ */
+        $"37C9 0AC8 8749 215E 1D89 4022 96D0 04FF"            /* 7ÉÂȇI!^.‰@"–Ð.ÿ */
+        $"0C57 AC3D 351A 8582 EBA4 EA2B B65B A14B"            /* .W¬=5.…‚ë¤ê+¶[¡K */
+        $"048B E031 DE15 251C 669F 8457 FF38 D131"            /* .‹à1Þ.%.fŸ„Wÿ8Ñ1 */
+        $"0027 BB20 9721 6636 A375 AFBA AF7B BDBA"            /* .'» —!f6£u¯º¯{½º */
+        $"05F3 3114 E55E DAA9 219F 9516 F3DF 12B4"            /* .ó1.å^Ú©!Ÿ•.óß.´ */
+        $"DA3F 83DF 13A0 9900 3FA6 17E9 B014 E404"            /* Ú?ƒß. ™.?¦.é°.ä. */
+        $"434D 02D4 4283 D73D F4D1 5D95 8B25 6A6A"            /* CM.ÔBƒ×=ôÑ]•‹%jj */
+        $"CD5E BA93 82DF 1A30 4B0D 0E21 65A1 0001"            /* Í^º“‚ß.0K..!e¡.. */
+        $"2869 F06A 8949 311F DB03 39EB E8E1 5BFB"            /* (iðj‰I1.Û.9ëèá[û */
+        $"F11C 05C6 2469 BAEA 4516 4CC4 DAF5 927A"            /* ñ..Æ$iºêE.LÄÚõ’z */
+        $"2CEB 3150 DB6F 4DE2 8EED 59C0 604F 9AE5"            /* ,ë1PÛoMâŽíYÀ`Ošå */
+        $"E136 83B0 F348 3D1A B44D 3A8E D77A B0DE"            /* á6ƒ°óH=.´M:Ž×z°Þ */
+        $"5267 1055 24F7 3C3D EB3E 08EF 97F9 4B29"            /* Rg.U$÷<=ë>.ï—ùK) */
+        $"454F 1B5D 4A6E 56E1 0F90 00A1 4467 7454"            /* EO.]JnVá.�.¡DgtT */
+        $"B556 362A 9A19 9E35 19E9 BFDF E2AD 91D6"            /* µV6*š.ž5.é¿ßâ­‘Ö */
+        $"7FB6 95B9 F19D 8D07 2FAF 3162 D880 0AA7"            /* .¶•¹ñ��./¯1b؀§ */
+        $"C9C4 94AD C49A 1231 2D9F 780F 6E3E 57D2"            /* ÉÄ”­Äš.1-Ÿx.n>WÒ */
+        $"8C1C 582C 179A 721C 7063 F056 F938 4EA1"            /* Œ.X,.šr.pcðVù8N¡ */
+        $"F3E4 E458 D254 280F 92CA ABDC 4ECF 3EB7"            /* óääXÒT(.’Ê«ÜNÏ>· */
+        $"95DF A3B8 45C0 1427 BA54 B2E2 D1BC B67D"            /* •ß£¸EÀ.'ºT²âѼ¶} */
+        $"5A0F EE12 37D4 BE1C 5785 A90D 2E62 B301"            /* Z.î.7Ô¾.W…©..b³. */
+        $"F66D A637 374B 17DA 7446 C318 3B11 4F50"            /* öm¦77K.ÚtFÃ.;.OP */
+        $"ED27 AEB2 D8F6 C3E4 AB48 5E7C 1D46 9463"            /* í'®²ØöÃä«H^|.F”c */
+        $"E7BA 9296 7BFA FDBB 39F2 7E86 1A5D 8FFA"            /* 纒–{úý»9ò~†.]�ú */
+        $"7E06 FC92 3472 7950 8B67 8329 FA9F 47AA"            /* ~.ü’4ryP‹gƒ)úŸGª */
+        $"51F3 01AD A6DA 224F E711 AF6F BA8F FA86"            /* Qó.­¦Ú"Oç.¯oº�ú† */
+        $"FF61 EBD1 5613 B076 3543 3515 FF1B 1E9C"            /* ÿaëÑV.°v5C5.ÿ..œ */
+        $"CE78 6A36 7CCF FD63 E9E3 00E6 EA60 1DBE"            /* Îxj6|Ïýcéã.æê`.¾ */
+        $"42FB 3E66 D69D 8BA6 A0E6 13E1 2087 20D7"            /* Bû>fÖ�‹¦ æ.á ‡ × */
+        $"7941 E3C4 C7C6 67FF 2C9C A486 253A C206"            /* yAãÄÇÆgÿ,œ¤†%:Â. */
+        $"F961 4A0E D9DD D32A 6D67 A012 B1A2 B549"            /* ùaJ.ÙÝÓ*mg .±¢µI */
+        $"3F58 8BA1 CA98 94EB 6099 570C D139 09AA"            /* ?X‹¡Ê˜”ë`™W.Ñ9ƪ */
+        $"8DEB C31A 0812 5DAD 2926 6846 D789 4430"            /* �ëÃ...]­)&hF׉D0 */
+        $"4931 16B5 0804 52F1 040D B0A7 DDD7 7052"            /* I1.µ..Rñ..°§Ý×pR */
+        $"4269 C765 98AA 3941 F9EE 987A 2EAD 46BE"            /* BiÇe˜ª9Aùî˜z.­F¾ */
+        $"AA2B DD79 D9F9 7AF7 9318 B633 97CC DB93"            /* ª+ÝyÙùz÷“.¶3—ÌÛ“ */
+        $"5AF7 23D4 08E5 1FD7 EA45 85E9 4C98 77B6"            /* Z÷#Ô.å.×êE…éL˜w¶ */
+        $"0038 8756 6C8F 1A76 8D36 D67C 0BBD 248F"            /* .8‡Vl�.v�6Ö|.½$� */
+        $"8465 4CC4 7B7A C1B7 6348 F763 66A7 F04E"            /* „eLÄ{zÁ·cH÷cf§ðN */
+        $"FF4E 1C72 1053 323F 9E55 F75D 4097 9C24"            /* ÿN.r.S2?žU÷]@—œ$ */
+        $"AD5D 3C1B 766A 50A8 7252 6563 2687 8251"            /* ­]<.vjP¨rRec&‡‚Q */
+        $"8AE2 2EAE 6AA9 6439 2831 281E 034D 7999"            /* Šâ.®j©d9(1(..My™ */
+        $"F46F 47C1 911D 553A D887 0E8F 6E83 1B48"            /* ôoGÁ‘.U:؇.�nƒ.H */
+        $"F0D9 C566 C0FF 0F02 5E68 EA76 7381 25B1"            /* ðÙÅfÀÿ..^hêvs�%± */
+        $"D388 A375 370B A655 625B B71A 191C CD9D"            /* Óˆ£u7.¦Ub[·...Í� */
+        $"F3CA 83B2 88D6 3712 B3E3 6CEA 19DC 3295"            /* óʃ²ˆÖ7.³ãlê.Ü2• */
+        $"3398 DF4F 1279 B346 1DD8 ED24 186F BEE1"            /* 3˜ßO.y³F.Øí$.o¾á */
+        $"8FD4 5FAD EAFF 6960 DE17 A0A4 B89E 7CF3"            /* �Ô_­êÿi`Þ. ¤¸ž|ó */
+        $"C360 9DA8 91BF 470F ECC0 C0AA E260 3430"            /* Ã`�¨‘¿G.ìÀÀªâ`40 */
+        $"EF4E CAD6 F964 05B0 8E27 C1F6 7516 4350"            /* ïNÊÖùd.°Ž'Áöu.CP */
+        $"B87D 7D16 703E 7972 1232 2E0F 6577 664C"            /* ¸}}.p>yr.2..ewfL */
+        $"8FA6 1414 7FB2 A33D A69E FD2F CF21 FC8F"            /* �¦...²£=¦žý/Ï!ü� */
+        $"23A5 6AED 3E28 34A0 F73F F7D6 7F7C 5B6B"            /* #¥jí>(4 ÷?÷Ö.|[k */
+        $"0596 8B6D BACA 52DF 8E72 CDBA E221 7092"            /* .–‹mºÊRߎrͺâ!p’ */
+        $"A3AB B99D 1EE3 3F21 1AD2 0F0B DC5A 8BE1"            /* £«¹�.ã?!.Ò..ÜZ‹á */
+        $"9E35 D891 9A60 EF28 5934 FA3B 8009 DC42"            /* ž5Ø‘š`ï(Y4ú;€ÆÜB */
+        $"11BE 487F D776 AF26 0EBD BF3E 8DCC B940"            /* .¾H.×v¯&.½¿>�̹@ */
+        $"2523 D6E1 447F EA8A 5F66 DE0B 0962 249E"            /* %#ÖáD.êŠ_fÞ.Æb$ž */
+        $"165D BB6D 1EBD 1237 021B F903 DEEF 78FE"            /* .]»m.½.7..ù.Þïxþ */
+        $"B3F3 76B7 429F 336D 0EFA FF47 5CBC E3DF"            /* ³óv·BŸ3m.úÿG\¼ãß */
+        $"FC44 41BA BC9D 67AE 0B43 D817 FBCE 4F36"            /* üDAº¼�g®.CØ.ûÎO6 */
+        $"8209 CCB5 38F6 712E 7DEA 4E9E 4B38 3B80"            /* ‚Æ̵8öq.}êNžK8;€ */
+        $"7B16 28E3 AB59 340E 93F0 4C65 C281 A4F1"            /* {.(ã«Y4.“ðLeÂ�¤ñ */
+        $"08E4 26A6 31AA B6A4 F784 BA8E C7FA 8919"            /* .ä&¦1ª¶¤÷„ºŽÇú‰. */
+        $"4B19 FA98 09C8 3C79 27DA CB39 881C 3B0E"            /* K.ú˜ÆÈ<y'ÚË9ˆ.;. */
+        $"9BEA 1EF3 D655 CFEB B4F7 0888 971D 69EF"            /* ›ê.óÖUÏë´÷.ˆ—.iï */
+        $"1105 0EF2 80B8 FF1E F0BE 107F 9AB0 6C52"            /* ...ò€¸ÿ.ð¾..š°lR */
+        $"FF78 3AA4 8FE0 3370 40DF C5E8 478A 2FCF"            /* ÿx:¤�à3p@ßÅèGŠ/Ï */
+        $"96C5 8D32 8E07 AA93 DA95 4D9B 60C6 2748"            /* –Å�2Ž.ª“Ú•M›`Æ'H */
+        $"C8F4 8347 D2D9 2E35 75E4 333A 6494 B177"            /* ÈôƒGÒÙ.5uä3:d”±w */
+        $"C836 6E4F AF08 CDB0 0FA5 D565 A0EC 946F"            /* È6nO¯.Í°.¥Õe ì”o */
+        $"ED5C 03F6 E5DB FA4F D29A BF8F BC7F 12D8"            /* í\.öåÛúOÒš¿�¼..Ø */
+        $"7730 8564 524D 4B31 F681 8C71 C5BC 1641"            /* w0…dRMK1ö�Œqż.A */
+        $"6988 F9CF 0385 B8EE 4C04 07DB 5AD2 531C"            /* iˆùÏ.…¸îL..ÛZÒS. */
+        $"48BA 3E6F E24E AF73 DB5E B729 A4BF 894A"            /* Hº>oâN¯sÛ^·)¤¿‰J */
+        $"782D E8F2 91C9 E628 322C F20C 2D0C 73DD"            /* x-èò‘Éæ(2,ò.-.sÝ */
+        $"F093 4ED7 63DF E121 E7B9 DB7E 530D E3BD"            /* ð“N×cßá!ç¹Û~S.ã½ */
+        $"3469 29CE 5768 BE0F 1E91 46B7 00A0 CC2E"            /* 4i)ÎWh¾..‘F·. Ì. */
+        $"183D 7D57 762C 062D 0707 EBA4 177D 73E8"            /* .=}Wv,.-..ë¤.}sè */
+        $"FA30 83A6 479B AA9A 702E B8FD 9B54 0FF3"            /* ú0ƒ¦G›ªšp.¸ý›T.ó */
+        $"8222 1EB0 4CDD 4CF7 F0AB 8972 B655 9426"            /* ‚".°LÝL÷ð«‰r¶U”& */
+        $"4EEE 3B88 A6D2 F8B9 6845 0467 D606 9DDD"            /* Nî;ˆ¦Òø¹hE.gÖ.�Ý */
+        $"C547 A61F 71E7 5A8E 6B83 51FD B2C1 A732"            /* ÅG¦.qçZŽkƒQý²Á§2 */
+        $"A6EA A0AA 6D13 E80B 0EC4 5DF4 348F FF6E"            /* ¦ê ªm.è..Ä]ô4�ÿn */
+        $"2289 CFB4 1AE2 18D1 340F B29B E1FF 16B1"            /* "‰Ï´.â.Ñ4.²›áÿ.± */
+        $"0F0F B5AD 260A 7FD9 B1F2 3D0C 404F 75A8"            /* ..µ­&Â.Ù±ò=.@Ou¨ */
+        $"E4DB 52EE 259B D762 E5E5 4FFD 22AC 4856"            /* äÛRî%›×bååOý"¬HV */
+        $"9C62 8DDB F5D8 58F8 4EC7 1110 30EC E0D8"            /* œb�ÛõØXøNÇ..0ìàØ */
+        $"7FED 0176 FEF2 53B3 75C6 34E1 A3A7 79DA"            /* .í.vþòS³uÆ4ᣧyÚ */
+        $"1FDC 42EC 83B2 F3EB 056C E41B 4E65 3699"            /* .ÜB샲óë.lä.Ne6™ */
+        $"4BD6 1AE3 85A9 DBF6 89D4 39B0 79F9 8877"            /* KÖ.ã…©Ûö‰Ô9°yùˆw */
+        $"161C 2CB5 3F3C 294B 8CA3 A6F6 556C 4CAD"            /* ..,µ?<)KŒ£¦öUlL­ */
+        $"A752 918D 7E61 BA54 02D2 CF5C AEBE 1A0B"            /* §R‘�~aºT.ÒÏ\®¾.. */
+        $"B75C A9CA 9876 AB0B 6028 4D8E D46C E479"            /* ·\©Ê˜v«.`(MŽÔläy */
+        $"A186 EA09 496E 0935 04E2 4C25 FA18 270B"            /* ¡†êÆInÆ5.âL%ú.'. */
+        $"A054 DE1C 1BD8 A089 9D95 1335 E93C 7C21"            /*  TÞ..Ø ‰�•.5é<|! */
+        $"435E A570 3C42 AA88 0075 BB20 20AF 90EC"            /* C^¥p<Bªˆ.u»  ¯�ì */
+        $"26F9 7E41 5CC7 2154 63A3 D965 075C 1A78"            /* &ù~A\Ç!Tc£Ùe.\.x */
+        $"2A13 753E DDD9 F846 467C EFC6 5308 2B46"            /* *.u>ÝÙøFF|ïÆS.+F */
+        $"5BD9 2BFF 5F26 72DB 523D D0FC CE49 47B0"            /* [Ù+ÿ_&rÛR=ÐüÎIG° */
+        $"D98B 4D36 1B60 7C3A 0707 F46A 8565 4CCB"            /* Ù‹M6.`|:..ôj…eLË */
+        $"5DC1 A50D C039 BF24 7418 78A7 6D4F DE55"            /* ]Á¥.À9¿$t.x§mOÞU */
+        $"1CB8 B787 158C 6C4D D840 920F 3130 7A92"            /* .¸·‡.ŒlMØ@’.10z’ */
+        $"1CF4 1B74 BC2B 8954 0A80 9636 BFC3 6330"            /* .ô.t¼+‰T€–6¿Ãc0 */
+        $"3E7F 7E4E A811 39F2 3D56 10D3 6A76 4E20"            /* >.~N¨.9ò=V.ÓjvN  */
+        $"F646 5CD3 9166 D2D6 046F E398 A934 2D04"            /* öF\Ó‘fÒÖ.o㘩4-. */
+        $"2E01 C602 1332 8274 6AE2 D5C9 6226 30B3"            /* ..Æ..2‚tjâÕÉb&0³ */
+        $"07DB FDF3 B3BB 6C31 B162 FF63 0639 8E6F"            /* .Ûýó³»l1±bÿc.9Žo */
+        $"3501 A54C 1AA6 42EB EDE7 885E EE2F A6D9"            /* 5.¥L.¦Bëíçˆ^î/¦Ù */
+        $"B74A AE20 8FFB 6FCF A537 642D F17F A45E"            /* ·J® �ûoÏ¥7d-ñ.¤^ */
+        $"EE37 DE05 7569 A81E F464 A35B 603B 4F40"            /* î7Þ.ui¨.ôd£[`;O@ */
+        $"D00F C3D2 D04A F943 AC3C 37E2 1B2B A1D3"            /* Ð.ÃÒÐJùC¬<7â.+¡Ó */
+        $"09D6 A92B F7CB B2FA 9FF7 97F2 83F9 BABC"            /* ÆÖ©+÷˲úŸ÷—òƒùº¼ */
+        $"E4BE F015 E804 97FC A16F 6E8B 9004 8424"            /* ä¾ð.è.—ü¡on‹�.„$ */
+        $"04F7 1295 0A15 3C1A AA5D 6A75 372A 0BB4"            /* .÷.•Â.<.ª]ju7*.´ */
+        $"4849 DD4A 012F D969 23A9 FBA7 C3EB D29F"            /* HIÝJ./Ùi#©û§ÃëÒŸ */
+        $"5CE0 BD6F 8436 26BB 1B52 3BCB DCAA 0791"            /* \à½o„6&».R;Ëܪ.‘ */
+        $"02B3 8EC7 5A89 D402 C9FF 058E E2C8 AD72"            /* .³ŽÇZ‰Ô.Éÿ.ŽâÈ­r */
+        $"01BF D9B3 FA52 B000 0000 3090 8B4E 8809"            /* .¿Ù³úR°...0�‹NˆÆ */
+        $"9E4F 59A7 8021 D030 169B 78E6 55B4 9FB8"            /* žOY§€!Ð0.›xæU´Ÿ¸ */
+        $"48A1 D2F4 BE8E A948 A89E 5E3E BE56 AE8C"            /* H¡Òô¾Ž©H¨ž^>¾V®Œ */
+        $"BF6C 6485 F435 4906 BE37 4D88 589A 85C0"            /* ¿ld…ô5I.¾7MˆXš…À */
+        $"5278 59EC 1FED 3652 3FE0 5229 0524 D686"            /* RxYì.í6R?àR).$Ö† */
+        $"1E5E 14D9 8C56 8742 9625 36BB 4674 0391"            /* .^.ÙŒV‡B–%6»Ft.‘ */
+        $"9647 FCC9 30C4 6D0D 5812 1271 E9C8 E89D"            /* –GüÉ0Äm.X..qéÈè� */
+        $"7F9B 3420 0269 5F58 4554 F964 BDDA E9F3"            /* .›4 .i_XETùd½Úéó */
+        $"973A 5B5F 4C59 107B 2D9E 87CB D896 1F13"            /* —:[_LY.{-ž‡ËØ–.. */
+        $"AC52 F00D 3600 9104 3FF2 399A 0158 5153"            /* ¬Rð.6.‘.?ò9š.XQS */
+        $"139A A5C2 51CC D2C7 D082 C2A0 E35B FE05"            /* .š¥ÂQÌÒÇЂ ã[þ. */
+        $"06C9 DBB4 7036 39DB 80AF 4642 9F53 170C"            /* .ÉÛ´p69Û€¯FBŸS.. */
+        $"2856 38D5 0FA7 B562 4ED8 3BB5 B48A B1C8"            /* (V8Õ.§µbNØ;µ´Š±È */
+        $"B20B 4B42 4499 C5C1 242B A1BA CB74 D8F1"            /* ².KBD™ÅÁ$+¡ºËtØñ */
+        $"1CF1 241E 7A2A B847 111D 13DC CD3C 05A3"            /* .ñ$.z*¸G...ÜÍ<.£ */
+        $"024F 25B5 41E2 0A15 E1C4 1A0E A5D8 0742"            /* .O%µAâÂ.áÄ..¥Ø.B */
+        $"A359 2372 FD88 7447 1DB7 F766 5B7F E63E"            /* £Y#rýˆtG.·÷f[.æ> */
+        $"26B8 BC6E 7B72 E331 2BE1 73BD 04A0 E941"            /* &¸¼n{rã1+ás½. éA */
+        $"45EC 9039 8769 8BFF 1624 8D43 CA24 9D0D"            /* Eì�9‡i‹ÿ.$�CÊ$�. */
+        $"A05B F467 7401 E777 0608 C4A6 A698 9A9B"            /*  [ôgt.çw..Ħ¦˜š› */
+        $"7066 11D3 606F 857E 18D8 D9D3 E226 38C0"            /* pf.Ó`o…~.ØÙÓâ&8À */
+        $"D89B 09D9 A2F1 0171 BAC9 D7BF AB2E BD58"            /* Ø›ÆÙ¢ñ.qºÉ׿«.½X */
+        $"7178 6CC2 608D 447D D92A 621C 1A82 B764"            /* qxlÂ`�D}Ù*b..‚·d */
+        $"2ABE CBE8 07C0 E2A6 9B83 46A8 1109 FC87"            /* *¾Ëè.À⦛ƒF¨.Æü‡ */
+        $"F083 9598 26AE 8847 7E22 278D 9311 59FC"            /* ðƒ•˜&®ˆG~"'�“.Yü */
+        $"2995 1D44 BA58 24BC 2A99 3946 0E00 9144"            /* )•.DºX$¼*™9F..‘D */
+        $"9113 0297 29E3 A7B5 B937 2D23 8405 86ED"            /* ‘..—)㧵¹7-#„.†í */
+        $"29F1 5254 6A8C 0FB8 4B13 F6C3 6028 2C14"            /* )ñRTjŒ.¸K.öÃ`(,. */
+        $"3B80 E317 225C 7A9B 405C 7E95 A2E4 311B"            /* ;€ã."\z›@\~•¢ä1. */
+        $"076A D7B8 A4B5 225A 1F29 FAA2 8239 D98F"            /* .j׸¤µ"Z.)ú¢‚9Ù� */
+        $"071A F302 DA24 AE80 2AC0 D108 035D EA76"            /* ..ó.Ú$®€*ÀÑ..]êv */
+        $"2F7E 850F 9E87 6B19 B2F1 F1E5 F5B3 A5AF"            /* /~….ž‡k.²ññåõ³¥¯ */
+        $"35BB D867 8257 8A48 5E4F 6983 E22E 6DAD"            /* 5»Øg‚WŠH^Oiƒâ.m­ */
+        $"D361 1505 ECF2 3F3C DB84 1861 E5AB 6793"            /* Óa..ìò?<Û„.aå«g“ */
+        $"910D 8F56 6BB5 FD17 29DB 242A 6946 8022"            /* ‘.�Vkµý.)Û$*iF€" */
+        $"7DAF 8120 02EB C840 3765 69EC BB8B F2FF"            /* }¯� .ëÈ@7ei컋òÿ */
+        $"6031 7BE4 EFC4 BECD 7BD7 CB0A 8B8C 75C2"            /* `1{äïľÍ{×Ë‹Œu */
+        $"E63A F4E4 B05B 1442 0CB1 BEBD E078 84F5"            /* æ:ôä°[.B.±¾½àx„õ */
+        $"3D95 24FA 952F 949B AD72 01B7 1CC7 4CA6"            /* =•$ú•/”›­r.·.ÇL¦ */
+        $"78C2 BA05 B757 517A 5CB1 A380 0C23 0680"            /* xº.·WQz\±£€.#.€ */
+        $"3113 0CBA 23B8 AA48 F832 B74F 997E 6E03"            /* 1..º#¸ªHø2·O™~n. */
+        $"D16C 577F 968F E9A4 73CA DA79 07B3 A5F1"            /* ÑlW.–�é¤sÊÚy.³¥ñ */
+        $"2D20 C13D F821 62F9 41A0 A7AA 472A 368A"            /* - Á=ø!bùA §ªG*6Š */
+        $"28EE 7686 F7B4 D5CF 225E 004E 709F C4E8"            /* (îv†÷´ÕÏ"^.NpŸÄè */
+        $"FCBC B778 C976 A1E0 1968 1EF9 E998 2DC2"            /* ü¼·xÉv¡à.h.ùé˜- */
+        $"1693 C645 A4F5 787A 5B10 45C0 F010 8596"            /* .“ÆE¤õxz[.EÀð.…– */
+        $"A0F6 E8AA 1BAC C958 C0F6 101E 0C4D 2E61"            /*  öèª.¬ÉXÀö...M.a */
+        $"B76E 4019 58DD 3058 000C 2375 6EBC 6599"            /* ·n@.XÝ0X..#un¼e™ */
+        $"BEA3 9ADC 0002 F98F 24B3 B036 EA0D F2FD"            /* ¾£šÜ..ù�$³°6ê.òý */
+        $"6823 E10A 59D7 5D0B F6C0 EFB2 7D9D A684"            /* h#áÂY×].öÀï²}�¦„ */
+        $"3084 4AD6 92F2 BFB2 57CA 7294 FF2D 53C8"            /* 0„JÖ’ò¿²WÊr”ÿ-SÈ */
+        $"8D05 254E 2360 582F CE0C E209 240D FAB4"            /* �.%N#`X/Î.âÆ$.ú´ */
+        $"C638 2103 7462 2AF1 5461 2036 09B4 294F"            /* Æ8!.tb*ñTa 6Æ´)O */
+        $"52A6 6553 F6B7 85F6 E77F A8B7 058C F201"            /* R¦eSö·…öç.¨·.Œò. */
+        $"19BA D75B 6612 0013 CFA6 F54F 8855 C000"            /* .º×[f...ϦõOˆUÀ. */
+        $"00BE 57DE C13B 77B0 AF81 F95D 8E88 7224"            /* .¾WÞÁ;w°¯�ù]Žˆr$ */
+        $"002F C7BE 1D06 F540 58EF 1909 1D8F 037F"            /* ./Ǿ..õ@Xï.Æ.�.. */
+        $"E973 290F 641E 8849 F996 EA66 D15C CA23"            /* és).d.ˆIù–êfÑ\Ê# */
+        $"C620 3090 94D8 F95F C58C 720B 7FFE 206C"            /* Æ 0�”Øù_ÅŒr..þ l */
+        $"A3E0 EE49 AE89 4586 6617 FE87 4D7B D300"            /* £àîI®‰E†f.þ‡M{Ó. */
+        $"4CF6 E77F A882 E041 362F 710E AC03 D573"            /* Löç.¨‚àA6/q.¬.Õs */
+        $"69FF 7480 0018 484B 0D10 C800 0000 0C24"            /* iÿt€..HK..È....$ */
+        $"183F ADBF D900 0184 8481 E82C C758 1848"            /* .?­¿Ù..„„�è,ÇX.H */
+        $"4840 6806 1212 B020 EA50 0818 484B F6E7"            /* H@h...° êP..HKöç */
+        $"7FA5 E774 6249 2F3D 5FF9 2FC0 0C24 1656"            /* .¥çtbI/=_ù/À.$.V */
+        $"1B91 8000 1846 D5F4 CA01 40C2 3F26 3D84"            /* .‘€..FÕôÊ.@Â?&=„ */
+        $"7B4A 811F 08D6 B47D 05C2 4402 D57B C1FC"            /* {J�..Ö´}.ÂD.Õ{Áü */
+        $"7D32 E6FE 8125 F24E 514B 2820 7323 F96F"            /* }2æþ�%òNQK( s#ùo */
+        $"B1F9 CDBD 94E4 C9BF 81D6 5A26 1C08 2131"            /* ±ùͽ”äÉ¿�ÖZ&..!1 */
+        $"FF58 608E A4BB BEFD 703F C3EA B596 2AEA"            /* ÿX`Ž¤»¾ýp?Ãêµ–*ê */
+        $"48B2 2319 2F7A B9BC A14D EAB4 49CF 89E9"            /* H²#./z¹¼¡Mê´Iωé */
+        $"D312 5979 1910 6519 C45E 4B88 F709 D65D"            /* Ó.Yy..e.Ä^Kˆ÷ÆÖ] */
+        $"BF0F 86DC C883 8469 9757 7FC7 FB91 A851"            /* ¿.†Üȃ„i—W.Çû‘¨Q */
+        $"7834 0232 03F5 F552 B022 E799 431E 3FE8"            /* x4.2.õõR°"ç™C.?è */
+        $"BE7C A37B AAE1 D04F 9795 EA98 CAB0 6816"            /* ¾|£{ªáÐO—•ê˜Ê°h. */
+        $"047F 244A 2BD3 E0CF B862 B172 B1B3 F027"            /* ..$J+Óàϸb±r±³ð' */
+        $"6505 A5AA 6AB2 5F8E B98F 85CB D487 2603"            /* e.¥ªj²_Ž¹�…ËÔ‡&. */
+        $"BDA4 4C6D 4B74 0A12 117F 6137 6A30 37CE"            /* ½¤LmKtÂ...a7j07Î */
+        $"0441 188C 63FC 46ED 5C9A B6A0 9012 6450"            /* .A.ŒcüFí\š¶ �.dP */
+        $"A042 C4D3 8E69 8930 0797 25B3 B70D 5C62"            /*  BÄÓŽi‰0.—%³·.\b */
+        $"6A83 3964 5EF1 4A28 508D FF7F E847 17D0"            /* jƒ9d^ñJ(P�ÿ.èG.Ð */
+        $"7C91 F4BC AA82 5462 99EF FF79 5A7A E45E"            /* |‘ô¼ª‚Tb™ïÿyZzä^ */
+        $"98FF 5B1E 90FE 7F80 9453 7AD1 4A63 8FFC"            /* ˜ÿ[.�þ.€”SzÑJc�ü */
+        $"1B61 796C 4B90 7FE9 1959 752B 8579 95F8"            /* .aylK�.é.Yu+…y•ø */
+        $"C5B9 7EC6 2D24 5185 1BCE 12D6 B418 B42C"            /* Ź~Æ-$Q….Î.Ö´.´, */
+        $"D40F 7AF7 657E 5184 9CAA 8834 B65C 4785"            /* Ô.z÷e~Q„œªˆ4¶\G… */
+        $"B934 7C3A 8000 0000 99F5 3F06 3790 6AF7"            /* ¹4|:€...™õ?.7�j÷ */
+        $"0769 9D8E F19F 4FF3 EDE6 D059 B97C A1F0"            /* .i�ŽñŸOóíæÐY¹|¡ð */
+        $"0CE2 4FAF B846 8CCE 52E4 E898 D2E0 00A3"            /* .âO¯¸FŒÎRäè˜Òà.£ */
+        $"CB3D F2B1 E7F7 0C30 FF13 DB29 474C C00D"            /* Ë=ò±ç÷.0ÿ.Û)GLÀ. */
+        $"C6B7 6A2D 2F89 8E2F BDE7 F2BA C3DD 591B"            /* Æ·j-/‰Ž/½çòºÃÝY. */
+        $"CEDE C7DD 35BA 492C BB53 2AF6 7315 AC30"            /* ÎÞÇÝ5ºI,»S*ös.¬0 */
+        $"17D7 1C05 3AE4 4AB3 8D31 0DC9 7A9F 0A76"            /* .×..:äJ³�1.ÉzŸÂv */
+        $"B4EE 95EE 6CB5 1C6A FE4F D27E 0966 CE51"            /* ´î•îlµ.jþOÒ~ÆfÎQ */
+        $"8607 E144 F4AD E999 5480 05FF 7FC2 C645"            /* †.áDô­é™T€.ÿ.ÂÆE */
+        $"D136 BB6E 89FA 9A2D F827 338F FEB9 B248"            /* Ñ6»n‰úš-ø'3�þ¹²H */
+        $"23A6 377D 0E53 BBF3 D290 3AD8 F58B CE4C"            /* #¦7}.S»óÒ�:Øõ‹ÎL */
+        $"24CA 8E49 76ED DA48 8856 904D C31F 305F"            /* $ÊŽIvíÚHˆV�MÃ.0_ */
+        $"C441 7DAA 86D8 3FE1 5EA7 E20A CDBC 5F2A"            /* ÄA}ª†Ø?á^§âÂͼ_* */
+        $"35DC 107F DDE2 D88C 7B38 D700 4C54 9C81"            /* 5Ü..ÝâØŒ{8×.LTœ� */
+        $"B8FD F39D 0F47 DE2B 6E17 7D4F E30F F60C"            /* ¸ýó�.GÞ+n.}Oã.ö. */
+        $"0895 5694 3006 1211 EFEC D7F8 F743 3D43"            /* .•V”0...ïì×ø÷C=C */
+        $"6BA5 7C06 9025 9188 E369 0FC8 94CB F38E"            /* k¥|.�%‘ˆãi.È”ËóŽ */
+        $"DF76 CA67 91C4 D786 F34F 1E56 332B 1404"            /* ßvÊg‘Ä׆óO.V3+.. */
+        $"B66B 2702 B13D 47B8 1FBD 38D7 A2DF 54EF"            /* ¶k'.±=G¸.½8×¢ßTï */
+        $"FD1C 00CC 5D05 5B28 3EBF 2FC7 7263 5880"            /* ý..Ì].[(>¿/ÇrcX€ */
+        $"0364 4A0B 982F 4A13 A55F 5D64 61D2 110C"            /* .dJ.˜/J.¥_]daÒ.. */
+        $"4319 318A 5BD6 94B7 DBA9 92F0 379B 0E87"            /* C.1Š[Ö”·Û©’ð7›.‡ */
+        $"4561 92A0 0000 0000 0000 12FE B897 0ABD"            /* Ea’ .......þ¸—½ */
+        $"B3C7 FEA8 AE43 B177 DA3F 2BA3 2D59 3358"            /* ³Çþ¨®C±wÚ?+£-Y3X */
+        $"9FAE 567F E53B 2877 9FFF 7FFF 7FFB 4B90"            /* Ÿ®V.å;(wŸÿ.ÿ.ûK� */
+        $"C00D FEA3 7DF6 39C4 C825 2952 2C65 8FFF"            /* À.þ£}ö9ÄÈ%)R,e�ÿ */
+        $"7E91 DB49 1333 7DEC 6471 1E2E 394E A080"            /* ~‘ÛI.3}ìdq..9N € */
+        $"C1C9 0DD4 62C4 4FC9 E332 BC0D F9DD FEAB"            /* ÁÉ.ÔbÄOÉã2¼.ùÝþ« */
+        $"9D33 8271 2A01 8484 B009 6058 624E 2736"            /* �3‚q*.„„°Æ`XbN'6 */
+        $"529C A0F4 BCBB 846D 32FD 407C FA84 2D52"            /* Rœ ô¼»„m2ý@|ú„-R */
+        $"21DC 1623 210B 0410 4061 212D 0386 04FF"            /* !Ü.#!...@a!-.†.ÿ */
+        $"7F72 1DFF 6F83 6A31 2B6E 0A6B D1F1 9A43"            /* .r.ÿoƒj1+nÂkÑñšC */
+        $"F340 2C47 D413 DFAC FF76 46AC 4BDD 55F0"            /* ó@,GÔ.߬ÿvF¬KÝUð */
+        $"2F9A 3BC6 613E 2F69 F45C 08F3 3FCB F83F"            /* /š;Æa>/iô\.ó?Ëø? */
+        $"F7D8 DC38 0F99 4764 0309 0948 41C6 1212"            /* ÷ØÜ8.™Gd.ÆÆHAÆ.. */
+        $"293B 5EA3 BE56 F760 BAEF 61FF 43D4 2891"            /* );^£¾V÷`ºïaÿCÔ(‘ */
+        $"A380 672E FF7E 4B98 FBFB 1ACD 90F6 4A7E"            /* £€g.ÿ~K˜ûû.Í�öJ~ */
+        $"3B14 E9F4 B1B4 4120 E600 AF42 0056 B131"            /* ;.éô±´A æ.¯B.V±1 */
+        $"0310 EF4F EA97 E030 9090 A298 F514 CEFA"            /* ..ïOê—à0��¢˜õ.Îú */
+        $"B200 0061 211A A495 FD76 5850 B8F7 1CF1"            /* ²..a!.¤•ývXP¸÷.ñ */
+        $"A979 F478 5BFF 7FFB E6D6 F6D8 03FF 7FFD"            /* ©yôx[ÿ.ûæÖöØ.ÿ.ý */
+        $"2A36 38D4 BA43 6280 D508 C4BD 735D 1C6F"            /* *68ÔºCb€Õ.Ľs].o */
+        $"2444 63E9 1C9A 969F 90A6 F34E D24D 94F2"            /* $Dcé.š–Ÿ�¦óNÒM”ò */
+        $"1A09 F86A 2762 886F FBA0 96EA 1DC7 0364"            /* .Æøj'bˆoû –ê.Ç.d */
+        $"6192 A000 0000 0000 0000 0000 0061 BE9F"            /* a’ ..........a¾Ÿ */
+        $"2C25 5C25 4958 1428 AA60 5ABF 5551 6084"            /* ,%\%IX.(ª`Z¿UQ`„ */
+        $"D319 B739 1DC3 F92F 03A7 CF66 39CC 13BE"            /* Ó.·9.Ãù/.§Ïf9Ì.¾ */
+        $"100A 204E 9A06 CBD9 A8ED 9E4D CEED AE53"            /* . Nš.ËÙ¨ížMÎí®S */
+        $"023D B3BF AC07 F70E F7DD 2601 E2B4 B214"            /* .=³¿¬.÷.÷Ý&.â´². */
+        $"3B1D 74CD 0F60 7063 EFC5 24B8 3B0F DF21"            /* ;.tÍ.`pcïÅ$¸;.ß! */
+        $"2929 3755 A800 7D09 63D9 1548 5D89 6D22"            /* ))7U¨.}ÆcÙ.H]‰m" */
+        $"FAEF 37DC EB96 FF52 0018 EBDF 464C 8B34"            /* úï7Üë–ÿR..ëßFL‹4 */
+        $"DF85 2990 1CF1 7C84 CEDC D384 5003 D5A1"            /* ß…)�.ñ|„ÎÜÓ„P.Õ¡ */
+        $"2797 DBDC FDFB 0E8C 3703 470D 1FD5 B974"            /* '—ÛÜýû.Œ7.G..Õ¹t */
+        $"5A32 CF32 3D2A 0213 FDC8 8A0C B595 4840"            /* Z2Ï2=*..ýÈŠ.µ•H@ */
+        $"C240 6E40 D585 AF4C 004A F98F FC90 E5BB"            /* Â@n@Õ…¯L.Jù�ü�å» */
+        $"D6AD 2A34 0A6E 1D4D 933D 2221 80B7 C8EF"            /* Ö­*4Ân.M“="!€·Èï */
+        $"7C61 2953 2991 F91A 61A3 B54E 56D2 77E1"            /* |a)S)‘ù.a£µNVÒwá */
+        $"1DB8 8B5F 5E9C 7D32 80A0 C23F BBE6 A2B2"            /* .¸‹_^œ}2€ Â?»æ¢² */
+        $"D49F C777 4BE6 FDA6 7B0F 2983 E19B 84FF"            /* ÔŸÇwKæý¦{.)ƒá›„ÿ */
+        $"4B7B 0DD6 A35E 60AD 632D D6D7 7030 0A9F"            /* K{.Ö£^`­c-Ö×p0Ÿ */
+        $"0FA2 0820 8451 9624 D0FF 1FB4 9B81 61CC"            /* .¢. „Q–$Ðÿ.´›�aÌ */
+        $"591F 6D98 E1AF 16E4 AF42 1FE0 B7C7 30DF"            /* Y.m˜á¯.ä¯B.à·Ç0ß */
+        $"CFFC EC14 15A1 B07A 4E11 ED5F BDB3 FD2A"            /* Ïüì..¡°zN.í_½³ý* */
+        $"84B1 6901 4333 27BB 2E8C 3329 2064 A800"            /* „±i.C3'».Œ3) d¨. */
+        $"0001 2FDE 803E 817B C369 A30F FCF0 FF1D"            /* ../Þ€>�{Ãi£.üðÿ. */
+        $"89A1 2FD7 FF71 B63D 19EC 98DE DFE2 D9B8"            /* ‰¡/×ÿq¶=.ì˜ÞßâÙ¸ */
+        $"9D39 1737 4722 2A89 D291 623B 279F BF0B"            /* �9.7G"*‰Ò‘b;'Ÿ¿. */
+        $"E8C0 8AF8 CBE4 0011 5D58 29AB 34B0 335C"            /* èÀŠøËä..]X)«4°3\ */
+        $"36B2 1383 D820 11B8 22DF 56E1 27EF 932D"            /* 6².ƒØ .¸"ßVá'ï“- */
+        $"30DE CC72 58E3 9BDD A88C 229A CBC8 A466"            /* 0ÞÌrXã›Ý¨Œ"šËȤf */
+        $"7C29 FDE8 E789 F28F 3258 A2DD 897B 1C6A"            /* |)ýèç‰ò�2X¢Ý‰{.j */
+        $"C048 306A EEA7 3DF0 F8D4 BECC CDBD 9E43"            /* ÀH0jî§=ðøÔ¾ÌͽžC */
+        $"A29D 8052 478B 6470 79B7 B38A 5743 CAE7"            /* ¢�€RG‹dpy·³ŠWCÊç */
+        $"0BD4 0F4A 23E1 4C85 39C9 DEB0 75AF 151E"            /* .Ô.J#áL…9ÉÞ°u¯.. */
+        $"45D5 1681 2BA4 74C9 13B5 746A E399 9467"            /* EÕ.�+¤tÉ.µtjã™”g */
+        $"E6B9 D503 7F7C D57D 4D5F 7FC8 DD43 7D9B"            /* æ¹Õ..|Õ}M_.ÈÝC}› */
+        $"3CDC F9AD 167C 162B 4E6C 2110 DB2C DF34"            /* <Üù­.|.+Nl!.Û,ß4 */
+        $"AEED CCE4 05AC 4057 9829 B161 9CA0 8159"            /* ®íÌä.¬@W˜)±aœ �Y */
+        $"A64F FD15 EC5A 4A51 CA6C FD10 9A25 4291"            /* ¦Oý.ìZJQÊlý.š%B‘ */
+        $"1E90 1FC2 3530 E0DB E4E6 232E CB64 AF95"            /* .�.Â50àÛäæ#.Ëd¯• */
+        $"9494 656D D395 3D62 9EDA 2EC1 DB02 1FAA"            /* ””emÓ•=bžÚ.ÁÛ..ª */
+        $"6778 0FC0 C4A2 CCA8 EDC0 4DA8 F889 162F"            /* gx.ÀĢ̨íÀM¨ø‰./ */
+        $"03F9 A9C1 C635 1DAD 2E22 580B 0B2B 83E3"            /* .ù©ÁÆ5.­."X..+ƒã */
+        $"EC02 5552 3AA8 91BA 45AF 5439 4265 71F6"            /* ì.UR:¨‘ºE¯T9Beqö */
+        $"3E7A 4412 5DE5 1863 50E6 C0ED C470 3ED9"            /* >zD.]å.cPæÀíÄp>Ù */
+        $"0E3F 48BA 54C5 915E 03F0 D836 6429 2A67"            /* .?HºTÅ‘^.ðØ6d)*g */
+        $"B7FA 6AF9 069E 8E67 2848 B570 C3AC 7746"            /* ·újù.žŽg(HµpìwF */
+        $"EB48 0A2F 4BE4 8EB3 3F8F 791F 0646 DEDF"            /* ëHÂ/K䎳?�y..FÞß */
+        $"316B EFDF 6FD8 C0B9 7319 CE94 8930 C6F6"            /* 1kïßoØÀ¹s.Δ‰0Æö */
+        $"6399 C4A9 79AD E967 4783 3F8D C538 3C15"            /* c™Ä©y­égGƒ?�Å8<. */
+        $"E5B7 CE98 22B7 5333 A938 B26F 0E1E EF2E"            /* å·Î˜"·S3©8²o..ï. */
+        $"74B9 72EF 9D8A 80B7 FDC1 8334 A5F9 DCFB"            /* t¹rï�Š€·ýÁƒ4¥ùÜû */
+        $"B891 BB38 373C 9BE8 59F4 6018 6E63 DA65"            /* ¸‘»87<›èYô`.ncÚe */
+        $"9B13 9DC8 28DB 3C15 0D2C 11FC 0E2D 7A0A"            /* ›.�È(Û<..,.ü.-z */
+        $"F8FF 671F C3FF 7F8E 1210 C212 EA5A 5F0B"            /* øÿg.Ãÿ.Ž..Â.êZ_. */
+        $"9727 F770 25A5 236D 9789 75C7 4089 11DD"            /* —'÷p%¥#m—‰uÇ@‰.Ý */
+        $"E472 3865 B217 B946 CF22 5225 27DE 566D"            /* är8e².¹FÏ"R%'ÞVm */
+        $"6799 4F82 0D46 59F5 E466 F9E7 71C3 FA80"            /* g™O‚.FYõäfùçqÃú€ */
+        $"7826 E598 FF48 E181 6CA8 5A7E C354 0CAA"            /* x&å˜ÿHá�l¨Z~ÃT.ª */
+        $"B01C 9EC4 181F 849B 6A13 FB8D C477 70BD"            /* °.žÄ..„›j.û�Äwp½ */
+        $"F46B 278C 4467 B0CF 3E21 805E EF97 9696"            /* ôk'ŒDg°Ï>!€^ï—–– */
+        $"CBB9 E3F6 B62E DC26 001A 408F D7E2 07C3"            /* ˹ãö¶.Ü&..@�×â.à */
+        $"C1A4 AD97 4235 8863 A088 1980 C505 6E1F"            /* Á¤­—B5ˆc ˆ.€Å.n. */
+        $"F392 0B24 B500 20DC 8295 5703 F9B9 FF70"            /* ó’.$µ. Ü‚•W.ù¹ÿp */
+        $"355C 9B8D BB49 898F 1AAB F65F 7D7E E28F"            /* 5\›�»I‰�.«ö_}~â� */
+        $"4300 BDCC FB20 4F67 CA07 0CAE 3BAD AA36"            /* C.½Ìû OgÊ..®;­ª6 */
+        $"A4D8 3358 4176 1AD6 01FA 0450 0000 0042"            /* ¤Ø3XAv.Ö.ú.P...B */
+        $"7B49 E0E8 A7D8 4EA9 E1A5 597B DB80 BA6D"            /* {Iàè§ØN©á¥Y{Û€ºm */
+        $"8010 25EA 0A26 833F DE77 DBF7 78B9 564B"            /* €.%êÂ&ƒ?ÞwÛ÷x¹VK */
+        $"57B2 AF8C BC92 97D7 46A1 23C1 B595 A2EE"            /* W²¯Œ¼’—×F¡#Áµ•¢î */
+        $"F8A9 29FA 42C2 3557 6345 80B1 FCFD F322"            /* ø©)úBÂ5WcE€±üýó" */
+        $"E992 9262 A83F E43D B059 CB12 D425 FEF2"            /* é’’b¨?ä=°YË.Ô%þò */
+        $"9932 1BD8 C65C ED82 D05E E15C 5E9C 76B7"            /* ™2.ØÆ\í‚Ð^á\^œv· */
+        $"7C64 FCDB A247 D388 3CCB 86B5 C486 2261"            /* |düÛ¢GÓˆ<ˆµÄ†"a */
+        $"BFD1 7213 39C3 0D69 6AF0 2476 B711 7E91"            /* ¿Ñr.9Ã.ijð$v·.~‘ */
+        $"6B53 6A04 4F3C 2781 A090 3118 6C3F 49BA"            /* kSj.O<'� �1.l?Iº */
+        $"B81A 3FEB D686 EFCE F487 8315 E33F 84DB"            /* ¸.?ëÖ†ïÎô‡ƒ.ã?„Û */
+        $"E2C9 F35F 28C5 10C4 FF7F FA4F E953 89FC"            /* âÉó_(Å.Äÿ.úOéS‰ü */
+        $"8B32 23C6 0D04 5E49 DADA F0FE BCA7 D2C9"            /* ‹2#Æ..^IÚÚðþ¼§ÒÉ */
+        $"5869 EAD4 F153 9BF5 A5EA 3298 CC8B 8721"            /* XiêÔñS›õ¥ê2˜Ì‹‡! */
+        $"F919 680B 3F8C 304A 2849 4970 41CF 0F60"            /* ù.h.?Œ0J(IIpAÏ.` */
+        $"76D9 5820 EF21 CD4A 205A 632F 7CC4 EFDF"            /* vÙX ï!ÍJ Zc/|Äïß */
+        $"33F3 CCA8 EDAF 405B 78E1 8F79 0F66 6573"            /* 3ǫ́í¯@[xá�y.fes */
+        $"35A2 AD75 1E18 6018 AF23 7C9D A008 1A01"            /* 5¢­u..`.¯#|� ... */
+        $"C5FE 69AA 2C8E D97E 244D D075 F213 0CC6"            /* Åþiª,ŽÙ~$MÐuò..Æ */
+        $"738F 4395 BBC0 5CB6 3ADC 3DA8 ACB8 E018"            /* s�C•»À\¶:Ü=¨¬¸à. */
+        $"BA5B 13DB 0F6A CB18 DEAC 9749 F5B5 361D"            /* º[.Û.jË.Þ¬—Iõµ6. */
+        $"CF3A C107 9606 179F F4C7 F3DE CB0B 1F53"            /* Ï:Á.–..ŸôÇóÞË..S */
+        $"F27E 5D3C 11AB 66B4 8037 0644 AE98 19BF"            /* ò~]<.«f´€7.D®˜.¿ */
+        $"D564 973A 0CF2 C96F 56D4 5CB8 666F C68C"            /* Õd—:.òÉoVÔ\¸foÆŒ */
+        $"1E73 E515 8B33 75D2 D3B4 B3A3 8CDE DE0C"            /* .så.‹3uÒÓ´³£ŒÞÞ. */
+        $"DA37 A3DF 44D2 B57E 2DB2 E891 D36F CC23"            /* Ú7£ßDÒµ~-²è‘ÓoÌ# */
+        $"ADE8 45BC BB30 78D7 77BD D4A8 087F C83F"            /* ­èE¼»0x×w½Ô¨..È? */
+        $"E49A 6873 FAC4 C12B 0056 5E18 C3CB C2E9"            /* äšhsúÄÁ+.V^.ÃËÂé */
+        $"DCAE F0E8 A75F 18DD B8DD 1DCD B0F5 3A1C"            /* Ü®ðè§_.ݸÝ.Í°õ:. */
+        $"3816 51A8 0D93 00D0 6FF6 8F07 E4BE EDF9"            /* 8.Q¨.“.Ðoö�.ä¾íù */
+        $"BF0E 6CAA 5384 5DF0 DF12 4CF4 E3B3 5D6C"            /* ¿.lªS„]ðß.Lôã³]l */
+        $"602A B6F1 C0E0 E520 B0D6 71FB 7996 4930"            /* `*¶ñÀàå °Öqûy–I0 */
+        $"23DD 3601 3653 C40D 1A64 DC2B D5C2 01C9"            /* #Ý6.6SÄ..dÜ+ÕÂ.É */
+        $"5002 6BBE 7338 81EE F87D 7687 0FE6 7CF9"            /* P.k¾s8�îø}v‡.æ|ù */
+        $"BAB6 5B35 1A25 421C 5BBA 4D82 4E1F B1D4"            /* º¶[5.%B.[ºM‚N.±Ô */
+        $"1907 FF78 F534 4A16 7BB6 B598 51F6 E4D3"            /* ..ÿxõ4J.{¶µ˜QöäÓ */
+        $"A04B 1198 B926 CFAE FC03 22E3 8360 E696"            /*  K.˜¹&Ï®ü."ãƒ`æ– */
+        $"F546 62F9 7178 F327 E245 4520 8D17 41C4"            /* õFbùqxó'âEE �.AÄ */
+        $"9EC6 EF8D 0924 9416 7901 CE87 5EBB 286D"            /* žÆï�Æ$”.y.·^»(m */
+        $"53BF 09FA 41F6 5FBA 8F4C 79A8 75BA 277A"            /* S¿ÆúAö_º�Ly¨uº'z */
+        $"7D42 642B 38EE 9A49 DEDB F1B3 80D0 E5D0"            /* }Bd+8îšIÞÛñ³€ÐåÐ */
+        $"2980 F797 E7D0 F90D 4B2F AFDD 4A69 3389"            /* )€÷—çÐù.K/¯ÝJi3‰ */
+        $"1418 EBD0 6DF0 E38D 6E2F D546 C1A8 C8DD"            /* ..ëÐmðã�n/ÕFÁ¨ÈÝ */
+        $"8977 E053 9C26 053A CF69 97F9 7FB4 9000"            /* ‰wàSœ&.:Ïi—ù.´�. */
+        $"0000 0115 0E67 B64C 0015 DD82 643D 6476"            /* .....g¶L..Ý‚d=dv */
+        $"ED28 6324 AD72 8124 1AF6 FB1B 21C9 0605"            /* í(c$­r�$.öû.!É.. */
+        $"FAE6 04A6 31BF 6D67 FF7B B889 831A 4FFD"            /* úæ.¦1¿mgÿ{¸‰ƒ.Oý */
+        $"6BF5 F098 23AB A490 39F7 6AFC 3832 E2E1"            /* kõð˜#«¤�9÷jü82âá */
+        $"11B2 ADB0 ECCA 83DE B4FF 3685 5106 75DE"            /* .²­°ìʃ޴ÿ6…Q.uÞ */
+        $"3047 28A0 EDBE AD29 17CD DA62 698B CE64"            /* 0G( í¾­).ÍÚbi‹Îd */
+        $"5999 2B8E BB7D C74F F009 A25D B2B5 BDD9"            /* Y™+Ž»}ÇOðÆ¢]²µ½Ù */
+        $"B852 BFFE 0B74 9C05 22D7 B0A3 2139 0979"            /* ¸R¿þ.tœ."×°£!9Æy */
+        $"5C29 BAE8 43DA F9E5 5383 AFD2 14EC 64AA"            /* \)ºèCÚùåSƒ¯Ò.ìdª */
+        $"442C CE71 74ED 5C27 4331 9374 AC77 47EE"            /* D,Îqtí\'C1“t¬wGî */
+        $"31AC 4C74 97BC 753C D5DC 3D8B F7D2 C612"            /* 1¬Lt—¼u<ÕÜ=‹÷ÒÆ. */
+        $"2399 F431 07A1 76CA DAE6 772B 309A C800"            /* #™ô1.¡vÊÚæw+0šÈ. */
+        $"9F2F D6DF A44C 48EB 853E 4140 A123 BCA3"            /* Ÿ/ÖߤLHë…>A@¡#¼£ */
+        $"D096 00DA 0822 DFB3 6887 B31F A18F 59BE"            /* Ж.Ú."ß³h‡³.¡�Y¾ */
+        $"6B25 B5CF CFA3 8806 85B7 ED84 B20B CDA2"            /* k%µÏÏ£ˆ.…·í„².Í¢ */
+        $"A0C8 404B 3FFF 7FF3 3816 5BF0 A16B 85D0"            /*  È@K?ÿ.ó8.[ð¡k…Ð */
+        $"B87F E4BB 21F9 A3BB 9103 2944 434A 5789"            /* ¸.ä»!ù£»‘.)DCJW‰ */
+        $"E3EC B1E3 6F3E 154A 37E4 ACA6 4B02 6C5B"            /* ãì±ão>.J7䬦K.l[ */
+        $"D23A D4D4 83CE F291 CD7F 114F 5935 8EE0"            /* Ò:ÔÔƒÎò‘Í..OY5Žà */
+        $"17EA F0B3 1D93 BC5F 2CF8 511C E99F 21D8"            /* .êð³.“¼_,øQ.éŸ!Ø */
+        $"E286 EB17 6FC2 C34B 1110 6398 03BF CB08"            /* â†ë.oÂÃK..c˜.¿Ë. */
+        $"0018 4848 E24D 90A5 63F9 B1F8 6E20 EF6E"            /* ..HHâM�¥cù±øn ïn */
+        $"25D5 858B 0AE4 2235 581B D4DA E01C B006"            /* %Õ…‹Âä"5X.ÔÚà.°. */
+        $"E5EB DE78 855B 19E7 4D80 DAC2 1E8F CB2B"            /* åëÞx…[.çM€ÚÂ.�Ë+ */
+        $"0EC8 3FFF 7759 B569 0861 20CC 1D71 2121"            /* .È?ÿwYµi.a Ì.q!! */
+        $"71A7 FA20 B34B EAB3 4260 A827 6E91 2B3C"            /* q§ú ³Kê³B`¨'n‘+< */
+        $"5479 449A 3161 D24E 8489 C00A 18A6 3FEC"            /* TyDš1aÒN„‰ÀÂ.¦?ì */
+        $"61F2 4C86 23C1 85DB 6ECA 221D BCC2 C25F"            /* aòL†#Á…ÛnÊ".¼ÂÂ_ */
+        $"EFFF 7891 F475 0E20 DC0A 8F85 8208 4541"            /* ïÿx‘ôu. ÜÂ�…‚.EA */
+        $"579B 5EE2 24C4 5C60 39B7 D9F1 ECFD 0F0C"            /* W›^â$Ä\`9·Ùñìý.. */
+        $"3719 72A8 A543 8BF5 94BF BF6C E6F7 E45A"            /* 7.r¨¥C‹õ”¿¿læ÷äZ */
+        $"C5CF 1FD7 32F5 2D70 041E 3641 2C46 E23D"            /* ÅÏ.×2õ-p..6A,Fâ= */
+        $"E072 6889 A892 A27F 44A8 564A 74A3 B421"            /* àrh‰¨’¢.D¨VJt£´! */
+        $"E1CC A0F3 50E2 2711 6919 76BE D84B D2FE"            /* áÌ óPâ'.i.v¾ØKÒþ */
+        $"AAED 2D64 7C8F 4C55 7FFF 7EFC 2CBF 05DE"            /* ªí-d|�LU.ÿ~ü,¿.Þ */
+        $"25B2 001C 00EC 6D17 ED17 E559 9DFA F731"            /* %²...ìm.í.åY�ú÷1 */
+        $"B21A 7394 8B35 5948 BA4F 5858 020F FF7C"            /* ².s”‹5YHºOXX..ÿ| */
+        $"C89D 1CFA F89B 9F9C 841F 19EF D626 E6DE"            /* È�.úø›Ÿœ„..ïÖ&æÞ */
+        $"DCC3 3148 38A0 C32F 898F BEC3 0AF3 318C"            /* ÜÃ1H8 Ã/‰�¾ÃÂó1Œ */
+        $"5E09 119B 43C8 9FE6 73B2 F4B9 9789 4BFC"            /* ^Æ.›CÈŸæs²ô¹—‰Kü */
+        $"99A2 FF7F FF7A 4FD0 8C64 F459 410C 013C"            /* ™¢ÿ.ÿzOÐŒdôYA..< */
+        $"1C6C 85B5 1C8F D078 995D 714E 1C60 3090"            /* .l…µ.�Ðx™]qN.`0� */
+        $"9058 77C4 BB80 5F57 1871 CA72 B2FD 0016"            /* �XwÄ»€_W.qÊr²ý.. */
+        $"BAA7 F84F F4E9 ACDF F766 8CB4 475D 2F0B"            /* º§øOôé¬ß÷fŒ´G]/. */
+        $"37BC 18C8 6162 79C2 BDD7 8753 204B A536"            /* 7¼.Èaby½ׇS K¥6 */
+        $"9CBE 4972 316A BCB1 9442 4238 B88F 2F48"            /* œ¾Ir1j¼±”BB8¸�/H */
+        $"7A45 5CD1 A306 3A23 5A78 354F CDB6 C0A5"            /* zE\Ñ£.:#Zx5OͶÀ¥ */
+        $"2A5C 19DA 0B0C CD84 8D85 D2B8 1DC9 059C"            /* *\.Ú..Í„�…Ò¸.É.œ */
+        $"A8C4 8118 4848 9372 9372 566C 21E5 2665"            /* ¨Ä�.HH“r“rVl!å&e */
+        $"D16C 6601 48A8 35CE 7FFF 7F19 B54E 7F04"            /* Ñlf.H¨5Î.ÿ..µN.. */
+        $"10EC 1AA3 13FF 4588 9722 A7AA B011 863C"            /* .ì.£.ÿEˆ—"§ª°.†< */
+        $"E4B1 717B 7C2D 21E6 267B 4B48 E790 FF76"            /* ä±q{|-!æ&{KHç�ÿv */
+        $"40CC F425 41CB 289F 809D 8170 A529 2EDA"            /* @Ìô%AË(Ÿ€��p¥).Ú */
+        $"A105 B3AF FB44 7951 B87A 0091 5B53 5979"            /* ¡.³¯ûDyQ¸z.‘[SYy */
+        $"CDC6 5976 6393 34F2 21FF 7FFF 7FFF 7D43"            /* ÍÆYvc“4ò!ÿ.ÿ.ÿ}C */
+        $"4F4B C77F 73C7 0454 BE9C BE9C 282E 440E"            /* OKÇ.sÇ.T¾œ¾œ(.D. */
+        $"0608 A380 6121 2103 DBD2 250B 5D57 9159"            /* ..£€a!!.ÛÒ%.]W‘Y */
+        $"B69A 28CF E66A 154F F84F F4E9 99ED 48C4"            /* ¶š(Ïæj.OøOôé™íHÄ */
+        $"CA7E BE76 FC67 A7CD DC26 1C00 0184 8463"            /* Ê~¾vüg§ÍÜ&...„„c */
+        $"69A8 C0A9 127C 5830 CC3A 380A C742 E4DE"            /* i¨À©.|X0Ì:8ÂÇBäÞ */
+        $"06F5 7999 556D FD9F 268B 895F FF4B 7BB9"            /* .õy™UmýŸ&‹‰_ÿK{¹ */
+        $"C201 52B7 B483 0906 65EC 1848 4750 6F27"            /* Â.R·´ƒÆ.eì.HGPo' */
+        $"C86C 1F27 9108 6253 0416 4CD3 30E4 7F77"            /* Èl.'‘.bS..LÓ0ä.w */
+        $"0705 8420 83B6 BCB6 29DE B71E 8DC5 851A"            /* ..„ ƒ¶¼¶)Þ·.�Å…. */
+        $"ABB0 83D8 F2E2 5113 55D2 AAF6 B3AB 7679"            /* «°ƒØòâQ.UÒªö³«vy */
+        $"49FE A1F8 6F30 0EC0 7D91 534C C78C DC5D"            /* Iþ¡øo0.À}‘SLÇŒÜ] */
+        $"5A42 CA06 37D8 E0ED 27FA 3E31 C849 D2BE"            /* ZBÊ.7Øàí'ú>1ÈIÒ¾ */
+        $"847C 0CCF 676F ACFE 91A3 0F62 B711 1897"            /* „|.Ïgo¬þ‘£.b·..— */
+        $"9DC3 8E37 3AF8 907E 0B69 1577 2856 AA36"            /* �ÃŽ7:ø�~.i.w(Vª6 */
+        $"FAC0 D56C 6686 0443 CA96 FDCD 051B 23A7"            /* úÀÕlf†.CÊ–ýÍ..#§ */
+        $"7DAC 8229 C5FC F840 103A 6407 49F7 6B32"            /* }¬‚)Åüø@.:d.I÷k2 */
+        $"254F 2B32 7FC1 F460 D5C0 5EE1 3046 612A"            /* %O+2.Áô`ÕÀ^á0Fa* */
+        $"1BC1 C143 7B76 B9EF ECCB 5EE9 8F0C 3F71"            /* .ÁÁC{v¹ïìË^é�.?q */
+        $"E805 8B9B 17B7 9ECE C237 AF5C 0062 E61E"            /* è.‹›.·žÎÂ7¯\.bæ. */
+        $"DF6C C1F7 904E 4379 2A9C 92FC 1B04 00A8"            /* ßlÁ÷�NCy*œ’ü...¨ */
+        $"F9D5 DB1B C4C6 9485 ABC2 1199 CCF2 0A47"            /* ùÕÛ.ÄÆ”…«Â.™ÌòÂG */
+        $"9693 C097 7AD0 449A FC53 DEC5 6EE8 6BF7"            /* –“À—zÐDšüSÞÅnèk÷ */
+        $"0D7D 4ED8 3426 DA7E ECF9 57ED 9252 9A6A"            /* .}NØ4&Ú~ìùWí’Ršj */
+        $"2B94 2614 1B6E A495 8261 4D5E DAEF 03FA"            /* +”&..n¤•‚aM^Úï.ú */
+        $"8A63 9496 E8AB A1A6 5B5C B03E E73E 2889"            /* Šc”–è«¡¦[\°>ç>(‰ */
+        $"D257 6C28 080A 68DC 226C 950F F55B E7CC"            /* ÒWl(.ÂhÜ"l•.õ[çÌ */
+        $"95AD FDA7 43EA 7489 A545 C0FC E9B0 2A25"            /* •­ý§Cêt‰¥EÀüé°*% */
+        $"719C EE06 9E5A 8FC0 D3B0 0C81 1EB0 C8C6"            /* qœî.žZ�ÀÓ°.�.°ÈÆ */
+        $"25BD B383 33BD B80D D9A9 48F3 7539 D7D5"            /* %½³ƒ3½¸.Ù©Hóu9×Õ */
+        $"8021 5EBA 94A7 83A3 69FE 8179 9106 BC56"            /* €!^º”§ƒ£iþ�y‘.¼V */
+        $"14A4 427B 8C09 BACB 2FC9 B8F3 CAFA E51C"            /* .¤B{ŒÆºË/ɸóÊúå. */
+        $"9C07 9A69 033C 6159 163E 6ED8 259D 7AAB"            /* œ.ši.<aY.>nØ%�z« */
+        $"D316 475C F6C7 BD0E 7972 4C59 DF3A D5B4"            /* Ó.G\öǽ.yrLYß:Õ´ */
+        $"44ED 7D01 B0FB 34D4 4C9C BC2D B8A6 5B65"            /* Dí}.°û4ÔLœ¼-¸¦[e */
+        $"134F 0C96 5CA1 21CC A249 F17D 4660 9835"            /* .O.–\¡!Ì¢Iñ}F`˜5 */
+        $"957C 7392 53A9 DE42 E650 604B 10E2 FF12"            /* •|s’S©ÞBæP`K.âÿ. */
+        $"B47A 044A 524A B8D3 60B5 A258 CEAB 55E8"            /* ´z.JRJ¸Ó`µ¢XΫUè */
+        $"5219 EC3E A9F6 0813 A2B4 930C EDE4 3BBE"            /* R.ì>©ö..¢´“.íä;¾ */
+        $"C0E3 7F93 1A3F 38EB 2DE3 492D A3BD FD00"            /* Àã.“.?8ë-ãI-£½ý. */
+        $"811C 530E 2FB8 9D68 2466 D288 EC29 9094"            /* �.S./¸�h$fÒˆì)�” */
+        $"A3C7 2D32 0A25 BA73 2023 08CA C360 2C72"            /* £Ç-2Â%ºs #.ÊÃ`,r */
+        $"8BA9 516A 7081 F2FF 1E84 E1C2 F841 77CE"            /* ‹©Qjp�òÿ.„áÂøAwÎ */
+        $"ABDF 6476 30A4 3018 F7F4 F3EE 1A5E 5DF0"            /* «ßdv0¤0.÷ôóî.^]ð */
+        $"CAAA AA77 C90D 52C4 6AA9 5755 33B9 1814"            /* ʪªwÉ.RÄj©WU3¹.. */
+        $"3528 E205 C379 648A E627 A23E D5DB 1CAE"            /* 5(â.ÃydŠæ'¢>ÕÛ.® */
+        $"4868 B7D4 F381 2534 1F48 2BCC 5211 3B0F"            /* Hh·Ôó�%4.H+ÌR.;. */
+        $"9692 B002 4CFB 1F83 3628 D1EB 5416 0648"            /* –’°.Lû.ƒ6(ÑëT..H */
+        $"F0F0 B0F8 C7C7 6E92 8C54 6859 791B 7890"            /* ðð°øÇÇn’ŒThYy.x� */
+        $"EBA3 BC74 5F3F C4AD 7C9D 6954 2D0C 15BF"            /* 룼t_?Ä­|�iT-..¿ */
+        $"F699 82A6 4170 D2F1 02A5 7EF3 6061 C9CF"            /* ö™‚¦ApÒñ.¥~ó`aÉÏ */
+        $"C370 E129 F805 8CC8 C670 CBDC 2D44 D349"            /* Ãpá)ø.ŒÈÆpËÜ-DÓI */
+        $"F3E5 C5F9 357E 3DF2 CDF3 DC8A 1F13 5B2D"            /* óåÅù5~=òÍóÜŠ..[- */
+        $"C544 448D 1038 8293 4EEA 75A4 0738 7D9F"            /* ÅDD�.8‚“Nêu¤.8}Ÿ */
+        $"C002 3D68 26D8 7B06 FB10 CCDF C4F3 5364"            /* À.=h&Ø{.û.ÌßÄóSd */
+        $"2342 154B F8FB 01ED 8893 9160 A3A0 B81D"            /* #B.Køû.툓‘`£ ¸. */
+        $"47A0 6C82 1CBA FAED 931D E025 BDFF 1535"            /* G l‚.ºúí“.à%½ÿ.5 */
+        $"CADF 68C5 41FD 3896 1AC9 F979 A885 F5AE"            /* ÊßhÅAý8–.Éùy¨…õ® */
+        $"EFBE C674 ED92 5FE9 E9AF FF52 D573 A6DD"            /* ï¾Ætí’_éé¯ÿRÕs¦Ý */
+        $"631B 27E4 62CB B76E 7020 EC65 75E2 DB6F"            /* c.'äbË·np ìeuâÛo */
+        $"0E10 980A 0EA3 2287 4CF8 D402 52B8 1491"            /* ..˜Â.£"‡LøÔ.R¸.‘ */
+        $"21C9 BC2B 48BC CBD4 464A C539 6CD5 28F1"            /* !ɼ+H¼ËÔFJÅ9lÕ(ñ */
+        $"CAE4 CA43 9CB8 B181 BF06 522B 4D19 8295"            /* ÊäÊCœ¸±�¿.R+M.‚• */
+        $"05C8 D7CD 8CFA D3E7 7BC9 630C DCDD 7C7E"            /* .È×ÍŒúÓç{Éc.ÜÝ|~ */
+        $"E4C6 D7DC 5E38 67CC 5934 9E8D 9552 B837"            /* äÆ×Ü^8gÌY4ž�•R¸7 */
+        $"53AE 6D39 FAB1 2EB6 886C 1855 26ED AD08"            /* S®m9ú±.¶ˆl.U&í­. */
+        $"1EBE 9570 EA2F DFFF 06F4 ABF3 4534 2831"            /* .¾•pê/ßÿ.ô«óE4(1 */
+        $"1AE2 0A99 2956 2A90 C2A4 58AC E49E F047"            /* .â™)V*�¤X¬äžðG */
+        $"A9BA C394 E8F4 6427 7966 A79C 4269 9ADD"            /* ©ºÃ”èôd'yf§œBišÝ */
+        $"AD1D 1A7E 375C D3FB 8C25 0B6B 0460 5EB9"            /* ­..~7\ÓûŒ%.k.`^¹ */
+        $"416C AE82 DFC3 09DA 1F69 8796 6897 8CD0"            /* Al®‚ßÃÆÚ.i‡–h—ŒÐ */
+        $"3E1B FF7D 9AE9 7F6D 4E84 967C 674F CA41"            /* >.ÿ}šé.mN„–|gOÊA */
+        $"44C1 0575 93A9 2599 66D0 AB7B 6260 D32C"            /* DÁ.u“©%™fЫ{b`Ó, */
+        $"94AF 7FC8 82FD F692 92FE B6ED A660 750F"            /* ”¯.È‚ýö’’þ¶í¦`u. */
+        $"80A2 A8AA E6F6 7B9F E894 ED71 D223 6F4B"            /* €¢¨ªæö{Ÿè”íqÒ#oK */
+        $"A203 F64C 7560 DBB1 6F9E EE9F 2945 C994"            /* ¢.öLu`Û±ožîŸ)EÉ” */
+        $"BA00 D3D1 6414 A300 4296 670B 2350 CDD1"            /* º.ÓÑd.£.B–g.#PÍÑ */
+        $"DF61 29E8 EC17 87B6 BC62 B6BD 5F31 13B2"            /* ßa)èì.‡¶¼b¶½_1.² */
+        $"48A2 F723 53C7 6955 969B ED83 6A9B 1B06"            /* H¢÷#SÇiU–›íƒj›.. */
+        $"C7D0 2584 430B 8C52 D00A 736B D6FB AEDB"            /* ÇÐ%„C.ŒRÐÂskÖû®Û */
+        $"2BA1 5095 759B 0AFF 5138 58EF 3DC2 B14D"            /* +¡P•u›ÂÿQ8Xï=±M */
+        $"3B7D 62D0 DE12 CFEF 17A3 32C4 C79A C2DA"            /* ;}bÐÞ.Ïï.£2ÄÇšÂÚ */
+        $"6BA1 6478 B1D3 2278 3787 6C30 08FD 6095"            /* k¡dx±Ó"x7‡l0.ý`• */
+        $"FF65 1DF4 7606 34C3 B4EE E609 A3BF 7085"            /* ÿe.ôv.4ôîæÆ£¿p… */
+        $"8B3B 2C80 D860 6043 10A4 24B1 2D80 880D"            /* ‹;,€Ø``C.¤$±-€ˆ. */
+        $"671A 9A76 E1D4 2304 B4E0 9E47 129D 6316"            /* g.šváÔ#.´àžG.�c. */
+        $"33DF C88C 3BB6 5232 475C D19D FA9B 3303"            /* 3ßÈŒ;¶R2G\Ñ�ú›3. */
+        $"2956 D8B1 08A5 2735 CD4D F130 C700 DA0D"            /* )Vر.¥'5ÍMñ0Ç.Ú. */
+        $"7BAE 21FA FB1B 35A5 957E 0211 955B 25D0"            /* {®!úû.5¥•~..•[%Ð */
+        $"A3DD B72F 5BCD 8792 418E BCB6 C727 DD0F"            /* £Ý·/[͇’AŽ¼¶Ç'Ý. */
+        $"2D42 F031 2A73 C1F9 7964 B937 1E77 A757"            /* -Bð1*sÁùyd¹7.w§W */
+        $"D158 CB02 80D3 C310 E1C5 709C 5C69 7F04"            /* ÑXË.€ÓÃ.áÅpœ\i.. */
+        $"4476 F017 3FF2 B891 0160 D681 AEBC F8C9"            /* Dvð.?ò¸‘.`Ö�®¼øÉ */
+        $"8F46 7922 4414 5CEE 0CA8 417B 33BB 5926"            /* �Fy"D.\î.¨A{3»Y& */
+        $"B7A6 7094 6363 C5F2 9AD7 1751 2456 3B83"            /* ·¦p”ccÅòš×.Q$V;ƒ */
+        $"9BB0 0ECD 1420 6141 A097 DBF4 802A 2377"            /* ›°.Í. aA —Ûô€*#w */
+        $"CDAC EFE9 4A16 4B3C 5058 A5DC 1C40 169E"            /* ͬïéJ.K<PX¥Ü.@.ž */
+        $"3999 F0C2 C418 2E8F 0951 664A 7082 F49F"            /* 9™ðÂÄ..�ÆQfJp‚ôŸ */
+        $"E576 B2B1 5918 E3EE 9B97 1686 6499 A572"            /* åv²±Y.ãî›—.†d™¥r */
+        $"B1F6 2F39 A798 6292 DE22 007B 60AD 1D94"            /* ±ö/9§˜b’Þ".{`­.” */
+        $"31BA 068D F15A 06DB 2654 6B52 F692 3C3A"            /* 1º.�ñZ.Û&TkRö’<: */
+        $"0DA8 A74B 30F6 3852 76F0 A897 9086 FBD5"            /* .¨§K0ö8Rvð¨—�†ûÕ */
+        $"1C78 047E 7BF2 08EE 7B45 85C5 6ED5 AA43"            /* .x.~{ò.î{E…ÅnÕªC */
+        $"F423 8A4E 4111 C68E 172E DD87 AF9E BF19"            /* ô#ŠNA.ÆŽ..݇¯ž¿. */
+        $"D4D2 020C 6FD5 EE3F F0E8 289E 4E6C 0871"            /* ÔÒ..oÕî?ðè(žNl.q */
+        $"1187 D3F1 E458 94F5 4519 BF3C D239 D86C"            /* .‡ÓñäX”õE.¿<Ò9Øl */
+        $"17F1 8916 4206 2346 ACD8 1F08 9A44 0AB3"            /* .ñ‰.B.#F¬Ø..šD³ */
+        $"CEE6 441D 78D5 2909 4CEA 46F7 D6C6 D21A"            /* ÎæD.xÕ)ÆLêF÷ÖÆÒ. */
+        $"6D41 BB64 ADFF 6252 5A80 3556 C459 2845"            /* mA»d­ÿbRZ€5VÄY(E */
+        $"C05D C2C5 1F69 4087 0380 C0FF 61AA D5D1"            /* À]ÂÅ.i@‡.€ÀÿaªÕÑ */
+        $"E5C2 5FC0 CEF4 2D59 B4A3 6BA8 343E 184B"            /* åÂ_ÀÎô-Y´£k¨4>.K */
+        $"89CE 81FD AC96 C691 FDE5 F993 B9CB 6302"            /* ‰Î�ý¬–Æ‘ýåù“¹Ëc. */
+        $"B8EE 86B4 A2F7 19EA DAFD D511 B59F BBD2"            /* ¸î†´¢÷.êÚýÕ.µŸ»Ò */
+        $"5D4E F6A3 BC58 51D5 273F 2E2E 2B6A 2755"            /* ]Nö£¼XQÕ'?..+j'U */
+        $"38A3 CA29 BFAB D31D CD53 B29C 7418 40DB"            /* 8£Ê)¿«Ó.ÍS²œt.@Û */
+        $"FD56 1BF6 9350 5411 CF5C 8D26 B1FA 754F"            /* ýV.ö“PT.Ï\�&±úuO */
+        $"E584 8277 6221 6866 257C 9FC9 65A5 6D93"            /* å„‚wb!hf%|ŸÉe¥m“ */
+        $"C524 B971 3F1D 34A0 BBF4 6B83 9722 CFAD"            /* Å$¹q?.4 »ôkƒ—"Ï­ */
+        $"8296 103F 53BB 1B22 8A84 2FAC 94DE 4994"            /* ‚–.?S»."Š„/¬”ÞI” */
+        $"2D31 56A5 DBCD B661 81D7 B360 4958 8FF5"            /* -1V¥ÛͶa�׳`IX�õ */
+        $"EB02 25A9 6386 8241 D936 A3CB AA88 9936"            /* ë.%©c†‚AÙ6£Ëªˆ™6 */
+        $"1698 4F59 765B 34EA 3741 D2D3 2DAC 854D"            /* .˜OYv[4ê7AÒÓ-¬…M */
+        $"366B C9A0 15F8 D2E6 7CCF 99EF A794 460C"            /* 6kÉ .øÒæ|ϙ倫F. */
+        $"934E C88B 2BF5 91F7 7BD1 3DC9 6ED3 91FE"            /* “NÈ‹+õ‘÷{Ñ=ÉnÓ‘þ */
+        $"E63B EDCC 3D4A CC1B AE5D 88D0 B241 20D1"            /* æ;íÌ=JÌ.®]ˆÐ²A Ñ */
+        $"AB6C 9FE2 E494 395E 8E3C 0EB0 1796 58CC"            /* «lŸâä”9^Ž<.°.–XÌ */
+        $"9791 D931 DB33 473E 003E 10CD B736 7295"            /* —‘Ù1Û3G>.>.Í·6r• */
+        $"DD81 B481 9A0A ED27 3C1E 6298 FD0D BDE0"            /* Ý�´�šÂí'<.b˜ý.½à */
+        $"11D6 8A21 79C1 DBB7 FEDC 6E48 8080 5ADB"            /* .ÖŠ!yÁÛ·þÜnH€€ZÛ */
+        $"E61D 9E0E E6A3 6D38 A028 4016 464D F534"            /* æ.ž.æ£m8 (@.FMõ4 */
+        $"D764 3AD7 55DF 3CAB 7B3D 12F5 9A8D DDCF"            /* ×d:×Uß<«{=.õš�ÝÏ */
+        $"6CCD 0387 C982 0FE9 D431 0FE3 E064 1700"            /* lÍ.‡É‚.éÔ1.ãàd.. */
+        $"1AAD F49E D6DE A939 8010 C91B 605B 4E0A"            /* .­ôžÖÞ©9€.É.`[NÂ */
+        $"FCBE ADE9 C17A EC1F 3990 9EB2 E6BF 92AA"            /* ü¾­éÁzì.9�ž²æ¿’ª */
+        $"951C D27F A984 10A9 22DC 996E FF6E 12AE"            /* •.Ò.©„.©"Ü™nÿn.® */
+        $"DC03 5AB3 2CA0 8291 4174 C69E AE28 DBA8"            /* Ü.Z³, ‚‘AtÆž®(Û¨ */
+        $"38A8 FF12 67D3 F8A3 00D6 2A2E A564 CEFA"            /* 8¨ÿ.gÓø£.Ö*.¥dÎú */
+        $"0F00 4B44 62A7 CA9F F072 2821 DD3C 6A34"            /* ..KDb§ÊŸðr(!Ý<j4 */
+        $"926C 8F3C 1548 D31A 021F 2604 252D A929"            /* ’l�<.HÓ...&.%-©) */
+        $"172B 8212 174F 2D2D CC7D DA15 F9A9 AD7E"            /* .+‚..O--Ì}Ú.ù©­~ */
+        $"59D3 7885 9215 C77B 6583 4D8F 3308 149C"            /* YÓx…’.Ç{eƒM�3..œ */
+        $"270A 4508 21C9 A05B CDE9 BEF1 C18A 4B74"            /* 'ÂE.!É [Íé¾ñÁŠKt */
+        $"F07B 0DFE 007B E5AF D9AA CED7 8661 34C7"            /* ð{.þ.{å¯ÙªÎ׆a4Ç */
+        $"AA26 21AC D09C 6BAA EABB A7C4 486E 40A5"            /* ª&!¬Ðœkªê»§ÄHn@¥ */
+        $"C791 976A 1EC3 534F 84EC E6E9 7363 FF08"            /* Ç‘—j.ÃSO„ìæéscÿ. */
+        $"5B20 0E29 000C 5E8F 3339 6210 65CC FD34"            /* [ .)..^�39b.eÌý4 */
+        $"76EB F1B2 76C6 5FDC C1A8 B0F5 53EE 103C"            /* vëñ²vÆ_ÜÁ¨°õSî.< */
+        $"50B0 650F 8459 9777 E890 E28A BB84 56B9"            /* P°e.„Y—wè�⊻„V¹ */
+        $"0522 90F9 5B81 C982 979E E507 A4BC 26C3"            /* ."�ù[�É‚—žå.¤¼&à */
+        $"E356 F2A9 C0D1 BFF3 F882 EC0E 6AA9 CA0D"            /* ãVò©ÀÑ¿óø‚ì.j©Ê. */
+        $"4419 16FB 9BEF 947E F848 19BF 5CB6 EA4E"            /* D..û›ï”~øH.¿\¶êN */
+        $"C290 F254 020B 51DB 8094 4D05 E9A5 21A0"            /* Â�òT..QÛ€”M.é¥!  */
+        $"D3E6 84EA 5A3E 4380 650C B24F 31DA 209F"            /* Óæ„êZ>C€e.²O1Ú Ÿ */
+        $"F51A 9108 7912 32B0 52A6 A901 CADB A758"            /* õ.‘.y.2°R¦©.ÊÛ§X */
+        $"C00A D516 E462 35B4 C071 131A 0F01 9A95"            /* ÀÂÕ.äb5´Àq....š• */
+        $"9739 F131 0E5F 7FBA D8AD 925F 992C 0187"            /* —9ñ1._.ºØ­’_™,.‡ */
+        $"D97C 832B 847E 1148 0402 0449 FB25 D0F1"            /* Ù|ƒ+„~.H...Iû%Ðñ */
+        $"C1F8 2B8E CE97 D5A4 BEFE 7F0D E420 E43E"            /* Áø+ŽÎ—Õ¤¾þ..ä ä> */
+        $"801A 448D 9D61 D23C 5956 3DEB A1A6 0858"            /* €.D��aÒ<YV=롦.X */
+        $"CD98 F32B 92E6 D960 C0E1 E542 294D 6FD3"            /* ͘ó+’æÙ`ÀáåB)MoÓ */
+        $"4234 37C9 3537 275F AC1E 936D 534A BF02"            /* B47É57'_¬.“mSJ¿. */
+        $"B742 8CAB BE88 E4FF 23DC D9EB 1FC4 9CF0"            /* ·BŒ«¾ˆäÿ#ÜÙë.Äœð */
+        $"C5D1 3F1D 5995 AD68 12E9 71B3 2100 AFB7"            /* ÅÑ?.Y•­h.éq³!.¯· */
+        $"CBF7 9ADB D5FF 48EE B1A2 AE4D E021 7C07"            /* Ë÷šÛÕÿHî±¢®Mà!|. */
+        $"5AD5 E94C A965 DFE8 B32A 23AB DE05 4FB1"            /* ZÕéL©eßè³*#«Þ.O± */
+        $"FDB7 ECC5 3611 73D9 B03C 399A D5F6 663D"            /* ý·ìÅ6.sÙ°<9šÕöf= */
+        $"0E78 0BEE 67D9 2F9D 0072 E938 509C 9779"            /* .x.îgÙ/�.ré8Pœ—y */
+        $"6C64 03A1 B8C9 C1C0 2256 29EA 112C FB1C"            /* ld.¡¸ÉÁÀ"V)ê.,û. */
+        $"766C DF51 83B1 388F 902E EE03 337E 689A"            /* vlßQƒ±8��.î.3~hš */
+        $"CA5A A9F0 09AF 3422 4115 D489 3FBD 22C1"            /* ÊZ©ðƯ4"A.Ô‰?½"Á */
+        $"4A4F 642A 0AC8 D01C 2950 18CA D441 780A"            /* JOd*ÂÈÐ.)P.ÊÔAx */
+        $"C929 A7FF 0AFA 956A A581 B590 9B7A 7D74"            /* É)§ÿÂú•j¥�µ�›z}t */
+        $"2084 3DC1 5D81 B12B DF9C 333D EFAD 0ADD"            /*  „=Á]�±+ßœ3=ï­ÂÝ */
+        $"3445 4F8C 132E F02F C2E7 E13F BE12 2F84"            /* 4EOŒ..ð/Âçá?¾./„ */
+        $"7FC3 D55F 876A BE1D 07F2 688D 774C FC3E"            /* .ÃÕ_‡j¾..òh�wLü> */
+        $"A177 C3EA 4FE4 AFFE 1BFF 61D3 2F87 4BFC"            /* ¡wÃêOä¯þ.ÿaÓ/‡Kü */
+        $"946E 03F8 6CFF 06A3 FC28 FE13 BF0F 6B7E"            /* ”n.ølÿ.£ü(þ.¿.k~ */
+        $"1EB8 FC3B 47E1 ECEE EEDF F87D 51FF 07D5"            /* .¸ü;Gáìîîßø}Qÿ.Õ */
+        $"0BBB 87E1 D3FF 0779 FC3B 6FE1 D378 0DF0"            /* .»‡áÓÿ.yü;oáÓx.ð */
+        $"BD7C 29EB A2DD 17F2 6ADB E1DB 7F0D 97E1"            /* ½|)ë¢Ý.òjÛáÛ..—á */
+        $"E84D 7750 FC3E 906F C3E8 35DD 42ED AFE1"            /* èMwPü>�oÃè5ÝBí¯á */
+        $"D33F 0E8D F86E 00F7 91DD 3D8B A94D D83C"            /* Ó?.�øn.÷‘Ý=‹©MØ< */
+        $"B51B 129C 103F 899D B929 4724 C188 2C29"            /* µ..œ.?‰�¹)G$Áˆ,) */
+        $"CE89 11F8 9065 1C37 E234 DFEF 60D7 3221"            /* Ή.ø�e.7â4ßï`×2! */
+        $"5343 F889 DCDB AFB3 6F20 F76A 31D9 986E"            /* SCø‰ÜÛ¯³o ÷j1Ù˜n */
+        $"A745 547E 6F18 076D A675 BA1A 1AAF 6558"            /* §ET~o..m¦uº..¯eX */
+        $"338A FF71 4707 0776 1B62 BCCC 89E5 4726"            /* 3ŠÿqG..v.b¼Ì‰åG& */
+        $"A7CB 8885 E07C DADC D741 3B1D D81F AB03"            /* §Ëˆ…à|ÚÜ×A;.Ø.«. */
+        $"2F84 F52D DFD5 7384 4649 7BA2 5AB1 14C8"            /* /„õ-ßÕs„FI{¢Z±.È */
+        $"3D8D B951 8183 C33A B08E 82CC EF1A F046"            /* =�¹Q�ƒÃ:°Ž‚Ìï.ðF */
+        $"5B62 C9E0 A926 F330 0A61 A30C 6194 7E1E"            /* [bÉà©&ó0Âa£.a”~. */
+        $"1EE9 3D0D 1ABE 5536 A026 8B32 830F C02F"            /* .é=..¾U6 &‹2ƒ.À/ */
+        $"3041 04B7 2C65 024D AC81 D2CC 03CA A08A"            /* 0A.·,e.M¬�ÒÌ.Ê Š */
+        $"B105 F3F1 C365 6BCE 9876 A867 7DBA 63AF"            /* ±.óñÃekΘv¨g}ºc¯ */
+        $"0973 495F DCC1 3552 54BA 5BDB 618D C6C0"            /* ÆsI_ÜÁ5RTº[Ûa�ÆÀ */
+        $"91B8 4489 141B A7D3 F188 8A97 DAB0 8942"            /* ‘¸D‰..§ÓñˆŠ—Ú°‰B */
+        $"EA67 F235 E18A 871B 4B0C DAC6 9050 BA9C"            /* êgò5ኇ.K.ÚÆ�Pºœ */
+        $"C432 95CE 13CA 93ED 4FD5 9495 377D C920"            /* Ä2•Î.Ê“íOÕ”•7}É  */
+        $"C8A2 F997 5348 8890 91D5 0A23 50BF 3C37"            /* È¢ù—SHˆ�‘ÕÂ#P¿<7 */
+        $"8372 7C96 32AA 1CD2 46BE 8220 C983 2A71"            /* ƒr|–2ª.ÒF¾‚ Ƀ*q */
+        $"7961 BF33 9590 C086 CCE9 578B 322E FB50"            /* ya¿3•�À†ÌéW‹2.ûP */
+        $"CB68 6459 C127 EB9B E974 EF02 59F4 FF4D"            /* ËhdYÁ'ë›étï.YôÿM */
+        $"4525 1874 6A9F 99EB DFCC C1B1 72EA 9FA0"            /* E%.tjŸ™ëßÌÁ±r꟠ */
+        $"DE00 BBB9 D95F 36B9 406E 3CE0 3BCF 32B6"            /* Þ.»¹Ù_6¹@n<à;Ï2¶ */
+        $"8DC0 55D6 C6DA 3622 8A6E 63F6 28AE 08AC"            /* �ÀUÖÆÚ6"Šncö(®.¬ */
+        $"03AC 288D 069A 750E CBBD 97D9 E42D BA93"            /* .¬(�.šu.˽—Ùä-º“ */
+        $"E82A 4EB3 C008 CC7C B6A7 6F70 F1BC FDAA"            /* è*N³À.Ì|¶§opñ¼ýª */
+        $"1DF4 D2E4 3ECB 9702 444E 278F 6B50 F00E"            /* .ôÒä>Ë—.DN'�kPð. */
+        $"C228 C132 E5E0 B4DE 93BF DBBD 2C85 ABF9"            /* Â(Á2åà´Þ“¿Û½,…«ù */
+        $"7FAD EC28 1D40 D390 5A2F 9B14 D348 8C76"            /* .­ì(.@Ó�Z/›.ÓHŒv */
+        $"C04B 1173 BF19 8F50 7E3D 8311 BB79 FDA8"            /* ÀK.s¿.�P~=ƒ.»yý¨ */
+        $"1FD4 24A9 5F59 8B76 709E 5C84 1902 8690"            /* .Ô$©_Y‹vpž\„..†� */
+        $"AD49 334F 5AE8 E376 288C BDE7 EE13 FBDE"            /* ­I3OZèãv(Œ½çî.ûÞ */
+        $"7606 0135 6DB2 DCD9 F5B3 E7E2 B2B8 8BE1"            /* v..5m²ÜÙõ³çⲸ‹á */
+        $"1985 85D2 0EC1 5CCD BC74 D88B 7206 5075"            /* .……Ò.Á\ͼtØ‹r.Pu */
+        $"FB92 BF92 C5CB B6E3 024D EB71 D909 AF79"            /* û’¿’Å˶ã.MëqÙƯy */
+        $"DD82 BBF2 37F1 1193 74D0 373D 4043 C292"            /* Ý‚»ò7ñ.“tÐ7=@CÂ’ */
+        $"0B1D 4E8F 04F4 A035 451A 7DCB 02DB D77E"            /* ..N�.ô 5E.}Ë.Û×~ */
+        $"DD1C 3667 1BA7 2584 C128 3835 4454 5C15"            /* Ý.6g.§%„Á(85DT\. */
+        $"5846 C7D1 4689 3D2A 1172 9BA8 9830 F037"            /* XFÇÑF‰=*.r›¨˜0ð7 */
+        $"0053 8FD6 4023 68C6 7122 CAC6 0325 5AF3"            /* .S�Ö@#hÆq"ÊÆ.%Zó */
+        $"E104 A423 C5AE F551 6DF6 7B11 D5EB FD34"            /* á.¤#Å®õQmö{.Õëý4 */
+        $"DF67 C50C 737D 74D5 D5EC 7027 A2D8 C79A"            /* ßgÅ.s}tÕÕìp'¢ØÇš */
+        $"200D A972 A30A 509A C3DE 483F 8B53 D69C"            /*  .©r£ÂPšÃÞH?‹SÖœ */
+        $"001F 47E9 BD2C 84EC DB83 B493 0326 DE6E"            /* ..Gé½,„ìÛƒ´“.&Þn */
+        $"336A 7C76 3225 8351 7B2D 37B5 D645 9866"            /* 3j|v2%ƒQ{-7µÖE˜f */
+        $"019E 6472 40C4 5853 3376 9D90 D3EA A727"            /* .ždr@ÄXS3v��Óê§' */
+        $"07A1 A4B8 A32F 475A 22A2 059C AB5B F13E"            /* .¡¤¸£/GZ"¢.œ«[ñ> */
+        $"E2DF 5B3E E6B5 B27F 28AF A15F 400C 7D9F"            /* âß[>æµ².(¯¡_@.}Ÿ */
+        $"43ED 33D4 9B4D CB64 E550 5FED FC2F E485"            /* Cí3Ô›MËdåP_íü/ä… */
+        $"271E 2DB1 6AE5 6793 EFE8 FCC5 A784 4C95"            /* '.-±jåg“ïèüŧ„L• */
+        $"E488 B5AC A528 BACB 10FF 4ABD D554 E56B"            /* 䈵¬¥(ºË.ÿJ½ÕTåk */
+        $"F72E 8ED7 5E48 60A4 82D0 381F A2D4 625C"            /* ÷.Ž×^H`¤‚Ð8.¢Ôb\ */
+        $"9F80 2A63 5FD3 DD0C EDA8 3DE3 281E A65C"            /* Ÿ€*c_ÓÝ.í¨=ã(.¦\ */
+        $"88EA 1A96 626D DC03 79BE C4ED EA60 4FC5"            /* ˆê.–bmÜ.y¾Äíê`OÅ */
+        $"BB10 D9D5 99AF 0534 65C2 05AE 8D23 82B0"            /* ».ÙÕ™¯.4eÂ.®�#‚° */
+        $"6FB7 881A 7BC5 0316 7A28 4B27 2763 A6C3"            /* o·ˆ.{Å..z(K''c¦Ã */
+        $"8FC7 073A 1391 81BB 707F 625D 355F B1DF"            /* �Ç.:.‘�»p.b]5_±ß */
+        $"A749 C3EE A157 EC1F 0F6C 70AB 1A36 5711"            /* §IÃî¡Wì..lp«.6W. */
+        $"C49B 1CA8 54A0 0FB9 6A2E 0F86 2E57 BC2F"            /* Ä›.¨T .¹j..†.W¼/ */
+        $"8CDD B76A F6DB 83F9 EEFF 4BF1 DE60 660E"            /* ŒÝ·jöÛƒùîÿKñÞ`f. */
+        $"BCBA 7D68 D5DE 8663 DF06 3F65 A981 38D7"            /* ¼º}hÕÞ†cß.?e©�8× */
+        $"CC20 EBAE 6143 C79E D2F3 DCF4 FA0F 433E"            /* Ì ë®aCÇžÒóÜôú.C> */
+        $"6DFE 4C5F 032A F6DD DD11 F85F 5003 22CD"            /* mþL_.*öÝÝ.ø_P."Í */
+        $"C07E F1CC 40B9 8D61 825D 77C7 91A6 BD49"            /* À~ñÌ@¹�a‚]wÇ‘¦½I */
+        $"2590 4BCD EB13 37A2 D5FA 2931 F311 9028"            /* %�KÍë.7¢Õú)1ó.�( */
+        $"6C02 96FC ACF5 1EA4 8E51 4BC9 FDE8 DFEF"            /* l.–ü¬õ.¤ŽQKÉýèßï */
+        $"C5A0 8082 7E0D C127 3A80 A65B 7989 CCEE"            /* Å €‚~.Á':€¦[y‰Ìî */
+        $"6F6A 8DDF FB5B 46A5 3757 7FC3 3EFD BC0A"            /* oj�ßû[F¥7W.Ã>ý¼Â */
+        $"8567 1CB0 3BE7 A153 D7CE 8F63 D2DC 8840"            /* …g.°;ç¡S×Î�cÒ܈@ */
+        $"D993 E028 0E86 AA99 3ADE CC55 A789 CFC8"            /* Ù“à(.†ª™:ÞÌU§‰ÏÈ */
+        $"D92B 9613 3850 B7B3 467A FA09 7D45 E174"            /* Ù+–.8P·³FzúÆ}Eát */
+        $"D351 3254 64A3 7FC5 0D8D 1EDB FEC9 3F05"            /* ÓQ2Td£.Å.�.ÛþÉ?. */
+        $"C3C2 264B ACB8 F3C3 1BFF 04A5 12CF C191"            /* ÃÂ&K¬¸óÃ.ÿ.¥.ÏÁ‘ */
+        $"8CA0 5985 E34C E583 A230 CD43 8602 BAAF"            /* Œ Y…ãL僢0ÍC†.º¯ */
+        $"1475 FCA7 B274 1314 051F AF06 089D 13B1"            /* .uü§²t....¯..�.± */
+        $"5C06 815E FAA5 6864 CECE D56A 127C 058B"            /* \.�^ú¥hdÎÎÕj.|.‹ */
+        $"1859 E9E8 7A98 4299 3CFF 70CE C2DD 8676"            /* .Yéèz˜B™<ÿpÎÂ݆v */
+        $"1798 5F8E 9960 922E 9226 3F9B 5657 890F"            /* .˜_Ž™`’.’&?›VW‰. */
+        $"75BC FECF 6919 6701 D086 0EA5 26BA 8B78"            /* u¼þÏi.g.І.¥&º‹x */
+        $"7381 41FC 19AD 7201 BFD9 B3D3 2F00 1A1C"            /* s�Aü.­r.¿Ù³Ó/... */
+        $"E689 F3BC 5FC7 0418 66A2 5AEE 0374 DE30"            /* æ‰ó¼_Ç..f¢Zî.tÞ0 */
+        $"DC4B 70F1 ACC6 2BC6 06E9 461F E71B CD5E"            /* ÜKpñ¬Æ+Æ.éF.ç.Í^ */
+        $"2766 D533 884B A37F 7820 5CCA 3D60 1C3A"            /* 'fÕ3ˆK£.x \Ê=`.: */
+        $"8865 509F C1F0 86B6 9A91 0A52 426E CF1D"            /* ˆePŸÁð†¶š‘ÂRBnÏ. */
+        $"4B52 7AFE 9519 ECDB 9DD3 BFA1 80F7 50BD"            /* KRzþ•.ìÛ�Ó¿¡€÷P½ */
+        $"D2DD 6FAB F00D 3600 9104 37AC 81AA F9C3"            /* ÒÝo«ð.6.‘.7¬�ªùà */
+        $"3933 A702 AC9C 42F1 4579 C5F2 CD99 165F"            /* 93§.¬œBñEyÅòÍ™._ */
+        $"2D84 FE8B D02C 055F F99C 1729 45C7 6B56"            /* -„þ‹Ð,._ùœ.)EÇkV */
+        $"EE73 818A 9940 BB46 1408 639B 9779 C805"            /* îs�Š™@»F..c›—yÈ. */
+        $"1B0B CC86 D42E E9BB 046D 0E93 7273 E00F"            /* ..̆Ô.é».m.“rsà. */
+        $"B7D5 D377 E0ED 2494 4623 5BDF C83C 54A5"            /* ·ÕÓwàí$”F#[ßÈ<T¥ */
+        $"6B6B D343 F20E AD4C B45C 2BF4 7C65 87A1"            /* kkÓCò.­L´\+ô|e‡¡ */
+        $"E2EA E2B7 FF17 F9A1 5606 D5A7 C113 F062"            /* âêâ·ÿ.ù¡V.Õ§Á.ðb */
+        $"D50E E647 922C 8746 7CBA 99C8 4400 979D"            /* Õ.æG’,‡F|º™ÈD.—� */
+        $"3D09 19E7 3A84 E245 ED1F 1C14 3967 45CE"            /* =Æ.ç:„âEí...9gEÎ */
+        $"2B06 C383 F2A6 2CEE 02E6 A2A7 1821 0F3F"            /* +.Ãò¦,î.梧.!.? */
+        $"4057 F9E9 B830 94C7 65AA C396 6F97 2721"            /* @Wùé¸0”ÇeªÃ–o—'! */
+        $"F1AC 6AF7 6C6C 3F02 D2F1 343D 8B42 0F6F"            /* ñ¬j÷ll?.Òñ4=‹B.o */
+        $"E2D4 A7D8 7158 F033 C573 AD72 01B7 1CC7"            /* âÔ§ØqXð3Ås­r.·.Ç */
+        $"4CA6 78C2 BABD BB30 5E03 BDEE DF19 8240"            /* L¦xº½»0^.½îß.‚@ */
+        $"9521 A43A B142 2F42 3590 AD8C B9FD A409"            /* •!¤:±B/B5�­Œ¹ý¤Æ */
+        $"9D77 38E7 B8F8 3BCD 4478 61C3 5768 0324"            /* �w8ç¸ø;ÍDxaÃWh.$ */
+        $"4E55 4240 1E87 1F93 D0BA 6929 C235 7E76"            /* NUB@.‡.“кi)Â5~v */
+        $"F6E8 AA1B AF13 15FD EB95 2609 BE7D BFE8"            /* öèª.¯..ýë•&ƾ}¿è */
+        $"3E51 8F2E 4780 4EE6 891E F83D FF7D D1C3"            /* >Q�.G€Næ‰.ø=ÿ}Ñà */
+        $"818F 28A2 2AC0 AD00 7F03 5781 2882 A44A"            /* ��(¢*À­...W�(‚¤J */
+        $"6728 D9F6 E77F A883 C794 71AC 55E9 8112"            /* g(Ùöç.¨ƒÇ”q¬Ué�. */
+        $"BF6F ECDA 9BD1 96B8 79AA A397 A6F2 C93F"            /* ¿oìڛі¸yª£—¦òÉ? */
+        $"3792 B8C4 8667 AAF4 659D 59F6 E77F A870"            /* 7’¸Ä†gªôe�Yöç.¨p */
+        $"24F1 5461 DB69 0F4C F8B3 F02A F6E7 7FA6"            /* $ñTaÛi.Lø³ð*öç.¦ */
+        $"26C9 5EDE 9BB6 A1C6 9467 854A 5327 BA38"            /* &É^Þ›¶¡Æ”g…JS'º8 */
+        $"F535 A01A B90A 9580 95A0 FE5C A623 DE0D"            /* õ5 .¹Â•€• þ\¦#Þ. */
+        $"6C3E BF23 66F2 9312 9490 EB88 1D63 7AF4"            /* l>¿#fò“.”�ëˆ.czô */
+        $"9F5B 7F45 9078 3A5F CC36 7702 EAD5 FA4D"            /* Ÿ[.E�x:_Ì6w.êÕúM */
+        $"5F9D 258B 14A8 A235 6490 6B7D 2B05 42C3"            /* _�%‹.¨¢5d�k}+.Bà */
+        $"2A5A 791E 92C3 B1E8 B323 FF74 81FC B063"            /* *Zy.’ñè³#ÿt�ü°c */
+        $"4A31 CBBC 91E2 A64A F935 FE79 4C07 1376"            /* J1˼‘â¦Jù5þyL..v */
+        $"002A 4795 5221 70B2 005C 41F9 D631 126F"            /* .*G•R!p².\AùÖ1.o */
+        $"FF7F DF03 06BD 7214 71AB 4EF3 8EEA 0261"            /* ÿ.ß..½r.q«NóŽê.a */
+        $"D054 C087 EA15 CBD2 4645 2F9F 3600 4144"            /* ÐTÀ‡ê.ËÒFE/Ÿ6.AD */
+        $"5671 C61E D3CB 8B84 A60D B58E FB69 C71F"            /* VqÆ.ÓË‹„¦.µŽûiÇ. */
+        $"B09A EDD9 AAC0 6FBA D7FE 8C4D 8262 6C73"            /* °šíÙªÀoº×þŒM‚bls */
+        $"9F69 0E81 7581 1D52 FB27 C979 1597 69EA"            /* Ÿi.�u�.Rû'Éy.—iê */
+        $"F1DF E906 0B77 2E21 D31A 5CCD 9474 95A2"            /* ñßé..w.!Ó.\Í”t•¢ */
+        $"CB48 AB27 5F53 B82F 1638 16A4 87CD ED1F"            /* ËH«'_S¸/.8.¤‡Íí. */
+        $"20BC 2894 5EE1 C84C 1AC1 1158 0293 024E"            /*  ¼(”^áÈL.Á.X.“.N */
+        $"1023 0E4F 9BD8 FA73 6E62 FF7F FD08 5797"            /* .#.O›Øúsnbÿ.ý.W— */
+        $"0788 A951 6DDA 2448 21D2 7FCA 20B4 E1BF"            /* .ˆ©QmÚ$H!Ò.Ê ´á¿ */
+        $"3262 89C7 5386 ACB1 8B89 6AC3 F907 1355"            /* 2b‰ÇS†¬±‹‰jÃù..U */
+        $"66D9 1E5A 5B54 19E9 2737 FF7C B8DF 1F5E"            /* fÙ.Z[T.é'7ÿ|¸ß.^ */
+        $"3592 B16D 6089 DE73 8F19 479D 626B 977D"            /* 5’±m`‰Þs�.G�bk—} */
+        $"185E F7A3 AF62 AD92 E5AC 2F74 B991 F96F"            /* .^÷£¯b­’å¬/t¹‘ùo */
+        $"211F 5AE0 4C27 344F A9E1 C731 DB20 A0FF"            /* !.ZàL'4O©áÇ1Û  ÿ */
+        $"7FFF 7F2E 356F CC55 C6B8 C2C9 2AEF 2D31"            /* .ÿ..5oÌUƸÂÉ*ï-1 */
+        $"EFEB D878 C16F B1B1 3D47 240C 489C 7153"            /* ïëØxÁo±±=G$.HœqS */
+        $"E5F8 A5C8 6E2C 7650 AED0 C4B7 43EA 67B6"            /* åø¥Èn,vP®ÐÄ·Cêg¶ */
+        $"94E4 7274 CFEB 4CF3 FD3E 8065 B9CC 35A5"            /* ”ärtÏëLóý>€e¹Ì5¥ */
+        $"21B1 3804 AD98 4F8A 6FFC 50DA 014C 442B"            /* !±8.­˜OŠoüPÚ.LD+ */
+        $"AA41 1455 BD94 B366 A37D CA82 7FFC DE57"            /* ªA.U½”³f£}Ê‚.üÞW */
+        $"2EA9 98C2 5510 E51E 24CC 0428 4C83 1BBE"            /* .©˜ÂU.å.$Ì.(Lƒ.¾ */
+        $"0A46 A6DD 6963 D4CB 24E8 748B ED10 7B6D"            /* ÂF¦ÝicÔË$èt‹í.{m */
+        $"E61C 86C3 C80E 3030 FCE9 2263 C956 95A1"            /* æ.†ÃÈ.00üé"cÉV•¡ */
+        $"AED0 C4B1 D07C F701 9DA0 ED2C C401 BC1A"            /* ®ÐıÐ|÷.� í,Ä.¼. */
+        $"9421 2D43 EF12 7494 8D46 CB82 3FE2 6439"            /* ”!-Cï.t”�FË‚?âd9 */
+        $"6BDE C8CE 23B7 9D2E B6F9 DF4B C1A9 A145"            /* kÞÈÎ#·�.¶ùßKÁ©¡E */
+        $"1512 85E6 30E6 98D1 AC22 EEBC 459C D841"            /* ..…æ0æ˜Ñ¬"î¼EœØA */
+        $"0A0F 1F31 2F75 7937 220F 7271 FE79 44A6"            /* Â..1/uy7".rqþyD¦ */
+        $"777E 1645 E0BA D980 0FFF 7D9F EC83 A930"            /* w~.EàºÙ€.ÿ}Ÿìƒ©0 */
+        $"D12B 216D 4D3F 4AD0 5EE9 DBC7 53D7 0A21"            /* Ñ+!mM?JÐ^éÛÇS×Â! */
+        $"2372 C608 6701 8AFA 8E33 4125 2B7E 38DA"            /* #rÆ.g.ŠúŽ3A%+~8Ú */
+        $"5990 99EE B1D0 B07C 9F9D 97DD D658 2C2A"            /* Y�™î±Ð°|Ÿ�—ÝÖX,* */
+        $"C7D6 4556 2AA7 297F ACBE 4802 B472 E76F"            /* ÇÖEV*§).¬¾H.´rço */
+        $"644F 2F11 17FF 7F9D CE1C 2989 7199 03B1"            /* dO/..ÿ.�Î.)‰q™.± */
+        $"E719 2B3B 1131 C4CC 808B BC7A 26A4 479F"            /* ç.+;.1ÄÌ€‹¼z&¤GŸ */
+        $"4824 6486 E338 DB65 A502 454C C415 B8D0"            /* H$d†ã8Ûe¥.ELÄ.¸Ð */
+        $"7C77 7323 E381 5958 F415 95B9 142E 85F8"            /* |ws#ã�YXô.•¹..…ø */
+        $"1742 E22F FF17 567B A195 DFF1 7EE0 8E40"            /* .Bâ/ÿ.V{¡•ßñ~àŽ@ */
+        $"431A B629 DDCE AED1 A925 9FCD 56B5 7945"            /* C.¶)Ýήѩ%ŸÍVµyE */
+        $"B8B9 77DF 732C CD1E 8137 2645 1135 9593"            /* ¸¹wßs,Í.�7&E.5•“ */
+        $"E31C 333B 30E2 518D E202 A1E0 FEA6 C40E"            /* ã.3;0âQ�â.¡àþ¦Ä. */
+        $"BB50 0174 C21D 0BFB 34C1 1A8D 8E5D FF77"            /* »P.tÂ..û4Á.�Ž]ÿw */
+        $"909A 8111 3123 8200 AFC2 0525 13A1 C383"            /* �š�.1#‚.¯Â.%.¡Ãƒ */
+        $"5472 BA45 8D58 8818 E5CD 6FEA D858 47C5"            /* TrºE�Xˆ.åÍoêØXGÅ */
+        $"F5A0 7773 3C86 1CE8 9A67 FAA7 5726 643B"            /* õ ws<†.èšgú§W&d; */
+        $"1BF8 C2C1 E7AD D3CE E89B 97C4 0210 1FAE"            /* .øÂÁç­ÓÎè›—Ä...® */
+        $"9319 1F1F 7F89 0B76 5918 7EF8 9947 CF44"            /* “....‰.vY.~ø™GÏD */
+        $"6B5C 4B5D 5067 58A7 F35E CF39 7D01 C555"            /* k\K]PgX§ó^Ï9}.ÅU */
+        $"FCD3 E0F6 C1A4 9C8A 0B34 2D33 A20D F664"            /* üÓàöÁ¤œŠ.4-3¢.öd */
+        $"C174 CCE8 CAA1 C45F 2974 101B 86E7 68FD"            /* ÁtÌèÊ¡Ä_)t..†çhý */
+        $"D6FE 8FE9 AC95 5D3D DE38 1829 E3B9 37FE"            /* Öþ�鬕]=Þ8.)ã¹7þ */
+        $"5008 F383 21C4 4D57 AE92 9F94 A9BB 3A76"            /* P.óƒ!ÄMW®’Ÿ”©»:v */
+        $"705F 8D2D 889C EB93 FD2B 05C5 89F2 500E"            /* p_�-ˆœë“ý+.ʼnòP. */
+        $"4220 A486 F348 D466 4D62 E368 540A 1D25"            /* B ¤†óHÔfMbãhTÂ.% */
+        $"AF7C A9EF 43CC E423 16FC 6EE5 C407 DDAE"            /* ¯|©ïCÌä#.ünåÄ.Ý® */
+        $"EB28 23D2 3FDE 40EF 2ED1 D53A B87B 9C40"            /* ë(#Ò?Þ@ï.ÑÕ:¸{œ@ */
+        $"80A2 77EF CC8F D34E C33F 7BB4 4748 E4A6"            /* €¢wïÌ�ÓNÃ?{´GHä¦ */
+        $"B177 05FF 085F CBF9 F1A0 8CA7 4200 32AC"            /* ±w.ÿ._Ëùñ Œ§B.2¬ */
+        $"7B87 A517 EA04 C96C F9A3 C6ED 5FFF 7FED"            /* {‡¥.ê.Élù£Æí_ÿ.í */
+        $"D5EB F835 3E15 6882 AED1 72BF B42C 87DE"            /* Õëø5>.h‚®Ñr¿´,‡Þ */
+        $"8111 0F7A 5DA6 CFEA 79A7 9174 89E8 E637"            /* �..z]¦Ïêy§‘t‰èæ7 */
+        $"7E56 B53E 9987 2013 8F1A 06A5 07A2 1856"            /* ~Vµ>™‡ .�..¥.¢.V */
+        $"FE30 E259 128A 968B 881F E88D 8566 98D7"            /* þ0âY.Š–‹ˆ.è�…f˜× */
+        $"C815 C397 64E8 9FAC 059A 5922 C863 F220"            /* È.×d蟬.šY"Ècò  */
+        $"EC2A 4AF8 5DB2 A77D FC6A 3AC1 357E D5CC"            /* ì*Jø]²§}üj:Á5~ÕÌ */
+        $"142B 85B0 FEE0 2579 D845 CDFD F507 4C58"            /* .+…°þà%yØEÍýõ.LX */
+        $"D86A F299 0BBC A0A8 39A4 03D9 2144 6B3E"            /* Øjò™.¼ ¨9¤.Ù!Dk> */
+        $"6D67 242B 0FEB B6F4 79CB 58ED 2338 DB9F"            /* mg$+.ë¶ôyËXí#8ÛŸ */
+        $"6EC7 1626 0FDD 0C77 1E00 2AE4 8B46 F39C"            /* nÇ.&.Ý.w..*ä‹Fóœ */
+        $"6268 EE5F FF49 B5C8 30E7 9859 E163 A9D4"            /* bhî_ÿIµÈ0ç˜Yác©Ô */
+        $"C50F BC0C 46BB BBC7 9FFF 7D54 E81B 8936"            /* Å.¼.F»»ÇŸÿ}Tè.‰6 */
+        $"A032 72E8 6576 5FEA 9A3F A5A9 9E58 B9C2"            /*  2rèev_êš?¥©žX¹Â */
+        $"A089 A039 5695 766F 3295 A1FF 7F5F FBDB"            /*  ‰ 9V•vo2•¡ÿ._ûÛ */
+        $"A3FD 1F1F 76AD 6787 B4D0 D1A5 E4EA 72F8"            /* £ý..v­g‡´ÐÑ¥äêrø */
+        $"0276 0C35 EC34 65A8 000A CA35 6AAE 1800"            /* .v.5ì4e¨.ÂÊ5j®.. */
+        $"99CA 1B65 F56D 6C3B DF33 AB08 94A3 15CF"            /* ™Ê.eõml;ß3«.”£.Ï */
+        $"C9B8 D32E 35D7 D32D 57E6 86D2 A5BE 2B3A"            /* ɸÓ.5×Ó-Wæ†Ò¥¾+: */
+        $"4535 2C10 41FE FDA9 E202 3927 BC4F 5F90"            /* E5,.Aþý©â.9'¼O_� */
+        $"E637 311C DB00 E394 09F3 005B 7DB3 0DFE"            /* æ71.Û.ã”Æó.[}³.þ */
+        $"9F1F CAA4 DD03 B381 8330 AB38 E13B 2F9C"            /* Ÿ.ʤÝ.³�ƒ0«8á;/œ */
+        $"3DB5 01C5 100A 5D16 5C8D 792C FA0E 1A85"            /* =µ.Å.Â].\�y,ú..… */
+        $"E3FF 467A 6333 E4F1 F27C 9E2B 161E 18F0"            /* ãÿFzc3äñò|ž+...ð */
+        $"3F30 9C2C 631D BE74 4B7F 6E21 3FBC 404E"            /* ?0œ,c.¾tK.n!?¼@N */
+        $"E063 4152 D02D 68E4 869C E7E9 E4E6 4E95"            /* àcARÐ-h䆜çéäæN• */
+        $"3A66 1FDA 1145 DFB4 0796 9F97 503C E2C9"            /* :f.Ú.Eß´.–Ÿ—P<âÉ */
+        $"7F49 D644 1290 98BD 8EA0 2FA1 CF00 E383"            /* .IÖD.�˜½Ž /¡Ï.ム*/
+        $"C003 7BFE D79B FF62 A38E 2C39 A64D 19FF"            /* À.{þ×›ÿb£Ž,9¦M.ÿ */
+        $"6A9D 976A 994B 6626 4F4D 7DC8 F0CA EDB7"            /* j�—j™Kf&OM}ÈðÊí· */
+        $"F99E 21E2 36B4 3AAB E787 C6A2 1783 F623"            /* ùž!â6´:«ç‡Æ¢.ƒö# */
+        $"8755 1F66 AFBC 2959 6E6E 2E61 AC85 2198"            /* ‡U.f¯¼)Ynn.a¬…!˜ */
+        $"9978 EDFD 334C F0D6 7F76 9AF2 47AF 5E4B"            /* ™xíý3LðÖ.všòG¯^K */
+        $"805C 54D3 5F2A 16C5 6675 C288 B44F F851"            /* €\TÓ_*.Åfuˆ´OøQ */
+        $"1CE9 9F21 BF10 92B9 2366 5D69 AE8E 9989"            /* .éŸ!¿.’¹#f]i®Ž™‰ */
+        $"36A6 F9E6 75A7 0D47 C8B5 8727 0138 2BFA"            /* 6¦ùæu§.Gȵ‡'.8+ú */
+        $"5C4A 649C 123C 225E 2CEC 2007 5016 3F11"            /* \Jdœ.<"^,ì .P.?. */
+        $"B8FF 60CB 7150 EBFD DFED 147E 0A98 E096"            /* ¸ÿ`ËqPëýßí.~Â˜à– */
+        $"6B76 3AF0 39A5 5BF2 880C E857 174C 8735"            /* kv:ð9¥[òˆ.èW.L‡5 */
+        $"ACF6 E4B7 3477 6293 FF7C 8515 A8DE 4E73"            /* ¬öä·4wb“ÿ|….¨ÞNs */
+        $"8E37 8A0C 4384 0CF3 FA01 15F5 9639 ED05"            /* Ž7Š.C„.óú..õ–9í. */
+        $"C86B 28A0 C331 14BC 2817 FE9B F96A D60D"            /* Èk( Ã1.¼(.þ›ùjÖ. */
+        $"EBCB 14DA FF7F FF47 8A61 A2C7 F01F 10B7"            /* ëË.Úÿ.ÿGŠa¢Çð..· */
+        $"3DAF B01C B484 F55D 457E E3EC CC41 95DE"            /* =¯°.´„õ]E~ãìÌA•Þ */
+        $"097E 8117 F77F FEFB A490 8B96 1300 2B37"            /* Æ~�.÷.þû¤�‹–..+7 */
+        $"19FA E04C 4188 E9F6 8950 0668 B082 8FD8"            /* .úàLAˆéö‰P.h°‚�Ø */
+        $"0B7D 6C32 4DBF F84F F4E9 ACAF 719A DC43"            /* .}l2M¿øOô鬯qšÜC */
+        $"9F8D A53E DF1A BDB0 AAA7 3267 9C2D 357A"            /* Ÿ�¥>ß.½°ª§2gœ-5z */
+        $"9CA7 1AE1 59C4 F467 83D3 308B 004A 42C2"            /* œ§.áYÄôgƒÓ0‹.JB */
+        $"909B F979 41CE AB25 C6D1 9FE9 46E1 E837"            /* �›ùyAΫ%ÆÑŸéFáè7 */
+        $"7ADF FF72 225E 4472 D323 F55C BE19 1E50"            /* zßÿr"^DrÓ#õ\¾..P */
+        $"BF94 6787 CADB F576 300A 054B 0A2D E9B2"            /* ¿”g‡ÊÛõv0Â.KÂ-é² */
+        $"5C15 DB84 E735 F76D 5477 D8A7 28AF FF7A"            /* \.Û„ç5÷mTwا(¯ÿz */
+        $"7EB8 06F8 4FF4 E999 ED48 02C4 F111 F61D"            /* ~¸.øOôé™íH.Äñ.ö. */
+        $"8A6C 1CC6 AE54 94E4 8C5D 7655 4ECC 205F"            /* Šl.Æ®T”äŒ]vUNÌ _ */
+        $"DBF9 1BA7 83CC 52E9 E9C9 52A4 1151 7DE4"            /* Ûù.§ƒÌRééÉR¤.Q}ä */
+        $"051B E140 3FC0 D60B 0C11 663F 98A9 8B53"            /* ..á@?ÀÖ...f?˜©‹S */
+        $"776E BD8D 7678 AD62 ACEE 033F D134 B61E"            /* wn½�vx­b¬î.?Ñ4¶. */
+        $"F86D 3384 AAE7 9074 F7CF 4509 F9B3 4F30"            /* øm3„ªç�t÷ÏEÆù³O0 */
+        $"F32D 840F 1DDA E6B1 BDD4 951F 2379 F890"            /* ó-„..Úæ±½Ô•.#yø� */
+        $"530A E915 A228 D3D8 B188 C692 2767 D628"            /* SÂé.¢(ÓرˆÆ’'gÖ( */
+        $"12F8 3FFA BA23 F76B 1D92 1FC1 EA73 30FC"            /* .ø?úº#÷k.’.Áês0ü */
+        $"CE72 0CA5 6695 6326 F93B B52F B9D4 F6F0"            /* Îr.¥f•c&ù;µ/¹Ôöð */
+        $"FF07 727B 80F9 EBFC 2176 788C 333F 4137"            /* ÿ.r{€ùëü!vxŒ3?A7 */
+        $"E82C D066 6088 A8EA 168F 40EA F1EE BDE8"            /* è,Ðf`ˆ¨ê.�@êñî½è */
+        $"C023 75BA 66F2 335A 98C0 31A8 2137 7A7B"            /* À#uºfò3Z˜À1¨!7z{ */
+        $"DA0F 3962 D4B3 3E6E A5A1 3A19 5EED 48A7"            /* Ú.9bÔ³>n¥¡:.^íH§ */
+        $"7617 DE46 D178 BC48 D85D 7821 DFEC B30D"            /* v.ÞFÑx¼HØ]x!ßì³. */
+        $"F84F B7CD 80ED 55C7 9E1A F58D 7085 F625"            /* øO·Í€íUÇž.õ�p…ö% */
+        $"F564 3BF5 A09E B353 4E45 2F0B FC02 ECFD"            /* õd;õ ž³SNE/.ü.ìý */
+        $"539F 529C A652 34F1 C0CC BC04 FCE0 2C7D"            /* SŸRœ¦R4ñÀ̼.üà,} */
+        $"A8A9 9E67 79E9 ADE4 ABEE BFF6 4793 1B91"            /* ¨©žgyé­ä«î¿öG“.‘ */
+        $"413A 4302 7FB5 190C CB09 0DC9 3B33 E18D"            /* A:C..µ..ËÆ.É;3á� */
+        $"DDAB 23C5 FABA 5DC1 554F C940 B964 7F6A"            /* Ý«#Åúº]ÁUOÉ@¹d.j */
+        $"A781 2032 BF9E 0262 7C99 CD96 9251 9FB6"            /* §� 2¿ž.b|™Í–’QŸ¶ */
+        $"1C69 9141 7A13 3022 DE48 DA68 C959 A0B5"            /* .i‘Az.0"ÞHÚhÉY µ */
+        $"0F3A F19A 9301 5051 5855 9D7B 5173 EE47"            /* .:ñš“.PQXU�{QsîG */
+        $"2B0D DB30 28CC 5E41 46F1 E79F 90B3 AB2A"            /* +.Û0(Ì^AFñçŸ�³«* */
+        $"CAEA 6128 10E1 2CC0 DDC2 EBF1 26F1 E1DC"            /* Êêa(.á,ÀÝÂëñ&ñáÜ */
+        $"EB87 87ED 55F3 827C A066 D932 FCF7 B134"            /* 뇇íUó‚| fÙ2ü÷±4 */
+        $"8BC9 CC70 B38C B019 8372 EA60 7C36 4D38"            /* ‹ÉÌp³Œ°.ƒrê`|6M8 */
+        $"F82F 16C2 2390 A91B 203A 8EBE D0EC E278"            /* ø/.Â#�©. :Ž¾Ðìâx */
+        $"7AC4 8493 A217 6AC3 B85A 470D D74A B91D"            /* zÄ„“¢.jøZG.×J¹. */
+        $"0180 7BAB 4088 5671 6268 5B4A 54FE C179"            /* .€{«@ˆVqbh[JTþÁy */
+        $"1600 7677 830B 0E81 EEB2 6124 33F8 DBBD"            /* ..vwƒ..�î²a$3øÛ½ */
+        $"1B35 D1F9 0568 3891 0ECB A836 5A86 9636"            /* .5Ñù.h8‘.˨6Z†–6 */
+        $"9F87 052F 0D66 8AA3 3362 1651 9B33 9057"            /* Ÿ‡./.fŠ£3b.Q›3�W */
+        $"5B98 05EB 23CE 099F 2358 444E 0D64 A9F9"            /* [˜.ë#ÎÆŸ#XDN.d©ù */
+        $"A569 7D56 A50D 6256 69AF BDD9 7847 D651"            /* ¥i}V¥.bVi¯½ÙxGÖQ */
+        $"73E2 F76E F277 58DC BFB9 7B8E 593C 0E97"            /* sâ÷nòwXÜ¿¹{ŽY<.— */
+        $"3C4E 507D FA6C 7984 FAC8 6C42 6882 78AC"            /* <NP}úly„úÈlBh‚x¬ */
+        $"E40D B7A2 4E43 998B 1C29 D7C6 B7BA 58C9"            /* ä.·¢NC™‹.)×Æ·ºXÉ */
+        $"3503 114B 86B8 CB5D B605 832D 98FE 0257"            /* 5..K†¸Ë]¶.ƒ-˜þ.W */
+        $"FB50 8CA0 43D4 71BE E330 1584 5983 668F"            /* ûPŒ CÔq¾ã0.„Yƒf� */
+        $"735C 2448 3B30 82E4 1932 5BF8 129F FE38"            /* s\$H;0‚ä.2[ø.Ÿþ8 */
+        $"749D 01ED DAFC 95B9 375D BBCB 60D9 FC58"            /* t�.íÚü•¹7]»Ë`ÙüX */
+        $"0796 AEFC 2337 F89E 01F5 48BD 0BAF A61F"            /* .–®ü#7øž.õH½.¯¦. */
+        $"3EC4 C092 DC6A 584C AAAF 1A9F A20F CEA4"            /* >ÄÀ’ÜjXLª¯.Ÿ¢.Τ */
+        $"884B 2DB6 09F4 F51B 546F CD71 F4D3 6452"            /* ˆK-¶Æôõ.ToÍqôÓdR */
+        $"B6E5 3EFF 66F8 0D60 D916 F755 1348 E250"            /* ¶å>ÿfø.`Ù.÷U.HâP */
+        $"D8E2 6858 B424 B84B D59A 6885 24D3 D845"            /* ØâhX´$¸KÕšh…$ÓØE */
+        $"692F 4313 B616 584F 7419 0661 0064 C281"            /* i/C.¶.XOt..a.dÂ� */
+        $"A873 131C 5296 042B 1FD5 3EED BFC2 659E"            /* ¨s..R–.+.Õ>í¿Âež */
+        $"C4C7 2720 8002 28DD 141A BBE7 99F8 028F"            /* ÄÇ' €.(Ý..»ç™ø.� */
+        $"8262 0577 5240 EB9A F866 2901 B75B 3FED"            /* ‚b.wR@ëšøf).·[?í */
+        $"9E78 9071 83FD 02BC FCDE 2135 42D1 F184"            /* žx�qƒý.¼üÞ!5BÑñ„ */
+        $"309D F47E DF10 F797 4268 120A D377 04A4"            /* 0�ô~ß.÷—Bh.ÂÓw.¤ */
+        $"2998 099E CA35 66AD FB20 8C14 1E0E 714E"            /* )˜ÆžÊ5f­û Œ...qN */
+        $"B9A7 70EE 5BA0 7A18 FC16 97EB 1A98 CB6C"            /* ¹§pî[ z.ü.—ë.˜Ël */
+        $"4B5D AC5B 3DC2 2062 E74A 18F2 0A76 6085"            /* K]¬[=Â bçJ.òÂv`… */
+        $"EF50 1C2F FE23 117A ED22 7BE8 0231 BC71"            /* ïP./þ#.zí"{è.1¼q */
+        $"707C 6736 BC3C 38AA 81C2 66B6 DCE5 13E9"            /* p|g6¼<8ª�Âf¶Üå.é */
+        $"3076 C7AD 8C4B A962 C37E 4605 CDC0 8247"            /* 0vÇ­ŒK©bÃ~F.ÍÀ‚G */
+        $"190C 41CD 6923 8D00 BC94 5B5F E2AB 443B"            /* ..AÍi#�.¼”[_â«D; */
+        $"3C5A 7FF6 213C 9E2D 9224 70B1 EA9B 7D36"            /* <Z.ö!<ž-’$p±ê›}6 */
+        $"E7EA 0D03 CB32 7413 AB26 CB30 1B56 CBDE"            /* çê..Ë2t.«&Ë0.VËÞ */
+        $"3C31 361D 24E2 F441 4D78 7825 1DA0 0C14"            /* <16.$âôAMxx%. .. */
+        $"5C84 B112 6FC1 77DB 42CA 7791 960B 9F09"            /* \„±.oÁwÛBÊw‘–.ŸÆ */
+        $"980A 5629 54C0 EC82 889A B0E3 38F4 E734"            /* ˜ÂV)TÀ삈š°ã8ôç4 */
+        $"FA91 D5CD 2C8F 43CD 5629 3DAD 81DA 5E0A"            /* ú‘ÕÍ,�CÍV)=­�Ú^Â */
+        $"C008 712F EAD3 2486 4CD2 C7BA 0FA9 BBD3"            /* À.q/êÓ$†LÒǺ.©»Ó */
+        $"6AC2 A912 7736 5A33 CC96 9EDC 9C5A 3084"            /* j©.w6Z3Ì–žÜœZ0„ */
+        $"C826 A3FB 0661 ED4B 9689 A921 22AB 2399"            /* È&£û.aíK–‰©!"«#™ */
+        $"6F2A 4A78 A5F8 A059 BE4B 7DFF 5D41 1A31"            /* o*Jx¥ø Y¾K}ÿ]A.1 */
+        $"E688 045C BD1E D1DB 7C5B 6B89 5C22 3CAF"            /* æˆ.\½.ÑÛ|[k‰\"<¯ */
+        $"F133 FF14 13A2 9A3F 6E42 54EB 5082 9F25"            /* ñ3ÿ..¢š?nBTëP‚Ÿ% */
+        $"7C07 6BA6 25EA A890 3560 E915 B058 CB68"            /* |.k¦%ê¨�5`é.°XËh */
+        $"3601 4B07 ACE7 EC8A 2897 F908 D405 455E"            /* 6.K.¬çìŠ(—ù.Ô.E^ */
+        $"5EDD 427E 791A EA3D 6ACE 3BC0 0D43 731A"            /* ^ÝB~y.ê=jÎ;À.Cs. */
+        $"C9C6 8C03 BD83 6F85 EF75 7246 2F8E 1CFB"            /* ÉÆŒ.½ƒo…ïurF/Ž.û */
+        $"8DC9 2726 593F 1D87 A822 399F 9770 324C"            /* �É'&Y?.‡¨"9Ÿ—p2L */
+        $"6ABF 38B9 E89E B2F5 D575 E7DB C449 63CF"            /* j¿8¹èž²õÕuçÛÄIcÏ */
+        $"EBE1 07BB 80A4 C099 6A15 9A47 96F3 8C8D"            /* ëá.»€¤À™j.šG–óŒ� */
+        $"49E1 1F78 2119 9460 CA7A F257 EDA1 104B"            /* Iá.x!.”`ÊzòWí¡.K */
+        $"5C68 0E57 188C 62B0 FBE3 CF4F 5251 6525"            /* \h.W.Œb°ûãÏORQe% */
+        $"CB59 5E3D C6F4 6B04 5B2D 1ED2 3BE1 02BB"            /* ËY^=Æôk.[-.Ò;á.» */
+        $"7207 12AA BFEC 50F4 83FE 2797 121B 3D14"            /* r..ª¿ìPôƒþ'—..=. */
+        $"DA23 BE41 D647 E5CA DD2D CD48 8C4D A094"            /* Ú#¾AÖGåÊÝ-ÍHŒM ” */
+        $"B1A9 4ED5 4735 8818 C4F1 597D 3211 5D12"            /* ±©NÕG5ˆ.ÄñY}2.]. */
+        $"D96B 5A38 AB9A 7E89 C503 13B0 8354 C887"            /* ÙkZ8«š~‰Å..°ƒTȇ */
+        $"F766 96F0 EDAE C6B6 17B4 E9A4 9230 C2F5"            /* ÷f–ðí®Æ¶.´é¤’0Âõ */
+        $"029D 3D72 A1CF 5BB9 E975 DBFF 06DC F5B2"            /* .�=r¡Ï[¹éuÛÿ.Üõ² */
+        $"686F 667B AD3E 1D8D 5BE4 0D6A 2CD7 DE66"            /* hof{­>.�[ä.j,×Þf */
+        $"BE8E C996 696D 58EC 6CFE 40AD 3C95 EAF1"            /* ¾ŽÉ–imXìlþ@­<•êñ */
+        $"4591 1D62 836E D2E3 4CD8 E4A6 F4F4 C456"            /* E‘.bƒnÒãLØä¦ôôÄV */
+        $"A70C B3BE AA22 A188 DAB5 D3F7 4B7B 865D"            /* §.³¾ª"¡ˆÚµÓ÷K{†] */
+        $"4D89 77E6 99A6 46C9 14BA 25E1 55C5 ADBD"            /* M‰w晦FÉ.º%áUÅ­½ */
+        $"4379 96AF 26DA A399 F009 AE75 248B 0285"            /* Cy–¯&Ú£™ðÆ®u$‹.… */
+        $"B370 5704 6429 C8AF 0BD3 A332 90B2 8351"            /* ³pW.d)ȯ.Ó£2�²ƒQ */
+        $"F715 32C9 347B EADE 2EBB 9D97 BF95 0C5A"            /* ÷.2É4{êÞ.»�—¿•.Z */
+        $"9203 1EC5 7A8E CF46 C28C 39A2 DE74 C656"            /* ’..ÅzŽÏFÂŒ9¢ÞtÆV */
+        $"F0BF 3ABF CE5F BE71 B7CE 2FF3 F41B F3EA"            /* ð¿:¿Î_¾q·Î/óô.óê */
+        $"8BE7 B07E AB17 4F87 74FC FDE8 EF9F BF3F"            /* ‹ç°~«.O‡tüýè? */
+        $"A9EB F3D5 3F3E 83BE 7BAF EA5F E0FE 7ADF"            /* ©ëóÕ?>ƒ¾{¯ê_àþzß */
+        $"E7A7 7F9D 3FE7 3BF9 FA77 F9FA 3FF9 F7C7"            /* ç§.�?ç;ùúwùú?ù÷Ç */
+        $"E7E9 871D E84F CFE8 83FC FE85 E3BB E7E7"            /* çé‡.èOÏèƒüþ…ã»çç */
+        $"AFFE 7D7F F9F5 57E7 AF70 6F9D 2DF3 9ED7"            /* ¯þ}.ùõWç¯po�-óž× */
+        $"C81E F903 FEAB 8EF9 F50D F254 3F3E A4D1"            /* È.ù.þ«Žùõ.òT?>¤Ñ */
+        $"DD53 F3F6 F37E 7EC9 4775 1BE4 77F9 EEBF"            /* ÝSóöó~~ÉGu.äwùî¿ */
+        $"9ED1 F9DC 00F7 91DD 3D8B A94D D83C 797F"            /* žÑùÜ.÷‘Ý=‹©MØ<y. */
+        $"4243 1F04 D29C 94E6 FA35 A9C7 9C1C 0762"            /* BC..Òœ”æú5©Çœ..b */
+        $"AA92 7DF8 65D6 B16D 30C6 E3F2 22D5 8971"            /* ª’}øeÖ±m0Æãò"Õ‰q */
+        $"F890 651C 37E3 1F4A 29A4 6637 D7AE 7CB9"            /* ø�e.7ã.J)¤f7×®|¹ */
+        $"14C7 D06B 2595 45F8 89DC DBAF B284 6ADA"            /* .ÇÐk%•Eø‰ÜÛ¯²„jÚ */
+        $"E4DB 9D25 F76C CDA3 EB7E 1B5A 4264 8145"            /* äÛ�%÷lÍ£ë~.ZBd�E */
+        $"547E 6F18 076D A675 BA1A 1AB1 0BF1 AEB6"            /* T~o..m¦uº..±.ñ®¶ */
+        $"C8C2 AAE0 489F 4E11 7F77 336A 41A4 C050"            /* ȪàHŸN..w3jA¤ÀP */
+        $"D19E AE10 BD35 C5EC DA71 BDEF A017 C32D"            /* Ñž®.½5ÅìÚq½ï .Ã- */
+        $"CB15 0C8E 0B75 C179 FB84 FDF2 DD5D C21F"            /* Ë..Ž.uÁyû„ýòÝ]Â. */
+        $"56A5 397D C437 A82F 65F9 2E68 A785 0AF3"            /* V¥9}Ä7¨/eù.h§…Âó */
+        $"B9F0 7781 E6B8 ACFA 09DC B57D 6317 B29B"            /* ¹ðw�測úÆܵ}c.²› */
+        $"C754 09FC 3635 9854 0DA1 A3BE D3EE CF40"            /* ÇTÆü65˜T.¡£¾ÓîÏ@ */
+        $"4BE4 A4D9 07C4 D65E 3887 C8A7 CD3A 83F5"            /* Kä¤Ù.ÄÖ^8‡È§Í:ƒõ */
+        $"DFA8 10A6 BB6D B811 852D 3877 8782 1E66"            /* ߨ.¦»m¸.…-8w‡‚.f */
+        $"AF11 43B8 CA3A 6146 3657 AFE0 B314 36CB"            /* ¯.C¸Ê:aF6W¯à³.6Ë */
+        $"8E1C 272D ED4B 634C AABA 0207 6A1A E2E3"            /* Ž.'-íKcLªº..j.âã */
+        $"C500 C0A4 894A BAD8 C9A1 0AE7 AC8D 750C"            /* Å.À¤‰JºØÉ¡Âç¬�u. */
+        $"7D84 FBCC DB2E EE05 B04A 002B B383 46DE"            /* }„ûÌÛ.î.°J.+³ƒFÞ */
+        $"C18D 5BBD B442 9E88 BBB2 89CC 0EBA CF5A"            /* Á�[½´Bžˆ»²‰Ì.ºÏZ */
+        $"5616 DDAB ED7B 4C2E 1C82 0C9D 4820 C0E8"            /* V.Ý«í{L..‚.�H Àè */
+        $"1C4E 39A5 9041 9E33 A20A A73D 821A 238A"            /* .N9¥�Až3¢Â§=‚.#Š */
+        $"3B24 14B9 D9A6 95AA F5B0 13C1 8CFD 790F"            /* ;$.¹Ù¦•ªõ°.ÁŒýy. */
+        $"33CB 82D3 FE12 0F27 F309 7453 05E0 DF8F"            /* 3Ë‚Óþ..'óÆtS.àß� */
+        $"AAE8 F77A 31BA 0118 43E1 7AE7 69DC 5D12"            /* ªè÷z1º..CázçiÜ]. */
+        $"BD53 9858 EA6D D8D3 174C FE4C F487 3CCF"            /* ½S˜XêmØÓ.LþLô‡<Ï */
+        $"9098 7872 8FC3 EBAC 4C76 F503 6915 A1B3"            /* �˜xr�Ãë¬Lvõ.i.¡³ */
+        $"5FF8 81CD E13D D511 AAB8 5C7B 1376 C87F"            /* _ø�Íá=Õ.ª¸\{.vÈ. */
+        $"2DA1 557D 2053 3341 CC15 418C 0911 5378"            /* -¡U} S3AÌ.AŒÆ.Sx */
+        $"5FFE 324E 1412 2046 B049 3A77 69B7 417F"            /* _þ2N.. F°I:wi·A. */
+        $"AC17 B8B0 7FDA 6D19 59F0 DD68 8A88 E55A"            /* ¬.¸°.Úm.YðÝhŠˆåZ */
+        $"8098 0888 3714 713A 1D17 BB8D F01C 6005"            /* €˜.ˆ7.q:..»�ð.`. */
+        $"8F2E 3D20 2753 1BB4 9BE3 DFD1 709F 99EB"            /* �.= 'S.´›ãßÑpŸ™ë */
+        $"DFCC C1B1 717B 7FA3 52BB C12D E6B7 24D2"            /* ßÌÁ±q{.£R»Á-æ·$Ò */
+        $"F448 F23D C196 1BAA D61B F422 41B4 D620"            /* ôHò=Á–.ªÖ.ô"A´Ö  */
+        $"466D 45F3 06F6 F631 3E88 5CDE F7F6 BC6F"            /* FmEó.öö1>ˆ\Þ÷ö¼o */
+        $"789C D06C 02CC 2E71 B6B0 03D2 297B BFCD"            /* xœÐl.Ì.q¶°.Ò){¿Í */
+        $"8C21 67AD CEE0 DB53 5749 A676 690C 11E3"            /* Œ!g­ÎàÛSWI¦vi..ã */
+        $"5AD2 905C 78E1 4AB0 E60E C920 4ECC 7CB6"            /* ZÒ�\xáJ°æ.É NÌ|¶ */
+        $"A76F 70F1 BCFD AA1D F4D2 E43F E203 D0C8"            /* §opñ¼ýª.ôÒä?â.ÐÈ */
+        $"E11E 61AF F1A7 5762 600E 65BB D870 818A"            /* á.a¯ñ§Wb`.e»Øp�Š */
+        $"CDF0 DFC4 8C9C 1926 678B 2732 C52F 98FD"            /* ÍðßÄŒœ.&g‹'2Å/˜ý */
+        $"33B3 EE23 138D 5E5F C9C3 FEF9 6111 E3E6"            /* 3³î#.�^_ÉÃþùa.ãæ */
+        $"AF79 A8A5 2949 D590 B463 EDF3 F72A 18FD"            /* ¯y¨¥)IÕ�´cíó÷*.ý */
+        $"BB23 233B 7924 2DD1 A335 B949 467E A30C"            /* »##;y$-Ñ£5¹IF~£. */
+        $"3185 5FE5 DB63 6748 B22D AB3F 8A8C 0926"            /* 1…_åÛcgH²-«?ŠŒÆ& */
+        $"5450 E925 A69D 1185 7300 D694 EA1F 4DF2"            /* TPé%¦�.…s.Ö”ê.Mò */
+        $"2413 F4ED 6D64 5B74 BBD5 0E65 26EF A8CD"            /* $.ôímd[t»Õ.e&ï¨Í */
+        $"5806 0C60 404F 90A0 06B6 AFD1 785F 9646"            /* X..`@O� .¶¯Ñx_–F */
+        $"B1AD 2A45 5777 33FA 49DB 8D3D AC2A BAEA"            /* ±­*EWw3úIÛ�=¬*ºê */
+        $"4527 B4DF 481A 6AB9 4485 05E6 7040 1B93"            /* E'´ßH.j¹D….æp@.“ */
+        $"D6E0 3BBF A334 E13B 68EC 934B C393 B621"            /* Öà;¿£4á;hì“KÓ¶! */
+        $"CFC8 69BE A6AC 672C 235E F1FC 4480 DE83"            /* ÏÈi¾¦¬g,#^ñüD€Þƒ */
+        $"32D7 D269 F78C F22D 5B9F F4DF DDDD D6DE"            /* 2×Òi÷Œò-[ŸôßÝÝÖÞ */
+        $"4C65 4D61 C1F0 26BF E4C3 D7C9 A034 163D"            /* LeMaÁð&¿äÃ×É 4.= */
+        $"FBAE 0167 4DF0 EBEF AA8B B742 2832 1F67"            /* û®.gMðë懲·B(2.g */
+        $"8CC0 80D0 4A6B 9843 DE59 2F7B F944 9DA4"            /* ŒÀ€ÐJk˜CÞY/{ùD�¤ */
+        $"343D 9AD9 9E0B C7B5 0B7D 2CA1 F638 8A3B"            /* 4=šÙž.ǵ.},¡ö8Š; */
+        $"BB38 A39B 025A 9BA9 34AC ACF0 063D 5483"            /* »8£›.Z›©4¬¬ð.=Tƒ */
+        $"FE57 22E4 EB2C C699 AEF3 8EFB 1C8C A23A"            /* þW"äë,Æ™®óŽû.Œ¢: */
+        $"2C15 D2EF AC9A 91C9 993A 4CB0 2DDC 0A32"            /* ,.Ò﬚‘É™:L°-ÜÂ2 */
+        $"14B9 50D2 8579 8F9D 5AF2 88DB E726 1B39"            /* .¹PÒ…y��ZòˆÛç&.9 */
+        $"3E06 69F9 F300 09E4 D3E8 BB4C A704 10E0"            /* >.iùó.ÆäÓè»L§..à */
+        $"F1D0 53DE 91D8 6723 A047 11C7 57B3 C46C"            /* ñÐSÞ‘Øg# G.ÇW³Äl */
+        $"84A7 C2E1 C7CC 185C 9F21 7E2B 0F2E 64B1"            /* „§ÂáÇÌ.\Ÿ!~+..d± */
+        $"D734 4142 C65E A2FB 9ABE B62D 076B 2B65"            /* ×4ABÆ^¢ûš¾¶-.k+e */
+        $"9D6E 63F1 4825 79A9 3936 C7A7 531F EF6A"            /* �ncñH%y©96ǧS.ïj */
+        $"F859 3084 0421 88A9 A648 8641 ACEB 95DE"            /* øY0„.!ˆ©¦H†A¬ë•Þ */
+        $"2E94 E3C9 442C 13AF CF63 0404 C5C6 5CE2"            /* .”ãÉD,.¯Ïc..ÅÆ\â */
+        $"CE90 F9CC A1B6 5713 031E C239 174F CC40"            /* Î�ùÌ¡¶W...Â9.OÌ@ */
+        $"BCA4 EA9A EB6A 1D24 7962 F735 AF5A B937"            /* ¼¤êšëj.$yb÷5¯Z¹7 */
+        $"AC3B A12E 10A8 D332 6FE3 8ED1 6F01 B198"            /* ¬;¡..¨Ó2oãŽÑo.±˜ */
+        $"1543 A6A1 367E E226 5D76 B860 E0E1 8963"            /* .C¦¡6~â&]v¸`àá‰c */
+        $"AA7A F9EE DABF DB52 28F6 69F9 273F 8729"            /* ªzùîÚ¿ÛR(öiù'?‡) */
+        $"1D00 C7D2 20B9 3483 2125 88FC 94C0 54A6"            /* ..ÇÒ ¹4ƒ!%ˆü”ÀT¦ */
+        $"42FE F4E5 DA50 F495 F88B 5986 21CB 22E8"            /* BþôåÚPô•ø‹Y†!Ë"è */
+        $"EE5E 0622 2CB0 BCC8 0C6B 2B2B 23EB 0506"            /* î^.",°¼È.k++#ë.. */
+        $"A40F 09C2 726F 0C1F B8D4 55D3 2FE4 D629"            /* ¤.ÆÂro..¸ÔUÓ/äÖ) */
+        $"94C2 C913 BB28 4394 A9D2 8684 9E47 0445"            /* ”ÂÉ.»(C”©Ò†„žG.E */
+        $"B6CF 3E21 7072 B435 310C D7A3 063D 942B"            /* ¶Ï>!pr´51.×£.=”+ */
+        $"6AE9 350C 9442 C76E 1E6B A8C1 18A3 4309"            /* jé5.”BÇn.k¨Á.£CÆ */
+        $"6D55 E62F FC4E C4E9 6CF8 241D FAC5 2CC9"            /* mUæ/üNÄélø$.úÅ,É */
+        $"E020 6B12 31A6 9B11 710B 8850 FABE 5D63"            /* à k.1¦›.q.ˆPú¾]c */
+        $"068A 4018 2A90 93A5 9715 531E 8E7B AD7A"            /* .Š@.*�“¥—.S.Ž{­z */
+        $"2921 115F 19CE 2B6A F643 DE89 2E76 890B"            /* )!._.Î+jöCÞ‰.v‰. */
+        $"5A69 1668 6A02 061F 4832 24EB FC82 6B4D"            /* Zi.hj...H2$ëü‚kM */
+        $"9B08 D22F CBBF D348 D18F 8B0C C684 6851"            /* ›.Ò/Ë¿ÓHÑ�‹.Æ„hQ */
+        $"6CA9 E2FA 43CE 8A9A 7A58 FB28 0208 A6E0"            /* l©âúCΊšzXû(..¦à */
+        $"1ACF CE23 C624 5A38 C640 72C0 26F1 2818"            /* .ÏÎ#Æ$Z8Æ@rÀ&ñ(. */
+        $"07FD 74D9 F3D6 ED38 CA01 6485 CE8C 41A3"            /* .ýtÙóÖí8Ê.d…ÎŒA£ */
+        $"02C6 18E5 E4D2 2043 FA62 8768 3E14 7E80"            /* .Æ.åäÒ Cúb‡h>.~€ */
+        $"F2EB 67AD F743 75A0 2DDF 8724 1468 F88D"            /* òëg­÷Cu -߇$.hø� */
+        $"9BF3 11EB 4D4C B372 D210 9B58 BAA0 646A"            /* ›ó.ëML³rÒ.›Xº dj */
+        $"222F 5E5A C781 1D86 5652 1B57 07AF C8FA"            /* "/^ZÇ�.†VR.W.¯Èú */
+        $"9E77 DD7B FCB9 1D4C 8573 7B03 95AC D2DA"            /* žwÝ{ü¹.L…s{.•¬ÒÚ */
+        $"3314 4FFC CAF4 39B5 EAF4 9617 2CC5 9258"            /* 3.OüÊô9µêô–.,Å’X */
+        $"8F99 8C44 8D44 DA10 F1A5 51F7 5533 F13B"            /* �™ŒD�DÚ.ñ¥Q÷U3ñ; */
+        $"CDDC B6D6 BE71 3C92 2628 3B69 DC32 C623"            /* Íܶ־q<’&(;iÜ2Æ# */
+        $"F497 3959 034A 67C3 10A8 26E2 572F B4B1"            /* ô—9Y.JgÃ.¨&âW/´± */
+        $"6C5C 3E47 FB9F AA7D D9A4 7A08 4BBA E854"            /* l\>GûŸª}Ù¤z.KºèT */
+        $"4370 CE77 C69A 11EB 1BD8 B9AF 8225 BC8E"            /* CpÎwÆš.ë.ع¯‚%¼Ž */
+        $"A261 1CAA A74D B531 A0B9 D462 35DF 9C21"            /* ¢a.ª§Mµ1 ¹Ôb5ßœ! */
+        $"73F1 EAC1 A13C E0BC AF6C 8111 03DF AF1F"            /* sñêÁ¡<༯l�..߯. */
+        $"4748 1866 322C 535A 7C5E D2BC 4304 3541"            /* GH.f2,SZ|^Ò¼C.5A */
+        $"F14E 8412 296B 2C37 B642 9B4A 6417 EABB"            /* ñN„.)k,7¶B›Jd.ê» */
+        $"9034 1260 1B81 AFCC F903 4FAA A3F2 339E"            /* �4.`.�¯Ìù.Oª£ò3ž */
+        $"F332 B080 8C32 31D7 4DEA B260 F190 43F1"            /* ó2°€Œ21×Mê²`ñ�Cñ */
+        $"CCD5 A584 5C1C 343F FB87 CEA5 F246 8EAC"            /* ÌÕ¥„\.4?û‡Î¥òFŽ¬ */
+        $"C407 302C FEE7 3F59 F4B8 74ED ED62 D373"            /* Ä.0,þç?Yô¸tííbÓs */
+        $"A4BA B53A 0554 5403 9C2C E745 1087 5546"            /* ¤ºµ:.TT.œ,çE.‡UF */
+        $"2671 7BA6 3A33 703E BEF5 CD28 10A5 462B"            /* &q{¦:3p>¾õÍ(.¥F+ */
+        $"D902 9493 B2FC 176F 34BA 5A2D D2BC 0CBB"            /* Ù.”“²ü.o4ºZ-Ò¼.» */
+        $"5AB7 B854 08D3 CD79 3C71 1A89 E643 2FBC"            /* Z·¸T.ÓÍy<q.‰æC/¼ */
+        $"5A24 FEA6 EC06 1F23 79D9 3886 F6F4 7FB9"            /* Z$þ¦ì..#yÙ8†öô.¹ */
+        $"F892 1A20 DC66 1EB1 D6FD 1C48 52DE 4267"            /* ø’. Üf.±Öý.HRÞBg */
+        $"77E2 620B 2DC0 6828 575C F7CA 74BC FE73"            /* wâb.-Àh(W\÷Êt¼þs */
+        $"FABD C9ED 4E8F 71A7 8CCD 8D80 8BD2 8AA3"            /* ú½ÉíN�q§ŒÍ�€‹ÒŠ£ */
+        $"45C0 EF2A 387D 038E 8B00 BA81 12CD F93F"            /* EÀï*8}.Ž‹.º�.Íù? */
+        $"E9BE 9134 2928 439B 69CF 3DB1 5DFC 3DAF"            /* 龑4)(C›iÏ=±]ü=¯ */
+        $"86CA 34A7 4574 C91C 3F99 3EA9 B6E9 F3AF"            /* †Ê4§EtÉ.?™>©¶éó¯ */
+        $"6757 09A3 C49E A9AD 7201 BFD9 B3FA 52B0"            /* gWƣĞ©­r.¿Ù³úR° */
+        $"0000 0030 908B 4E52 45F1 3CBE F04A D2E4"            /* ...0�‹NREñ<¾ðJÒä */
+        $"83AF 6AEA 78E9 A438 C877 BAAD 65CB C703"            /* ƒ¯jêxé¤8Èwº­eËÇ. */
+        $"70B2 B9DD E19B 6B8C 0CE9 E402 0C9F 94F0"            /* p²¹Ýá›kŒ.éä..Ÿ”ð */
+        $"21BC 4E05 C03C 012A 66EF D0BC 2B72 292E"            /* !¼N.À<.*fïм+r). */
+        $"3592 1FDB 2A5C 8D2D C2FF 5C5B 6AB8 F695"            /* 5’.Û*\�-Âÿ\[j¸ö• */
+        $"F279 2C54 0529 555A 6ACA 22A4 C28B D693"            /* òy,T.)UZjÊ"¤Â‹Ö“ */
+        $"1FC9 4492 43F3 A323 F990 0A31 9356 30D3"            /* .ÉD’Có£#ù�Â1“V0Ó */
+        $"D6F0 0D36 0091 043F F239 9D1E 114E 3693"            /* Öð.6.‘.?ò9�..N6“ */
+        $"DF1C 23DF A27A 5B11 A44D 9199 07D1 AF2C"            /* ß.#ߢz[.¤M‘™.ѯ, */
+        $"63EB 21C5 D29F 8644 8C6A 129A 9CB9 ED72"            /* cë!ÅÒŸ†DŒj.šœ¹ír */
+        $"9286 3E0E B604 539A F262 B727 9284 01F9"            /* ’†>.¶.Sšòb·'’„.ù */
+        $"5AE1 DA5A 8A02 140E 5275 5433 BCDF 8038"            /* ZáÚZŠ...RuT3¼ß€8 */
+        $"0050 856F A747 857B 8376 255A 9185 28CC"            /* .P…o§G…{ƒv%Z‘…(Ì */
+        $"301A EC7C B5D3 89CC A695 1C87 8266 7CA8"            /* 0.ì|µÓ‰Ì¦•.‡‚f|¨ */
+        $"A203 7467 426E 9507 3DB3 1F90 F66B DC9F"            /* ¢.tgBn•.=³.�ökÜŸ */
+        $"ACF6 CDB2 4FCC 5AE4 2F94 F555 CB9E D8AC"            /* ¬öͲOÌZä/”õU˞ج */
+        $"950B FF38 0FE4 5056 E5E8 F371 9A98 5697"            /* •.ÿ8.äPVåèóqš˜V— */
+        $"6319 5197 B545 E594 AADD B2F2 CA27 260D"            /* c.Q—µE唪ݲòÊ'&. */
+        $"9BAF 0E45 0846 5573 F96B 7AC1 CC89 E86E"            /* ›¯.E.FUsùkzÁ̉èn */
+        $"61E6 72E2 05E3 9F8D 26D8 F178 BCC0 0B18"            /* aærâ.ãŸ�&Øñx¼À.. */
+        $"967C EA80 F7C1 45AE 8FAE A41C 41B6 438E"            /* –|ê€÷ÁE®�®¤.A¶CŽ */
+        $"46EF 1094 D558 01A8 BBAD 7380 DA27 2772"            /* Fï.”ÕX.¨»­s€Ú''r */
+        $"9D67 1330 A48C 62EA 0643 14EC 3E22 A055"            /* �g.0¤Œbê.C.ì>" U */
+        $"4E39 4E23 853D C587 99C8 CFD2 AEBB 9843"            /* N9N#…=Ň™ÈÏÒ®»˜C */
+        $"ECC9 0241 3253 8CF1 E068 1936 3BB2 56D3"            /* ìÉ.A2SŒñàh.6;²VÓ */
+        $"46F7 6A71 98D1 A300 1337 B3B0 7ABB 5752"            /* F÷jq˜Ñ£..7³°z»WR */
+        $"DB7A 7F85 5CFE 59DE A852 6987 DC11 C6B5"            /* Ûz.…\þYÞ¨Ri‡Ü.Ƶ */
+        $"E45B 7DD1 1F3A D566 C16D 3FBF 7BAD 7201"            /* ä[}Ñ.:ÕfÁm?¿{­r. */
+        $"B71C C74C A678 C2BB 10FD 534A 5E5D 79C0"            /* ·.ÇL¦x».ýSJ^]yÀ */
+        $"000C 2336 9113 B9C5 5D4A 1756 1C8B 0CD6"            /* ..#6‘.¹Å]J.V.‹.Ö */
+        $"AA8B DFF5 6CE3 CDAB B9B4 D85C 93FF 76AA"            /* ª‹ßõlãÍ«¹´Ø\“ÿvª */
+        $"15CF CF39 A864 B236 A172 03A1 65A1 9F76"            /* .ÏÏ9¨d²6¡r.¡e¡Ÿv */
+        $"FF55 00DE C7D0 C767 2787 9EB3 7CE5 C5BC"            /* ÿU.ÞÇÐÇg'‡ž³|åż */
+        $"8E08 6085 37A2 229C 73D3 2CC5 F6E8 AA1B"            /* Ž.`…7¢"œsÓ,Åöèª. */
+        $"AF13 15FD EB95 2609 6006 23C6 7910 8FFE"            /* ¯..ýë•&Æ`.#Æy.�þ */
+        $"8C5E 60A6 A558 E899 0A05 0F37 EC94 8E51"            /* Œ^`¦¥Xè™Â..7씎Q */
+        $"7838 9A11 8483 88B0 E284 B88D CDEA 9D56"            /* x8š.„ƒˆ°â„¸�Íê�V */
+        $"5C7E CFA2 8001 847E ABC9 360E 17EA 2D34"            /* \~Ï¢€.„~«É6..ê-4 */
+        $"8314 96C0 3810 D88F A54E 6E7C 6030 76FA"            /* ƒ.–À8.Ø�¥Nn|`0vú */
+        $"18A4 A549 37FC 11F6 E77F A883 C794 71AC"            /* .¤¥I7ü.öç.¨ƒÇ”q¬ */
+        $"55F1 7F88 664A FEE4 01C4 5576 1BE6 9C41"            /* Uñ.ˆfJþä.ÄUv.æœA */
+        $"D800 6121 2FC0 E681 A16E 21AF D5FE 0E80"            /* Ø.a!/Àæ�¡n!¯Õþ.€ */
+        $"A800 0000 3090 8C40 9184 82DA 7187 51C6"            /* ¨...0�Œ@‘„‚Úq‡QÆ */
+        $"44DC C420 FF13 98AD D100 2C07 132C 8D6C"            /* DÜÄ ÿ.˜­Ñ.,..,�l */
+        $"5D16 A089 D8F6 E77F A870 24F1 5461 DB69"            /* ]. ‰Øöç.¨p$ñTaÛi */
+        $"0F41 5029 7A41 B55F 0000 0184 846A 850C"            /* .AP)zAµ_...„„j…. */
+        $"241E E628 EDA6 4000 3090 6AA2 F6E7 7FA6"            /* $.æ(í¦@.0�j¢öç.¦ */
+        $"26C9 5EDE 9BB6 A1B1 51E6 8D5D F800 0061"            /* &É^Þ›¶¡±Qæ�]ø..a */
+        $"19B3 E47D 6F6F DB03 0885 4A53 27BA 38F5"            /* .³ä}ooÛ..…JS'º8õ */
+        $"35A0 1AB9 0A95 8FAE 85E3 F528 5A8B E645"            /* 5 .¹Â•�®…ãõ(Z‹æE */
+        $"8419 0456 6A38 D0DA 4948 8987 2323 1216"            /* „..Vj8ÐÚIH‰‡##.. */
+        $"A4F8 FD1A C374 D30C BF43 CD86 B984 F23C"            /* ¤øý.ÃtÓ.¿C͆¹„ò< */
+        $"5487 B47F E217 F15A D8CF A66A 96A9 EAF3"            /* T‡´.â.ñZØϦj–©êó */
+        $"F966 0205 D320 1556 5C3C 073A 8E66 1E3F"            /* ùf..Ó .V\<.:Žf.? */
+        $"A74E FF2C BC45 E9DB 3B25 FF7F 46AD 13A9"            /* §Nÿ,¼EéÛ;%ÿ.F­.© */
+        $"5C21 458B 6AD4 829C 1DFB 54BA E5F2 3C76"            /* \!E‹jÔ‚œ.ûTºåò<v */
+        $"3898 11F6 D710 7470 00FC 0742 CA59 9E40"            /* 8˜.ö×.tp.ü.BÊYž@ */
+        $"757C 5952 61FF 4D28 0991 1673 9B01 06B9"            /* u|YRaÿM(Æ‘.s›..¹ */
+        $"3999 E9B5 06CD B1DA CB08 FF19 DE70 8D10"            /* 9™éµ.ͱÚË.ÿ.Þp�. */
+        $"E725 848E D27D 2B0B 54F0 B60B 26AB CD92"            /* ç%„ŽÒ}+.Tð¶.&«Í’ */
+        $"E4F8 C007 FF68 6933 E2FF 31D5 435B FF7F"            /* äøÀ.ÿhi3âÿ1ÕC[ÿ. */
+        $"9A8E 9845 007F FEDA 4C63 9892 513A ABD9"            /* šŽ˜E..þÚLc˜’Q:«Ù */
+        $"A98A C012 5C99 31C0 D48F E334 671D A695"            /* ©ŠÀ.\™1ÀÔ�ã4g.¦• */
+        $"C7EF 3AAA FF37 D381 4F42 983F FC4D AE82"            /* Çï:ªÿ7Ó�OB˜?üM®‚ */
+        $"FF43 6555 9E7F 10A3 7B95 415D 41FF 20B3"            /* ÿCeUž..£{•A]Aÿ ³ */
+        $"8CB1 7302 0000 0000 584E AB14 398C A865"            /* Œ±s.....XN«.9Œ¨e */
+        $"5A7B 1650 52EB 8BCE 3E92 461D 071B 8F21"            /* Z{.PRë‹Î>’F...�! */
+        $"2CFF 4F5F FD2E 999E B77D A47D 61B4 2C01"            /* ,ÿO_ý.™ž·}¤}a´,. */
+        $"D397 493D CB48 AB27 EB4A 13A7 8C89 7F64"            /* Ó—I=ËH«'ëJ.§Œ‰.d */
+        $"6C08 FF21 9696 98C7 6248 1615 541F EC81"            /* l.ÿ!––˜ÇbH..T.ì� */
+        $"8E18 FAED 5257 3D01 2CBB 74C1 DA64 81A0"            /* Ž.úíRW=.,»tÁÚd�  */
+        $"39BF B272 4068 15E8 A44A 007C 732C D9DC"            /* 9¿²r@h.è¤J.|s,ÙÜ */
+        $"1CF8 4612 8611 A36D 67BC 6E6A EA14 9D87"            /* .øF.†.£mg¼njê.�‡ */
+        $"2962 C4B4 5442 9564 BFAA D0FB 991F 4288"            /* )bÄ´TB•d¿ªÐû™.Bˆ */
+        $"7CB2 2A41 333E 7827 5070 F3A6 67FF 7FFF"            /* |²*A3>x'Ppó¦gÿ.ÿ */
+        $"7601 CFFE E44B 4413 809B 3877 B59D BC19"            /* v.ÏþäKD.€›8wµ�¼. */
+        $"548F 0A5B C1E9 A8D7 6B5D 8EC8 8A1A BB3D"            /* T�Â[Áé¨×k]ŽÈŠ.»= */
+        $"3CD1 3139 57CF 9E94 00E9 CF6E 3830 3561"            /* <Ñ19WÏž”.éÏn805a */
+        $"8DE4 A59F FD1B 45CF C608 D0FD 5D48 485E"            /* �䥟ý.EÏÆ.Ðý]HH^ */
+        $"D5A3 30A5 F9EE 5D55 B9C2 E552 3A9F B087"            /* Õ£0¥ùî]U¹ÂåR:Ÿ°‡ */
+        $"FE87 5DBC 5E73 0F16 9221 2B0D F399 AB6F"            /* þ‡]¼^s..’!+.ó™«o */
+        $"9950 0000 0000 0000 0008 2444 88CE 3BBD"            /* ™P........$DˆÎ;½ */
+        $"CC78 4932 9C47 DEFA 74E7 91BF 9827 FF7B"            /* ÌxI2œGÞútç‘¿˜'ÿ{ */
+        $"77EB 9B1B 9F7F FDAB 6552 35A1 0C22 E9C6"            /* wë›.Ÿ.ý«eR5¡."éÆ */
+        $"42E3 FF7F FF7F E9FD A23B 2F7D 3ADD FC90"            /* Bãÿ.ÿ.éý¢;/}:Ýü� */
+        $"E4A1 F8B9 0560 0F86 D7FE 3F46 C953 2A03"            /* ä¡ø¹.`.†×þ?FÉS*. */
+        $"F1C7 F5AE D0C4 B743 EA67 B694 E47D 45CD"            /* ñÇõ®ÐÄ·Cêg¶”ä}EÍ */
+        $"6F92 178A E383 8B71 800E D9AF A55A F149"            /* o’.Šãƒ‹q€.Ù¯¥ZñI */
+        $"A838 5671 4C9A 8915 447A CDA9 C6B7 DD68"            /* ¨8VqLš‰.DzÍ©Æ·Ýh */
+        $"A5FB F404 CF63 A62E CC5E 89D3 FDB2 C841"            /* ¥ûô.Ïc¦.Ì^‰Óý²ÈA */
+        $"7A37 5B5D 5958 4B46 20B1 D389 5188 F9FE"            /* z7[]YXKF ±Ó‰Qˆùþ */
+        $"8FF1 D718 6C8C 3254 0000 0000 0000 0000"            /* �ñ×.lŒ2T........ */
+        $"0000 00A1 EBEC C33A 8622 D0FF 7FFF 7FFF"            /* ...¡ëìÃ:†"Ðÿ.ÿ.ÿ */
+        $"705D C7FE 49E7 01B7 A65D D5BC 2041 80B0"            /* p]ÇþIç.·¦]Õ¼ A€° */
+        $"89ED F68A A000 F438 EBD0 C908 0B67 414F"            /* ‰íöŠ .ô8ëÐÉ..gAO */
+        $"C8F1 4312 2EC8 05E6 CA19 184F FF5B BA24"            /* ÈñC..È.æÊ..Oÿ[º$ */
+        $"57E8 A6B4 FBD3 FF79 4D8E FF44 BC50 6938"            /* W覴ûÓÿyMŽÿD¼Pi8 */
+        $"137F FF7D 6251 8D1A 9B33 CF7E 0BCB EAD7"            /* ..ÿ}bQ�.›3Ï~.Ëê× */
+        $"2E0D EAE0 0003 0906 AA2B 66A8 C950 0000"            /* ..êà..Æ.ª+f¨ÉP.. */
+        $"0000 0000 0000 0000 0001 1E1F F600 1848"            /* ............ö..H */
+        $"4BF6 7A7C F92D 3E7A 437E 2254 51EB 4AF5"            /* Köz|ù->zC~"TQëJõ */
+        $"C6BF 442A 12CD 51FF 7FFE B8AE D0C4 B1D0"            /* Æ¿D*.ÍQÿ.þ¸®ÐıР*/
+        $"7CF7 019D A0ED 2CC4 01BC 1A94 212D 43EF"            /* |÷.� í,Ä.¼.”!-Cï */
+        $"1274 9B67 94D5 062D 5FCC E23C 4816 416B"            /* .t›g”Õ.-_Ìâ<H.Ak */
+        $"1540 59C2 1D35 213D A11C EE70 8D15 5394"            /* .@YÂ.5!=¡.îp�.S” */
+        $"53C6 29CF 4E19 F4CF 5B94 7FFF 7F8B 2813"            /* SÆ)ÏN.ôÏ[”.ÿ.‹(. */
+        $"3E95 DE81 30D0 3188 2A75 4F35 CB11 DDD5"            /* >•Þ�0Ð1ˆ*uO5Ë.ÝÕ */
+        $"7FFD A983 95A9 71E7 A7A3 7D3F F944 0A7E"            /* .ý©ƒ•©q秣}?ùDÂ~ */
+        $"24D9 966F 6B6A 0FD0 23AC 7000 0000 0000"            /* $Ù–okj.Ð#¬p..... */
+        $"0009 D4AF 9196 E5A4 B8AC 407F F9EE C709"            /* .ÆÔ¯‘–夸¬@.ùîÇÆ */
+        $"F927 08C3 CA6C 3A3A D90F E306 BCC4 6D6C"            /* ù'.ÃÊl::Ù.ã.¼Äml */
+        $"C7A9 F042 6F4C FDC9 60AB A087 6338 8F12"            /* Ç©ðBoLýÉ`« ‡c8�. */
+        $"4D29 D00C C575 C7B5 9FA4 E96C 1FA0 AAFB"            /* M)Ð.ÅuǵŸ¤él. ªû */
+        $"09E9 8DF9 1BE0 C62D 3C1D F55B DD77 A0FD"            /* Æé�ù.àÆ-<.õ[Ýw ý */
+        $"5C16 D959 BA08 0000 0000 0000 0145 AE01"            /* \.ÙYº........E®. */
+        $"712A 0E06 1212 70CD 94A8 0A2C 18F5 1E3B"            /* q*....pÍ”¨Â,.õ.; */
+        $"52FA C8F6 56F3 F7E4 69E6 54A0 3FF6 2487"            /* RúÈöVó÷äiæT ?ö$‡ */
+        $"C65F 0EFF 7F4F 8D07 C817 FE78 727D 3C75"            /* Æ_.ÿ.O�.È.þxr}<u */
+        $"E4C6 1003 FECF 3E7E 6252 08C0 4A83 50D7"            /* äÆ..þÏ>~bR.ÀJƒP× */
+        $"DADA 8602 5949 900F D2B6 D10D 2661 3014"            /* ÚÚ†.YI�.Ò¶Ñ.&a0. */
+        $"4541 17FF 2106 00DF AC82 0046 09BB A5AF"            /* EA.ÿ!..߬‚.FÆ»¥¯ */
+        $"CE51 0EBF F9AD 787A 907F 9F9A 628F E16B"            /* ÎQ.¿ù­xz�.Ÿšb�ák */
+        $"C015 137E 9C68 FCFA A817 FF7F DD6B FDB6"            /* À..~œhüú¨.ÿ.Ýký¶ */
+        $"3DA3 7C9D 3309 0B8A B551 C370 4401 CD7F"            /* =£|�3Æ.ŠµQÃpD.Í. */
+        $"7503 8425 E297 1B3F FF49 4FF8 3583 685A"            /* u.„%â—.?ÿIOø5ƒhZ */
+        $"B273 A7F7 CEBF F27E D78C 3E35 5332 152B"            /* ²s§÷οò~׌>5S2.+ */
+        $"033C C7FF 7B97 1AF0 F2A4 3C88 CC7B B96E"            /* .<Çÿ{—.ðò¤<ˆÌ{¹n */
+        $"65B3 533C F2F8 5E4B 6DBF 7D78 A316 310F"            /* e³S<òø^Km¿}x£.1. */
+        $"6B09 FD62 88D7 77FF 7447 524E C235 00A3"            /* kÆýbˆ×wÿtGRNÂ5.£ */
+        $"8F5A 4BEE D240 6154 C17C 2CC2 68F0 A959"            /* �ZKîÒ@aTÁ|,Âhð©Y */
+        $"2F12 9B74 7E8E 423F BB1D BC9A C75B C618"            /* /.›t~ŽB?».¼šÇ[Æ. */
+        $"19D1 C6CB 0A15 BD77 99BD 96D3 CC07 F5AC"            /* .ÑÆËÂ.½w™½–ÓÌ.õ¬ */
+        $"D2ED DE5E F19D 5CFC B2B0 5407 0386 32C6"            /* ÒíÞ^ñ�\ü²°T..†2Æ */
+        $"5F49 7BAD 3270 BF81 CF97 C934 7E23 7237"            /* _I{­2p¿�Ï—É4~#r7 */
+        $"727B 0FA2 6DB0 D717 8C73 B109 E089 AAC5"            /* r{.¢m°×.Œs±Æà‰ªÅ */
+        $"7D98 9061 2956 EA75 0135 E870 3430 4E9B"            /* }˜�a)Vêu.5èp40N› */
+        $"C76C D3D6 7EEB 83DB 9EEB C9A0 983D 1327"            /* ÇlÓÖ~ëƒÛžëÉ ˜=.' */
+        $"62D8 FD62 CA51 7135 80B0 ABFF 431B 9843"            /* bØýbÊQq5€°«ÿC.˜C */
+        $"68B4 A929 44E4 1F3E E3A1 22AA 5E87 579C"            /* h´©)Dä.>ã¡"ª^‡Wœ */
+        $"745B 9CA4 438C BFC2 9A1B 17BE BA75 06E4"            /* t[œ¤CŒ¿Âš..¾ºu.ä */
+        $"0108 698C E4F2 341C 24CC 7913 6237 ED48"            /* ..iŒäò4.$Ìy.b7íH */
+        $"E797 4D7A 0D5A D1EA ACDF F974 4F9F 9139"            /* ç—Mz.ZÑê¬ßùtOŸ‘9 */
+        $"6A87 3972 A1C8 0A2B 1E8B 6DB7 B811 4AB0"            /* j‡9r¡ÈÂ+.‹m·¸.J° */
+        $"EEE8 BB23 959C 239D 4165 DBED ACE4 F133"            /* îè»#•œ#�AeÛí¬äñ3 */
+        $"8276 40BB C447 29FE 3EB6 5BA4 A6D0 2441"            /* ‚v@»ÄG)þ>¶[¤¦Ð$A */
+        $"1431 8B2D 8BFD 96B7 C8C2 9F9B DFB9 2B06"            /* .1‹-‹ý–·ÈŸ›ß¹+. */
+        $"E191 00FF 7E4B 8281 D609 D163 B8CB AF9A"            /* á‘.ÿ~K‚�ÖÆÑc¸Ë¯š */
+        $"0995 7385 27FC 3C6A 5310 024D BAD1 8013"            /* Æ•s…'ü<jS..MºÑ€. */
+        $"8995 3DF4 FA80 FE12 8F5F 40E5 09E6 E7E8"            /* ‰•=ôú€þ.�_@åÆæçè */
+        $"C5E7 1309 3E97 E278 0228 1693 F565 F83E"            /* Åç.Æ>—âx.(.“õeø> */
+        $"4161 0037 E0AA D0CC 3AED 4E56 04E8 4456"            /* Aa.7àªÐÌ:íNV.èDV */
+        $"6E50 4626 C7E0 0790 014E 329B 0DDB D87D"            /* nPF&Çà.�.N2›.ÛØ} */
+        $"4532 6482 3F51 D651 3F62 D6EB 3BCA 75EB"            /* E2d‚?QÖQ?bÖë;Êuë */
+        $"5444 A42F 3CFB 4146 19FB 5376 876F 6BC1"            /* TD¤/<ûAF.ûSv‡okÁ */
+        $"B80B 7787 71DF 4CAA D70A 98BC 98E1 15A1"            /* ¸.w‡qßLª×˜¼˜á.¡ */
+        $"7996 F17F FF7A 91CF 350C FA04 5753 7ECB"            /* y–ñ.ÿz‘Ï5.ú.WS~Ë */
+        $"29F1 A4AD F335 59DB A580 EAA3 98AD FEB0"            /* )ñ¤­ó5YÛ¥€ê£˜­þ° */
+        $"275E BABE 6679 9AD4 B246 75F2 ECAA B042"            /* '^º¾fyšÔ²Fuò쪰B */
+        $"92C9 745E 1C58 58FF 2570 9228 4EAF 6F65"            /* ’Ét^.XXÿ%p’(N¯oe */
+        $"56F3 1D0C 85AA 9468 8000 0000 0101 3082"            /* Vó..…ª”h€.....0‚ */
+        $"08FD E30F FF75 70BF FCCA 2225 E5FC 3464"            /* .ýã.ÿup¿üÊ"%åü4d */
+        $"00CA 6C43 E833 80DE 2895 5F84 4B08 CEFA"            /* .ÊlCè3€Þ(•_„K.Îú */
+        $"AA94 EE33 24E7 CA20 A668 4717 FD5F F7F2"            /* ª”î3$çÊ ¦hG.ý_÷ò */
+        $"59E7 D6C6 6D0D 8E0F 1AC3 BBFA 3890 8ACB"            /* YçÖÆm.Ž..ûú8�ŠË */
+        $"9250 6D82 E892 D4B9 1F14 D987 9818 877A"            /* ’Pm‚è’Ô¹..Ù‡˜.‡z */
+        $"66F0 905A B088 D761 B529 F02A 6964 6C65"            /* fð�Z°ˆ×aµ)ð*idle */
+        $"8FB8 9A87 7771 9A12 C8A6 7F9C 9905 D643"            /* �¸š‡wqš.Ȧ.œ™.ÖC */
+        $"E554 91F5 0C26 4299 30C6 BC87 B38C 86FB"            /* åT‘õ.&B™0Ƽ‡³Œ†û */
+        $"ED50 C019 3822 52A8 97C6 1F49 176D FB8C"            /* íPÀ.8"R¨—Æ.I.mûŒ */
+        $"87B7 E37C 196E 3695 357A E2B8 FDE5 736E"            /* ‡·ã|.n6•5zâ¸ýåsn */
+        $"DF11 6026 3CD9 51CF 2A50 6F8A 53B0 0F16"            /* ß.`&<ÙQÏ*PoŠS°.. */
+        $"938B 745A F84D 571C A582 9723 90B4 49D7"            /* “‹tZøMW.¥‚—#�´I× */
+        $"B11D 7BA6 45C1 2AFA D519 A471 60A3 17A9"            /* ±.{¦EÁ*úÕ.¤q`£.© */
+        $"2C13 6E04 D58E 3F37 0115 E4AE F51C 1BA8"            /* ,.n.ÕŽ?7..ä®õ..¨ */
+        $"EF7F 4C9F 7B47 8C5A D1D6 CAC7 D416 D6D4"            /* ï.LŸ{GŒZÑÖÊÇÔ.ÖÔ */
+        $"7F05 9504 5685 0D6D E0E8 6809 9307 7864"            /* ..•.V….màèhÆ“.xd */
+        $"1A86 1BA6 A321 D08C 1B0C 0981 9395 6DC0"            /* .†.¦£!ÐŒ..Æ�“•mÀ */
+        $"C74F ECF7 CA1B FF4B 1896 BDBE 4876 8A4B"            /* ÇOì÷Ê.ÿK.–½¾HvŠK */
+        $"519F CC3C 7813 BE21 C40C B001 30F4 4FC7"            /* QŸÌ<x.¾!Ä.°.0ôOÇ */
+        $"B76C B9FA 26F6 38C8 116D B8F0 0B9D 818F"            /* ·l¹ú&ö8È.m¸ð.��� */
+        $"56F9 F934 AE60 71FD E583 8D07 A4A4 DE41"            /* Vùù4®`qýåƒ�.¤¤ÞA */
+        $"FB75 B83F 384B 11C9 CC5E CD9D FF4C 05A8"            /* ûu¸?8K.ÉÌ^Í�ÿL.¨ */
+        $"D59F 1E59 4797 FF7F DFD8 391C E8BA 72E2"            /* ÕŸ.YG—ÿ.ßØ9.èºrâ */
+        $"C1F8 9F5C 5317 01E3 EC2D 4120 97D2 BAEC"            /* ÁøŸ\S..ãì-A —Òºì */
+        $"DBB0 FF30 FC56 2E43 3716 1B7B A8CD 19AE"            /* Û°ÿ0üV.C7..{¨Í.® */
+        $"7FFF 7FF4 468B FF45 749B 3C67 EE31 1651"            /* .ÿ.ôF‹ÿEt›<gî1.Q */
+        $"17B2 B21C A982 A185 E8A3 03BC 2DCB C09A"            /* .²².©‚¡…è£.¼-ËÀš */
+        $"8522 64CF BB21 6955 068D F002 871B 05F3"            /* …"dÏ»!iU.�ð.‡..ó */
+        $"9F44 7384 D624 E1FA A24D 67C7 BC5E F7BF"            /* ŸDs„Ö$áú¢MgǼ^÷¿ */
+        $"59BC DC3C BE4B 1456 0C6F F2C1 0841 038D"            /* Y¼Ü<¾K.V.oòÁ.A.� */
+        $"723C 14FA 4F19 0AD4 1F88 0A1B FF14 3D93"            /* r<.úO.ÂÔ.ˆÂ.ÿ.=“ */
+        $"27AA 6E0B 4AA7 6A11 E06D 5D82 C930 1B53"            /* 'ªn.J§j.àm]‚É0.S */
+        $"0227 A9AA 253A 41E6 31D5 8B87 DC08 819B"            /* .'©ª%:Aæ1Õ‹‡Ü.�› */
+        $"E5EE EA0F 6AA0 0000 0006 9BC0 594E 0004"            /* åîê.j ....›ÀYN.. */
+        $"D326 312C 0364 8835 C4D7 5040 3724 3CD9"            /* Ó&1,.dˆ5Ä×P@7$<Ù */
+        $"B889 2E14 12BC F0AD 9D2E 326B 1654 5952"            /* ¸‰...¼ð­�.2k.TYR */
+        $"2B5F 1A9D 5403 C9C5 A731 1B3C 3443 783C"            /* +_.�T.Éŧ1.<4Cx< */
+        $"A459 248B BBC7 DEDC 74AD E2A1 D647 5047"            /* ¤Y$‹»ÇÞÜt­â¡ÖGPG */
+        $"AD17 15AF FF5C 88C4 025F 4361 3F83 BFC9"            /* ­..¯ÿ\ˆÄ._Ca?ƒ¿É */
+        $"FF6D 7E58 128D 33D7 7076 E73A 9CF6 76D8"            /* ÿm~X.�3×pvç:œövØ */
+        $"A0FF 2C44 2029 0B59 B427 3BDC 915B 87CF"            /*  ÿ,D ).Y´';Ü‘[‡Ï */
+        $"75D6 EC52 7793 6DFA A4E2 9E2D 7D25 FBC2"            /* uÖìRw“mú¤âž-}%û */
+        $"2028 DE78 D868 BEC5 E9D2 BFFA 8B12 9265"            /*  (ÞxØh¾ÅéÒ¿ú‹.’e */
+        $"B01D 92F7 F71E 8782 F1CD 4E98 B46E 6DA5"            /* °.’÷÷.‡‚ñÍN˜´nm¥ */
+        $"8825 F851 1CE9 9F21 D8E2 86EB BAF4 126F"            /* ˆ%øQ.éŸ!Øâ†ëºô.o */
+        $"9CB3 0144 009A 6F38 0919 9C1F D0CE D23C"            /* œ³.D.šo8Æ.œ.ÐÎÒ< */
+        $"C9DD 9273 D8F6 6733 6E5A 2E7A 635C 8723"            /* ÉÝ’sØög3nZ.zc\‡# */
+        $"6E04 1283 1A43 02CA 74E4 8000 0309 08DB"            /* n..ƒ.C.Êtä€..Æ.Û */
+        $"EF05 DC00 D116 0D58 1A69 2055 1BA0 D8DE"            /* ï.Ü.Ñ..X.i U. ØÞ */
+        $"34B6 EA40 CC06 C673 559A 75F2 9B58 C474"            /* 4¶ê@Ì.ÆsUšuò›XÄt */
+        $"DD4C AB9A 9E6D 653B FCDF 4F33 3707 105E"            /* ÝL«šžme;üßO37..^ */
+        $"DBCE D327 45FB C663 E1AF 375B B106 B0B8"            /* ÛÎÓ'EûÆcá¯7[±.°¸ */
+        $"26EE AE4B 538A CF74 588E 928B 58C7 2D93"            /* &î®KSŠÏtXŽ’‹XÇ-“ */
+        $"371E BC81 0ED0 9F2C 1A18 8DD7 7E65 4FBF"            /* 7.¼�.П,..�×~eO¿ */
+        $"511B 63A1 8F26 2A08 A4D3 2BF3 96E6 FC32"            /* Q.c¡�&*.¤Ó+ó–æü2 */
+        $"D457 8287 D843 6D19 2458 0EA4 AC8F 0512"            /* ÔW‚‡ØCm.$X.¤¬�.. */
+        $"831D D4CA 9BFF 5A6E 951A 5897 451F 750C"            /* ƒ.ÔÊ›ÿZn•.X—E.u. */
+        $"CAD4 89C1 94A7 4BFA 4030 4828 1E37 C049"            /* ÊÔ‰Á”§Kú@0H(.7ÀI */
+        $"34C4 54B1 1054 2645 14E5 6DFF 7FFF 7328"            /* 4ÄT±.T&E.åmÿ.ÿs( */
+        $"F1A4 AAA2 4FD2 507D 86D5 FF7F FA43 F49A"            /* ñ¤ª¢OÒP}†Õÿ.úCôš */
+        $"5049 0839 5964 8186 EE46 1867 158E 9E2C"            /* PI.9Yd�†îF.g.Žž, */
+        $"D618 8FF5 D416 6838 6187 9CF7 21BC DE1F"            /* Ö.�õÔ.h8a‡œ÷!¼Þ. */
+        $"F84F F4E9 ACDB ECD8 6CA6 6725 85B4 4049"            /* øOôé¬ÛìØl¦g%…´@I */
+        $"AA9E 4935 7E1F 54E7 B0D5 A026 B073 899B"            /* ªžI5~.Tç°Õ &°s‰› */
+        $"51C4 8C2E 483C B3BF 38A0 4BCF 2042 EE90"            /* QÄŒ.H<³¿8 KÏ Bî� */
+        $"4E1B 8C94 420F 99A7 9EA1 7D96 12A3 8C8D"            /* N.Œ”B.™§ž¡}–.£Œ� */
+        $"819B C97D C518 51CB 0D8A A7A1 7159 EB10"            /* �›É}Å.QË.Š§¡qYë. */
+        $"4A27 5CD0 0ED7 2688 5F74 CE10 DF6A 5B4F"            /* J'\Ð.×&ˆ_tÎ.ßj[O */
+        $"E370 A282 105D 2F43 6E74 6B07 05EC 880E"            /* ãp¢‚.]/Cntk..ìˆ. */
+        $"15AF 5118 9D27 327D 2552 9996 020B 2D9A"            /* .¯Q.�'2}%R™–..-š */
+        $"9AFC 6849 6068 6491 42FA 889C 7949 285A"            /* šühI`hd‘BúˆœyI(Z */
+        $"7FFE 5B6D DAF2 7FFF 772D E08E B9E4 65A3"            /* .þ[mÚò.ÿw-àŽ¹äe£ */
+        $"B49A DDC8 FF52 8DA3 B318 F84F F4E9 99ED"            /* ´šÝÈÿR�£³.øOôé™í */
+        $"48C4 CA7E BE77 2634 6A22 1FAD 4752 8D9B"            /* HÄÊ~¾w&4j".­GR�› */
+        $"B935 0449 1A27 9EAB B000 C242 3BB7 72B7"            /* ¹5.I.'ž«°.ÂB;·r· */
+        $"3ACC B41F 0AC9 CFFD 58DA D99F 498A 21CF"            /* :Ì´.ÂÉÏýXÚÙŸIŠ!Ï */
+        $"50B8 A155 9BB3 B3DA 13FE 251F 14F2 3431"            /* P¸¡U›³³Ú.þ%..ò41 */
+        $"6DBF 2774 3EFC 55BB 9CB3 40A4 CA00 A112"            /* m¿'t>üU»œ³@¤Ê.¡. */
+        $"3E83 51D4 9D13 DE0D F86D 3384 AAE7 9074"            /* >ƒQÔ�.Þ.øm3„ªç�t */
+        $"F7CF 4509 F99A 70B2 2E74 43C3 1363 021F"            /* ÷ÏEÆùšp².tCÃ.c.. */
+        $"6482 E471 22FA 6265 2DF9 C302 43F8 9053"            /* d‚äq"úbe-ùÃ.Cø�S */
+        $"0AE9 15A2 28D4 FD7C 05AF C7B8 26D5 7C0F"            /* Âé.¢(Ôý|.¯Ç¸&Õ|. */
+        $"22E0 4735 518D BE4B 4E83 1EF8 3FFA BA23"            /* "àG5Q�¾KNƒ.ø?úº# */
+        $"3AE8 F76B 1D92 2038 64C1 EA73 30FC CE72"            /* :è÷k.’ 8dÁês0üÎr */
+        $"0CA5 6697 157E 55C4 8BAE E703 6FF5 F743"            /* .¥f—.~UÄ‹®ç.oõ÷C */
+        $"B456 C85F 3BFF 2629 95B7 02F4 F580 A49B"            /* ´VÈ_;ÿ&)•·.ôõ€¤› */
+        $"1587 2316 D131 66C1 C6DB F3DC C409 D801"            /* .‡#.Ñ1fÁÆÛóÜÄÆØ. */
+        $"E2DA 30B6 73FD 99EF AA26 25D7 DF07 FBEB"            /* âÚ0¶sý™ïª&%×ß.ûë */
+        $"094E 2E8E BD11 3C49 81BA E6BE 7666 ECBE"            /* ÆN.Ž½.<I�ºæ¾vfì¾ */
+        $"59D2 4ACC B4CE 3FAD 2173 25CB E42F 37B8"            /* YÒJÌ´Î?­!s%Ëä/7¸ */
+        $"F3CC 79EF 695C 10F4 0381 2D14 1B0F D632"            /* óÌyïi\.ô.�-...Ö2 */
+        $"8A1E 9C29 F617 6A4B 204E A147 C08D 1AA5"            /* Š.œ)ö.jK N¡GÀ�.¥ */
+        $"7418 DED9 DE83 A555 A75B AB00 C650 247F"            /* t.ÞÙÞƒ¥U§[«.ÆP$. */
+        $"0222 5558 731B 54DB 14F6 3A0E 1FAD A8D8"            /* ."UXs.TÛ.ö:..­¨Ø */
+        $"F327 DC8F AF3F 630B 3BA9 7933 8D30 458C"            /* ó'Ü�¯?c.;©y3�0EŒ */
+        $"4C2F 6E3A 0A64 DDC5 926A 71CB 2347 EE4D"            /* L/n:ÂdÝÅ’jqË#GîM */
+        $"647B D94D BE24 7F62 6A14 EBE2 696F 8735"            /* d{ÙM¾$.bj.ëâio‡5 */
+        $"A96F E268 6912 A4A9 3254 0293 CB09 0DC0"            /* ©oâhi.¤©2T.“ËÆ.À */
+        $"206B EB7B F6B9 0643 5E74 4F2C 555A AE2D"            /*  kë{ö¹.C^tO,UZ®- */
+        $"B16B 7FA3 8ADE 7EAC 764F 9A20 BC94 05F1"            /* ±k.£ŠÞ~¬vOš ¼”.ñ */
+        $"9AAC 0118 36B8 6B30 D696 6E84 EEC2 5342"            /* š¬..6¸k0Ö–n„îÂSB */
+        $"03A8 EFD3 CB37 D50D F676 35DB AD6C 280A"            /* .¨ïÓË7Õ.öv5Û­l( */
+        $"DB04 D23A 0922 A2E3 5F45 EBD1 5C49 F6AA"            /* Û.Ò:Æ"¢ã_EëÑ\Iöª */
+        $"4579 1BA2 D94E D3F0 7A7E C24E 79B0 5D24"            /* Ey.¢ÙNÓðz~ÂNy°]$ */
+        $"B98E 23E7 4C4F 54D9 A3CE 389F 63F6 2426"            /* ¹Ž#çLOTÙ£Î8Ÿcö$& */
+        $"7087 D921 86D6 709F 768D 5684 BB90 47B7"            /* p‡Ù!†ÖpŸv�V„»�G· */
+        $"AC32 98D7 E247 3668 E954 8105 EE44 AF58"            /* ¬2˜×âG6héT�.îD¯X */
+        $"13FF 573A 9F89 06C9 FB77 277E 08C9 09E9"            /* .ÿW:Ÿ‰.Éûw'~.ÉÆé */
+        $"B180 F96E C5AB 1E5D 3029 E229 CE1B B2AD"            /* ±€ùnÅ«.]0)â)Î.²­ */
+        $"BA11 DD98 0D9C 4C45 66DD 8553 3BA2 6F5B"            /* º.ݘ.œLEfÝ…S;¢o[ */
+        $"699B CEF3 48A7 6C31 63E6 E189 9C68 B9EC"            /* i›ÎóH§l1cæቜh¹ì */
+        $"A663 411F EBCB 41AB 8F7E 7EAD 87DA 5BF3"            /* ¦cA.ëËA«�~~­‡Ú[ó */
+        $"AAC9 975B AC1F 712B F7ED DEBD 04C3 B85A"            /* ªÉ—[¬.q+÷íÞ½.øZ */
+        $"470D D74A B91D 0180 7BAB 4088 5671 6268"            /* G.×J¹..€{«@ˆVqbh */
+        $"5B4A 54FE C179 1600 7677 830B 0E81 EEB4"            /* [JTþÁy..vwƒ..�î´ */
+        $"056E 79FF 8251 AB20 A6BC 15A5 E71F 7D4A"            /* .nyÿ‚Q« ¦¼.¥ç.}J */
+        $"2F6E 951A DE36 7A81 C704 9A4A F239 E1DC"            /* /n•.Þ6z�Ç.šJò9áÜ */
+        $"FF6C DE49 B4C8 F6C1 F764 8D19 4686 DFC2"            /* ÿlÞI´ÈöÁ÷d�.F†ß */
+        $"5C72 4A52 9784 F974 DCA4 A177 21DA 9869"            /* \rJR—„ùtܤ¡w!Ú˜i */
+        $"80A4 5BC6 FD54 A56B C7B1 4705 3A32 C896"            /* €¤[ÆýT¥kDZG.:2È– */
+        $"4539 25E5 90CC F228 B7F9 ADA5 CC2C 59CA"            /* E9%å�Ìò(·ù­¥Ì,YÊ */
+        $"D14D 4B86 9CC0 D367 7EF5 DB6D C2E1 06DB"            /* ÑMK†œÀÓg~õÛmÂá.Û */
+        $"58BC 0D97 DCFE 3CB1 EA45 C36F 1B60 83C9"            /* X¼.—Üþ<±êEÃo.`ƒÉ */
+        $"663F B883 83BA A69F 2653 0747 18C7 6D20"            /* f?¸ƒƒº¦Ÿ&S.G.Çm  */
+        $"F2C7 6E01 47DA AB9D 2D83 D5CE 1E9C 779A"            /* òÇn.GÚ«�-ƒÕÎ.œwš */
+        $"5FAE 6015 63DE 317A EFCA 7142 F3F8 A7E1"            /* _®`.cÞ1zïÊqBóø§á */
+        $"F739 60AB DF24 41BF EB6C AF15 7223 E56C"            /* ÷9`«ß$A¿ël¯.r#ål */
+        $"8D61 D9D1 C61F 8F8E 8435 6452 C45A 917B"            /* �aÙÑÆ.�Ž„5dRÄZ‘{ */
+        $"0856 B8BA 14E2 0A77 ABA0 E605 2E39 63EA"            /* .V¸º.âÂw« æ..9cê */
+        $"E7F5 4804 6535 7672 575F 37EA 9E69 1A1C"            /* çõH.e5vrW_7êži.. */
+        $"E380 CB7D C109 2D50 73EF 4119 54BE CBFE"            /* ã€Ë}ÁÆ-PsïA.T¾Ëþ */
+        $"4552 74A1 3E73 C457 1436 9DFF 3C25 8231"            /* ERt¡>sÄW.6�ÿ<%‚1 */
+        $"2C25 ACE4 F084 E842 60E8 355D 22BE 6FEE"            /* ,%¬äð„èB`è5]"¾oî */
+        $"93F9 DDE6 DAED 4E44 545A FE4E 5EA4 0487"            /* “ùÝæÚíNDTZþN^¤.‡ */
+        $"36F1 52AF 8683 2DE8 F30B 72DE E807 2068"            /* 6ñR¯†ƒ-èó.rÞè. h */
+        $"742B 7262 BF7E 516C D41F CA56 9DE1 E3B8"            /* t+rb¿~QlÔ.ÊV�á㸠*/
+        $"8D72 2993 C073 516D A343 DDE0 984D F06A"            /* �r)“ÀsQm£CÝà˜Mðj */
+        $"CD83 D22D C161 30D7 2E9A FED4 4E85 5D2E"            /* ̓Ò-Áa0×.šþÔN…]. */
+        $"CF72 2181 7F23 BC37 FF83 C30D 43E0 DBC7"            /* Ïr!�.#¼7ÿƒÃ.CàÛÇ */
+        $"A277 B4D9 4E68 1FB1 AF7B 6D8B 8F43 2A1B"            /* ¢w´ÙNh.±¯{m‹�C*. */
+        $"9FE4 6CCC E826 C4AA 96C9 98A9 4D3B 981F"            /* ŸälÌè&Ī–ɘ©M;˜. */
+        $"8786 8633 89B0 2B42 4266 BC27 0098 D2B3"            /* ‡††3‰°+BBf¼'.˜Ò³ */
+        $"E8E4 0D2C 6E14 D34D 3613 4568 4A1E 8E5E"            /* èä.,n.ÓM6.EhJ.Ž^ */
+        $"E328 D89C 85D3 D8C2 C15B 3533 989F F015"            /* ã(Øœ…ÓØÂÁ[53˜Ÿð. */
+        $"1B49 871D 031B 2DBE D49E 880D A557 0694"            /* .I‡...-¾Ôžˆ.¥W.” */
+        $"60C3 47A1 CD2A 961B F73C 94A3 6B17 4268"            /* `ÃG¡Í*–.÷<”£k.Bh */
+        $"F766 81DC 33BC 8C1D 5571 D2D7 FB1C 9378"            /* ÷f�Ü3¼Œ.UqÒ×û.“x */
+        $"01B7 BDCC 5DD0 9171 5FA1 50DA 7EBF 1586"            /* .·½Ì]Бq_¡PÚ~¿.† */
+        $"FA82 9E6F CBE4 0977 9C9C 2373 E789 5A3E"            /* ú‚žoËäÆwœœ#sç‰Z> */
+        $"8743 EB0E ED13 7955 DB28 2874 8065 2078"            /* ‡Cë.í.yUÛ((t€e x */
+        $"97A7 6C13 2283 729A CCF9 E449 A627 7652"            /* —§l."ƒršÌùäI¦'vR */
+        $"E821 2F1F 574E 6887 1830 6E01 5A8D 02FB"            /* è!/.WNh‡.0n.Z�.û */
+        $"DB61 8EEF 4E08 B607 26FA 2B4C FF47 38FE"            /* ÛaŽïN.¶.&ú+LÿG8þ */
+        $"9B7C A3E4 DB46 F898 CFE9 8F3C 8717 2975"            /* ›|£äÛFø˜Ïé�<‡.)u */
+        $"9BA2 582E 86D1 D882 C127 EFD7 E71A B5DD"            /* ›¢X.†ÑØ‚Á'ï×ç.µÝ */
+        $"7772 6391 2722 2884 AA0F 9C72 9A96 F4F8"            /* wrc‘'"(„ª.œrš–ôø */
+        $"BFF8 869A FD00 3B41 A8C7 DCD0 2834 270C"            /* ¿ø†šý.;A¨ÇÜÐ(4'. */
+        $"B93C 8702 5B16 8A32 0289 979B 0A35 3A7B"            /* ¹<‡.[.Š2.‰—›Â5:{ */
+        $"5870 6189 03C2 DD00 FAB2 B137 AB93 3EF5"            /* Xpa‰.ÂÝ.ú²±7«“>õ */
+        $"24E3 1FE1 A206 963E 1344 FE12 285A 5C52"            /* $ã.á¢.–>.Dþ.(Z\R */
+        $"692E D315 6C73 2CBE 7ADC 81BC EBC8 13EA"            /* i.Ó.ls,¾zÜ�¼ëÈ.ê */
+        $"796B 6056 E9E7 D971 6E09 7086 252C 6A19"            /* yk`VéçÙqnÆp†%,j. */
+        $"7351 153D F4C4 FE01 6235 917F B203 171A"            /* sQ.=ôÄþ.b5‘.²... */
+        $"1822 B42B 9226 D163 5572 7E7E C508 BEBA"            /* ."´+’&ÑcUr~~Å.¾º */
+        $"D0D2 1C24 8D62 565D C183 F78D 4726 0541"            /* ÐÒ.$�bV]Áƒ÷�G&.A */
+        $"F829 10C7 1B21 E59C C4E5 7688 6268 FABC"            /* ø).Ç.!åœÄåvˆbhú¼ */
+        $"C0B9 6C02 8820 3F44 54A7 8C83 F14F 61B8"            /* À¹l.ˆ ?DT§ŒƒñOa¸ */
+        $"707C AB32 9D59 F01E D18A 37FC 40F9 5C59"            /* p|«2�Yð.ÑŠ7ü@ù\Y */
+        $"EEA8 E442 FDC8 CA73 970F 6EE0 1348 AC8E"            /* î¨äBýÈÊs—.nà.H¬Ž */
+        $"9D65 4DA9 2820 AEDB A7F3 C1B4 8E3F 8780"            /* �eM©( ®Û§óÁ´Ž?‡€ */
+        $"8DA9 F7D9 F116 DD30 778E 4FB6 49D3 AFE8"            /* �©÷Ùñ.Ý0wŽO¶IÓ¯è */
+        $"74B1 EB63 92B8 4210 3B22 3613 6784 41A2"            /* t±ëc’¸B.;"6.g„A¢ */
+        $"5953 1EFF 16A9 1769 9852 73D0 B6C2 3523"            /* YS.ÿ.©.i˜RsжÂ5# */
+        $"854B 1247 531D 47C5 7AFC 1B6B F0C4 2E2F"            /* …K.GS.GÅzü.kðÄ./ */
+        $"6C60 82C9 9C4D 2FAD 25A5 BEC6 8590 7388"            /* l`‚ÉœM/­%¥¾Æ…�sˆ */
+        $"5D15 9A65 E013 D48B 7D9C 34B2 A617 75A8"            /* ].šeà.Ô‹}œ4²¦.u¨ */
+        $"8E8E 2D91 1AEC 26D5 8B9C D03C A02A A829"            /* ŽŽ-‘.ì&Õ‹œÐ< *¨) */
+        $"738D 9A4E 8F31 82A9 39B7 7CFE D412 810E"            /* s�šN�1‚©9·|þÔ.�. */
+        $"1372 6D79 8D49 BAC1 9FFB 5D52 56AD 488F"            /* .rmy�IºÁŸû]RV­H� */
+        $"4E1D A232 7348 1FE2 483F AB9F A23C 0997"            /* N.¢2sH.âH?«Ÿ¢<Æ— */
+        $"678D 1AB7 7F66 8927 7DED 2A66 E03B 05C9"            /* g�.·.f‰'}í*fà;.É */
+        $"0420 66A2 E0AE E1B9 259E 64C9 FF0E A7C7"            /* . f¢à®á¹%ždÉÿ.§Ç */
+        $"5E9D 69F4 DD50 394C 344E 9DA9 6BCA 3D9F"            /* ^�iôÝP9L4N�©kÊ=Ÿ */
+        $"8FA9 C156 3248 2310 8AB9 6131 B94F FF36"            /* �©ÁV2H#.Š¹a1¹Oÿ6 */
+        $"DF00 9E80 5713 E9AD 3B07 879E C876 E063"            /* ß.ž€W.é­;.‡žÈvàc */
+        $"38D8 2776 3081 5810 1760 927C D93C EE88"            /* 8Ø'v0�X..`’|Ù<îˆ */
+        $"518B 755A EBF1 B276 C65B 98DD 1421 8AA1"            /* Q‹uZëñ²vÆ[˜Ý.!Š¡ */
+        $"27D2 A8B2 5E3E B7B7 8F73 CDCB 9896 D80F"            /* 'Ò¨²^>··�s͢–Ø. */
+        $"1D50 2E28 4F54 26A9 E68F 822C 3031 0A5B"            /* .P.(OT&©æ�‚,01Â[ */
+        $"213A 8ED8 B1B8 C32C F5EF 6784 3641 A888"            /* !:ŽØ±¸Ã,õïg„6A¨ˆ */
+        $"1AF9 941B E9B2 42C0 D9BE AAD7 2727 9E13"            /* .ù”.é²BÀÙ¾ª×''ž. */
+        $"284F A530 1F62 679B 7860 E677 9E24 3663"            /* (O¥0.bg›x`æwž$6c */
+        $"E7D1 E4B5 D37B C274 9ECB CFA2 CC95 8A75"            /* çÑäµÓ{ÂtžËϢ̕Šu */
+        $"0C3A FB7D F074 1433 5EC7 1FC4 330E F221"            /* .:û}ðt.3^Ç.Ä3.ò! */
+        $"AE39 4A04 097F 4B21 27CD C193 39CB 3AB2"            /* ®9J.Æ.K!'ÍÁ“9Ë:² */
+        $"0B6E D8E0 54EA 0F75 15F9 D75D 0D82 624D"            /* .nØàTê.u.ù×].‚bM */
+        $"7D19 8E11 1AD0 764F CEA8 F0FE 2913 6841"            /* }.Ž..ÐvOΨðþ).hA */
+        $"89B8 CA62 C997 34B9 5950 4842 4F13 1ACD"            /* ‰¸ÊbÉ—4¹YPHBO..Í */
+        $"39AD 30CA 4ED2 A17D 0B09 206B 9426 EF50"            /* 9­0ÊNÒ¡}.Æ k”&ïP */
+        $"63C6 386E 74BB BDE0 420F 6154 5260 E1A2"            /* cÆ8nt»½àB.aTR`ᢠ*/
+        $"8546 3192 76D1 1F38 268E 7AC6 049F 321D"            /* …F1’vÑ.8&ŽzÆ.Ÿ2. */
+        $"CB51 35C7 067C 961B DA2F 4BCB E065 A8DB"            /* ËQ5Ç.|–.Ú/KËàe¨Û */
+        $"16C9 1F05 ABAF 93FF 333A F049 3161 6838"            /* .É..«¯“ÿ3:ðI1ah8 */
+        $"6E1A FEF2 564C 3F48 3800 BC9C F009 AF34"            /* n.þòVL?H8.¼œðƯ4 */
+        $"2241 15D4 764F 4764 CEDF 6D7D 2E9C 8141"            /* "A.ÔvOGdÎßm}.œ�A */
+        $"1E00 E109 D827 DDAA A47C 2854 9229 8998"            /* ..áÆØ'ݪ¤|(T’)‰˜ */
+        $"9175 1FFB 496B 36C7 3695 3631 390B 06E6"            /* ‘u.ûIk6Ç6•619..æ */
+        $"EB0D 3BA7 F1BE A2FF 6D3A 9FB6 FCFD ADEF"            /* ë.;§ñ¾¢ÿm:Ÿ¶üý­ï */
+        $"EDBA 3FDB 632F EDB1 BF6D BE7E DB9F 97ED"            /* íº?Ûc/í±¿m¾~ÛŸ—í */
+        $"45FD AB93 F6E8 7FED A7F7 DAC3 FC34 6F43"            /* Eý«“öè.í§÷ÚÃü4oC */
+        $"E1DB 5507 762F DB7E 5F51 DDF5 1DFE DD07"            /* áÛU.v/Û~_QÝõ.þÝ. */
+        $"E1FD A67F B4E6 7EDB 8BF6 AE3F B6BC D3E4"            /* áý¦.´æ~Û‹ö®?¶¼Óä */
+        $"D00B 0F87 A0FF 2AC3 3F6D 84F8 7475 99F2"            /* Ð..‡ ÿ*Ã?m„øtu™ò */
+        $"F382 BE95 100F 8FEE C1C8 D086 E345 E973"            /* 󂾕..�îÁÈІãEés */
+        $"0FE4 06B6 7813 7115 B8D0 D91B C698 D10D"            /* .ä.¶x.q.¸ÐÙ.ƘÑ. */
+        $"A370 844F 9330 E047 0201 F880 D146 6522"            /* £p„O“0àG..ø€ÑFe" */
+        $"8E52 12DE 3D1A 9231 5315 682E 4706 8685"            /* ŽR.Þ=.’1S.h.G.†… */
+        $"DA39 C538 9828 7ED0 714F 3E27 532A 3840"            /* Ú9Å8˜(~ÐqO>'S*8@ */
+        $"C912 3E46 8205 3243 7835 7284 12D6 CCF5"            /* É.>F‚.2Cx5r„.ÖÌõ */
+        $"36AF 0975 8A27 4F44 3857 B5A3 160D 1391"            /* 6¯ÆuŠ'OD8Wµ£...‘ */
+        $"8005 2453 86CB 51B3 E493 EA9C 707F 7047"            /* €.$S†ËQ³ä“êœp.pG */
+        $"1DA8 1386 91D1 6105 7D84 1563 FC52 D5D3"            /* .¨.†‘Ña.}„.cüRÕÓ */
+        $"EDA7 D4A0 4AC1 BB4E 49D6 62F4 CA92 CE8E"            /* í§Ô JÁ»NIÖbôÊ’ÎŽ */
+        $"8DE0 84DC 418D ACE2 71AD 9206 3C98 3281"            /* �à„ÜA�¬âq­’.<˜2� */
+        $"104E A1F2 8982 6ED6 223E B67B BE6A C51F"            /* .N¡ò‰‚nÖ">¶{¾jÅ. */
+        $"4BF8 6C35 B6A4 5EC8 87BB 4834 7CF3 16AC"            /* Køl5¶¤^ȇ»H4|ó.¬ */
+        $"2453 B3DA 3503 94D6 2E70 2B6F 975E 21DB"            /* $S³Ú5.”Ö.p+o—^!Û */
+        $"F409 0368 9A2E DFB2 7A4B 9A6F 4165 1173"            /* ôÆ.hš.ß²zKšoAe.s */
+        $"A53E 329A 7925 FB80 9664 2C09 A9E5 715C"            /* ¥>2šy%û€–d,Æ©åq\ */
+        $"E42F 8E14 EC68 05A8 D565 53C2 9C98 86A2"            /* ä/Ž.ìh.¨ÕeSÂœ˜†¢ */
+        $"2C2D 6443 A1D0 A619 2320 6CD3 FE48 8006"            /* ,-dC¡Ð¦.# lÓþH€. */
+        $"FC0F 3690 DF76 1FD8 2E16 0705 D91F EEBE"            /* ü.6�ßv.Ø....Ù.î¾ */
+        $"E961 32B9 E252 4F0E EE4A 6F73 AEBB 014A"            /* éa2¹âRO.îJos®».J */
+        $"8F45 1551 9123 7C3A 13F8 1B57 EB6A 0AFB"            /* �E.Q‘#|:.ø.WëjÂû */
+        $"9AE9 65F5 9FDE 5F1C 7C23 84F1 6DCD CC52"            /* šéeõŸÞ_.|#„ñmÍÌR */
+        $"97DD 03E6 C571 0C23 F06B 9F21 2E2C 79D5"            /* —Ý.æÅq.#ðkŸ!.,yÕ */
+        $"1827 1436 E6FB C5FB BA11 617B 9B32 3DCD"            /* .'.6æûÅûº.a{›2=Í */
+        $"B0AD AA8F 53D0 2F20 849C D667 9436 A677"            /* °­ª�SÐ/ „œÖg”6¦w */
+        $"38C9 1B5A 26E2 B4D4 29BB 2D9E 56D4 652D"            /* 8É.Z&â´Ô)»-žVÔe- */
+        $"9A12 FC7E FBD5 0075 3EC9 64FE D0CE 06A2"            /* š.ü~ûÕ.u>ÉdþÐÎ.¢ */
+        $"B63F 8731 DB8A 6917 26EA CCFC C1E6 10AA"            /* ¶?‡1ÛŠi.&êÌüÁæ.ª */
+        $"704E 20EA 7518 0416 6BBE 2867 9470 9FE6"            /* pN êu...k¾(g”pŸæ */
+        $"3D2A D178 6CD1 0B7D E518 4682 FC48 EA03"            /* =*ÑxlÑ.}å.F‚üHê. */
+        $"EFA0 ADEE B643 CDFD 796D C309 E13B 9DD3"            /* ï ­î¶CÍýymÃÆá;�Ó */
+        $"82CC 1237 8D6B 9CB9 0438 AF1A 6190 136E"            /* ‚Ì.7�kœ¹.8¯.a�.n */
+        $"A170 6109 4BA8 FD0B 4C10 DE61 71A9 A5FF"            /* ¡paÆK¨ý.L.Þaq©¥ÿ */
+        $"5AD1 3895 15D0 912A BC62 5344 A7FD 7B9B"            /* ZÑ8•.Б*¼bSD§ý{› */
+        $"0360 8C71 DD04 20C7 4685 E6B7 7941 7BD7"            /* .`ŒqÝ. ÇF…æ·yA{× */
+        $"DBBB 3F61 742B D692 AD3D B778 6442 3DD1"            /* Û»?at+Ö’­=·xdB=Ñ */
+        $"A97E 1312 9AF4 05C1 7B33 9FE2 B3F5 D16C"            /* ©~..šô.Á{3Ÿâ³õÑl */
+        $"875D 7109 13EC BB96 0664 DF60 1958 8DE5"            /* ‡]qÆ.ì»–.dß`.X�å */
+        $"5B3F 3E75 9D21 0415 CE9C 3172 87C7 FF05"            /* [?>u�!..Îœ1r‡Çÿ. */
+        $"F787 4F14 E63B 4DCE 247D B3A3 475C 5336"            /* ÷‡O.æ;MÎ$}³£G\S6 */
+        $"C794 AF23 6415 68C6 B893 1B16 8C81 3F43"            /* Ç”¯#d.hƸ“..Œ�?C */
+        $"C455 6EB8 8D5A 6919 4C3A D980 BFB1 3699"            /* ÄUn¸�Zi.L:Ù€¿±6™ */
+        $"C790 C7D1 7B05 12AA 803A 172B DEF2 00CC"            /* Ç�ÇÑ{..ª€:.+Þò.Ì */
+        $"FF38 62C8 1815 1D3A F60D 2B9B 87A0 05C5"            /* ÿ8bÈ...:ö.+›‡ .Å */
+        $"3587 0181 8754 06D7 2CFC 78B8 0C65 D5BC"            /* 5‡.�‡T.×,üx¸.eÕ¼ */
+        $"2903 C07C 0631 A0B9 E94E 192F DE4B 4924"            /* ).À|.1 ¹éN./ÞKI$ */
+        $"A4F0 BB9A 49C5 B751 38EB 7289 9806 FC5C"            /* ¤ð»šIÅ·Q8ër‰˜.ü\ */
+        $"D822 ED93 CA92 14B6 5056 017F 7826 CDE1"            /* Ø"í“Ê’.¶PV..x&Íá */
+        $"8401 9F6C A7F7 4AD5 E86F FDC3 05AF 6AE3"            /* „.Ÿl§÷JÕèoýÃ.¯jã */
+        $"5EED 07E3 E5ED 7EE7 FB97 0B99 E191 605B"            /* ^í.ãåí~çû—.™á‘`[ */
+        $"955A 6A3C 33C6 2BB8 9562 0E38 09C1 1ED9"            /* •Zj<3Æ+¸•b.8ÆÁ.Ù */
+        $"8914 73AF E9AA 7B2F 214E 7EEA 98E8 B976"            /* ‰.s¯éª{/!N~ê˜è¹v */
+        $"E058 E0B5 6DB4 5B1C F212 2C8E 0AE5 7100"            /* àXàµm´[.ò.,ŽÂåq. */
+        $"BC1E 84CD 0598 7CF9 EA4E 1E96 2B4A DE9E"            /* ¼.„Í.˜|ùêN.–+JÞž */
+        $"6CE9 E79B 0336 9059 E109 DF83 A2AE 9E74"            /* léç›.6�YáÆ߃¢®žt */
+        $"5BB1 0236 590C 66CD 0658 ECE5 50A2 EDDD"            /* [±.6Y.fÍ.XìåP¢íÝ */
+        $"D7BB DAF7 548B 7F21 2A40 7821 FDA2 62B6"            /* ×»Ú÷T‹.!*@x!ý¢b¶ */
+        $"C862 B0B2 96CF 27D5 EC9D F5C8 42D8 F42A"            /* Èb°²–Ï'Õì�õÈBØô* */
+        $"5962 F21A D191 6744 1AE2 64B4 6744 A1B2"            /* Ybò.Ñ‘gD.âd´gD¡² */
+        $"7625 FF0D F0CF A1F8 3273 C4B8 FCCE C2BC"            /* v%ÿ.ðÏ¡ø2sĸüμ */
+        $"EDD5 F0C6 765F 2446 5EF5 2195 04EE C94B"            /* íÕðÆv_$F^õ!•.îÉK */
+        $"C9C2 4F82 0D0F 6034 3560 64A8 C372 4E17"            /* ÉÂO‚..`45`d¨ÃrN. */
+        $"D4F6 B2DC 2162 A6DC 9B35 5F36 628E EA58"            /* Ôö²Ü!b¦Ü›5_6bŽêX */
+        $"B2EF D0B8 79FF 3F60 39DC 34C9 8DD1 C7DA"            /* ²ïиyÿ?`9Ü4É�ÑÇÚ */
+        $"BFFD 9220 B977 42CD 1F4E 00C7 1A7B F29F"            /* ¿ý’ ¹wBÍ.N.Ç.{òŸ */
+        $"9738 8D5E 3E5F BA1F D4BD 0592 2006 1216"            /* —8�^>_º.Ô½.’ ... */
+        $"D478 DE72 171A A49D 9C4A 0691 CD59 6FB3"            /* ÔxÞr..¤�œJ.‘ÍYo³ */
+        $"F3C5 B3CD DCC8 5794 133C 85B3 176A 0C6A"            /* óųÍÜÈW”.<…³.j.j */
+        $"323E C74F 7CE3 4042 38AB E9CA 5700 E39B"            /* 2>ÇO|ã@B8«éÊW.ã› */
+        $"26D3 62B7 59F8 966D A789 35AA C72D 9943"            /* &Ób·Yø–m§‰5ªÇ-™C */
+        $"C884 2E53 30B3 D351 EFCC 6BF8 9889 8AB6"            /* È„.S0³ÓQïÌkø˜‰Š¶ */
+        $"E284 F5A4 64BD F89F 98A4 8082 6292 48EB"            /* â„õ¤d½øŸ˜¤€‚b’Hë */
+        $"2039 4A80 D5D7 BEFC 2DC1 69A9 F484 9B4E"            /*  9J€Õ×¾ü-Ái©ô„›N */
+        $"94C9 6E87 31A6 6D4E 23DB 77A9 37D5 CEE9"            /* ”Én‡1¦mN#Ûw©7ÕÎé */
+        $"10B5 22DB 58B2 3DFB 973A E321 F02A 2985"            /* .µ"ÛX²=û—:ã!ð*)… */
+        $"AE7E F964 9A23 4B8D 90FD 75F4 9944 3CEB"            /* ®~ùdš#K��ýuô™D<ë */
+        $"C5C5 B0BA DA1C AA0A B59A EFCA 903A 972B"            /* ÅÅ°ºÚ.ªÂµšïÊ�:—+ */
+        $"10E9 2A66 2BAB 3E63 8312 E494 A82C AEE8"            /* .é*f+«>cƒ.䔨,®è */
+        $"DE3B 902F 4DE5 A934 7FA5 59D8 B355 75C7"            /* Þ;�/Må©4.¥YسUuÇ */
+        $"DC51 6208 6D60 DE89 F04A F698 FC35 5341"            /* ÜQb.m`Þ‰ðJö˜ü5SA */
+        $"A8C7 894B 5E8F 0638 0F21 36AB 23FF 37BF"            /* ¨Ç‰K^�.8.!6«#ÿ7¿ */
+        $"CA6E C0CE 1C93 9BB1 FEA7 49E8 9BA5 7F32"            /* ÊnÀÎ.“›±þ§I蛥.2 */
+        $"4C9D C8BA 821C 1E07 F277 BE63 241C D5F6"            /* L�Ⱥ‚...òw¾c$.Õö */
+        $"07CB 7A98 E51E B0FC B312 223C 21BF 5DEE"            /* .Ëz˜å.°ü³."<!¿]î */
+        $"0229 A0EE 8B90 5918 5910 F6A6 EEB6 503D"            /* .) î‹�Y.Y.ö¦î¶P= */
+        $"8E76 A3B6 E583 FEFF 5B3D F804 F6EE 956E"            /* Žv£¶åƒþÿ[=ø.öî•n */
+        $"FEE7 D95F 9D05 AE0B 4926 52B4 23C3 D17A"            /* þçÙ_�.®.I&R´#ÃÑz */
+        $"FC0F CC41 1264 0956 8CA2 6A30 C0D0 275F"            /* ü.ÌA.dÆVŒ¢j0ÀÐ'_ */
+        $"0CE8 C646 CC49 EF38 CC94 8B6C 1737 9636"            /* .èÆFÌIï8Ì”‹l.7–6 */
+        $"4EA7 0FE7 217B F3F1 A10D 7E49 242E 6F19"            /* N§.ç!{óñ¡.~I$.o. */
+        $"A8CF 369A 44DE 6C99 A9D4 24DA 6909 62C3"            /* ¨Ï6šDÞl™©Ô$ÚiÆbà */
+        $"0C4C D4CD D80E 72E6 FF6B A90E 7080 977B"            /* .LÔÍØ.ræÿk©.p€—{ */
+        $"4BEB 6A2A 72BB 0574 45FB 1E12 6408 C966"            /* Këj*r».tEû..d.Éf */
+        $"A632 9AC7 E67D 82C9 3FED 1E27 C1FA C47A"            /* ¦2šÇæ}‚É?í.'ÁúÄz */
+        $"AFCF 5719 3BCA 3975 BE3A 550B 6DC9 91CC"            /* ¯ÏW.;Ê9u¾:U.mÉ‘Ì */
+        $"F28E 751C 1B20 E7BB 58FF 0D92 2BF7 DE26"            /* òŽu.. ç»Xÿ.’+÷Þ& */
+        $"DFE3 B230 78F7 C64E ADF8 7741 F45A E3BC"            /* ßã²0x÷ÆN­øwAôZã¼ */
+        $"5185 1323 1C74 3288 F720 5DB7 B5C9 1EFD"            /* Q….#.t2ˆ÷ ]·µÉ.ý */
+        $"C844 7159 7047 A9BA 6CA1 403E CE2E 3522"            /* ÈDqYpG©ºl¡@>Î.5" */
+        $"1088 A628 490C 5F8D 64C4 7E17 CBD3 290D"            /* .ˆ¦(I._�dÄ~.ËÓ). */
+        $"91B1 B073 AD4A BF5B A1E9 6306 3E9A F87E"            /* ‘±°s­J¿[¡éc.>šø~ */
+        $"2DEC 7390 2CF5 3305 93C2 15DA 7FFF 7FC6"            /* -ìs�,õ3.“Â.Ú.ÿ.Æ */
+        $"0578 C93E BF93 5B69 25D4 E0F9 5726 0D7E"            /* .xÉ>¿“[i%ÔàùW&.~ */
+        $"9C06 C76B 1BF5 3206 F26C 4F57 6A13 7488"            /* œ.Çk.õ2.òlOWj.tˆ */
+        $"07F4 1787 316E 19B5 2CB4 D7B8 23EE BF15"            /* .ô.‡1n.µ,´×¸#î¿. */
+        $"84F7 C141 CE7E 358F F83B 081D 2680 C5CB"            /* „÷ÁAÎ~5�ø;..&€ÅË */
+        $"2002 0FFB D329 10E3 1880 E0F6 29FF 14F6"            /*  ..ûÓ).ã.€àö)ÿ.ö */
+        $"1447 24FF 4BDD 371B 00F3 0334 6FE5 D217"            /* .G$ÿKÝ7..ó.4oåÒ. */
+        $"8E7D 3CCB EC04 D019 0583 0792 D4F4 59E5"            /* Ž}<Ëì.Ð..ƒ.’ÔôYå */
+        $"0914 52FB CE7A 2EFD B899 ED16 38FB E1D4"            /* Æ.RûÎz.ý¸™í.8ûáÔ */
+        $"3312 BAAE 3EF3 45B7 2A77 62F3 4787 8900"            /* 3.º®>óE·*wbóG‡‰. */
+        $"050D 5A64 92D3 64E7 7950 4234 FCC0 0EC6"            /* ..Zd’ÓdçyPB4üÀ.Æ */
+        $"004C 8652 616B B5FF 87F6 72D0 400B 9574"            /* .L†Rakµÿ‡örÐ@.•t */
+        $"7ADD 2EE6 F979 EE70 393F 5E65 09EC 561B"            /* zÝ.æùyîp9?^eÆìV. */
+        $"2FF4 F6FA 9226 2AA7 C2D2 4517 2258 15C7"            /* /ôöú’&*§ÂÒE."X.Ç */
+        $"D27E DE80 0000 0009 BB69 0154 3C66 FD24"            /* Ò~Þ€...Æ»i.T<fý$ */
+        $"D6C1 DFFC 41CF 26FD 27E3 9482 7299 C4A3"            /* ÖÁßüAÏ&ý'㔂r™Ä£ */
+        $"A4B0 4F99 5ED7 6507 C196 C060 D7BD 7BA6"            /* ¤°O™^×e.Á–À`×½{¦ */
+        $"A0A2 C1E7 0ECE 98C4 36F0 B006 0526 5FC4"            /*  ¢Áç.ΘÄ6ð°..&_Ä */
+        $"CDEF A25D CE59 7B6F 507F C409 957F 43E6"            /* Íï¢]ÎY{oP.ÄÆ•.Cæ */
+        $"20AB C4BE 33C2 E794 46B7 5341 D8C9 5487"            /*  «Ä¾3Âç”F·SAØÉT‡ */
+        $"3000 A3E6 41BE 7D2A B553 6A8D C345 2E1E"            /* 0.£æA¾}*µSj�ÃE.. */
+        $"BF55 F536 52DD 101F D6C9 BB65 B7E4 0CFC"            /* ¿Uõ6RÝ..ÖÉ»e·ä.ü */
+        $"03D7 F641 F641 7A4F 8EE2 BA7A 352C ED91"            /* .×öAöAzOŽâºz5,í‘ */
+        $"9057 F893 C46F 62F7 A791 A8DE 8A25 BB17"            /* �Wø“Äob÷§‘¨ÞŠ%». */
+        $"F164 F2ED 43E5 A2E2 17E9 C95D DE1C 45F4"            /* ñdòíCå¢â.éÉ]Þ.Eô */
+        $"3019 8090 809D D124 EE5C B48E 6C92 2A74"            /* 0.€�€�Ñ$î\´Žl’*t */
+        $"ACA0 4F0A 1777 70CF EBEC 112A 9035 16AB"            /* ¬ OÂ.wpÏëì.*�5.« */
+        $"B36D 13D6 9F72 69CD E213 F146 6733 BAA3"            /* ³m.ÖŸriÍâ.ñFg3º£ */
+        $"0080 0000 0000 0000 0001 0151 0AD3 43F0"            /* .€.........QÂÓCð */
+        $"14A4 0000 61F0 20D9 9F3A 47FC 60A2 4780"            /* .¤..að ÙŸ:Gü`¢G€ */
+        $"F2D0 2A57 2C4C D349 5B9A 1BE3 0D39 80AD"            /* òÐ*W,LÓI[š.ã.9€­ */
+        $"72C4 873D 5028 F09E F0F5 700F B776 4B38"            /* rć=P(ðžðõp.·vK8 */
+        $"4FC6 7D26 AE5D 219E DDCE 4AA3 9AA9 FE19"            /* OÆ}&®]!žÝÎJ£š©þ. */
+        $"EC25 FEF0 0626 D259 8ECF 0364 6192 A000"            /* ì%þð.&ÒYŽÏ.da’ . */
+        $"0000 0000 0000 0000 0184 84B4 4FF0 1848"            /* .........„„´Oð.H */
+        $"4BC2 3700 0000 0000 0000 00B5 DA5E 3FF1"            /* KÂ7........µÚ^?ñ */
+        $"C9FC 9186 4A80 0000 0000 0000 0000 0000"            /* Éü‘†J€.......... */
+        $"0510 0FC3 251B 71C0 D918 64A8 0000 0000"            /* ...Ã%.qÀÙ.d¨.... */
+        $"0000 0000 0000 07E1 1EE1 F164 E11A 319D"            /* .......á.áñdá.1� */
+        $"3806 659F 8C35 7012 B17E 6096 52F0 8E96"            /* 8.eŸŒ5p.±~`–RðŽ– */
+        $"1438 1EBF 363A 49C9 51BD 3517 4ADA 7060"            /* .8.¿6:IÉQ½5.JÚp` */
+        $"0849 8F8B FCEC FD48 0000 54DF 4C0B E043"            /* .I�‹üìýH..TßL.àC */
+        $"F3B6 1CEB 518A F2B1 5A9C 9500 0000 0000"            /* ó¶.ëQŠò±Zœ•..... */
+        $"0196 C058 0636 AF4B 041F 37EC DE6F 4B4E"            /* .–ÀX.6¯K..7ìÞoKN */
+        $"291D A2A6 3CB8 9BAC 4B0C 5017 9031 0EF1"            /* ).¢¦<¸›¬K.P.�1.ñ */
+        $"3CF7 F63B 73A1 B4A6 9EA7 0513 C571 8EA8"            /* <÷ö;s¡´¦ž§..ÅqŽ¨ */
+        $"5D0A 28FC DCB6 D27A 0000 0000 0159 D076"            /* ]Â(üܶÒz.....YÐv */
+        $"3D1E 84A9 1C76 876E 7B6B 8519 1F9F 01C6"            /* =.„©.v‡n{k…..Ÿ.Æ */
+        $"1A11 B2A2 4841 4D47 5463 5D18 2AFE 54F5"            /* ..²¢HAMGTc].*þTõ */
+        $"591E 5FF1 39C7 C0CD 0D20 F366 59DE FE22"            /* Y._ñ9ÇÀÍ. ófYÞþ" */
+        $"B12C 4608 009D F105 49C8 16B5 417A 6079"            /* ±,F..�ñ.IÈ.µAz`y */
+        $"40B0 7E7A C4B3 83B8 485D 42B1 4000 0000"            /* @°~zijƒ¸H]B±@... */
+        $"0E9F 0340 5469 49BB 5767 B4BE 47AF 19B3"            /* .Ÿ.@TiI»Wg´¾G¯.³ */
+        $"4E69 B99F 25DF C3C0 1B9C 5455 41D2 F508"            /* Ni¹Ÿ%ßÃÀ.œTUAÒõ. */
+        $"9900 1F13 B43E C345 C4B3 C066 8A27 C3D3"            /* ™...´>ÃEijÀfŠ'ÃÓ */
+        $"7A8A 6368 2F2C 3F2F 5D43 59ED 5E40 9E4F"            /* zŠch/,?/]CYí^@žO */
+        $"59BB 6A03 B7F8 083A 021D F8F0 79AF 43B0"            /* Y»j.·ø.:..øðy¯C° */
+        $"2270 F775 B8D8 FB59 371A 8B22 9F0B 55FA"            /* "p÷u¸ØûY7.‹"Ÿ.Uú */
+        $"C9B1 5565 0914 AA67 2D9E 81B2 60FC 1333"            /* ɱUeÆ.ªg-ž�²`ü.3 */
+        $"318F 21E9 97E4 1400 F69E F709 7AE3 82A5"            /* 1�!é—ä..öž÷Æzã‚¥ */
+        $"C9DE 7D16 1DF8 EDF8 FC5E DB3E FC2A F822"            /* ÉÞ}..øíøü^Û>ü*ø" */
+        $"886E F247 9BC1 250E 905C 4AF7 4B22 3595"            /* ˆnòG›Á%.�\J÷K"5• */
+        $"0835 2567 EEC1 C4C8 B70D D782 6A22 C9DA"            /* .5%gîÁÄÈ·.ׂj"ÉÚ */
+        $"ADA3 0370 EED9 E428 E163 963A E6F0 5D4A"            /* ­£.pîÙä(ác–:æð]J */
+        $"F42A D11F B46D 7FBC 2D87 4274 4756 896E"            /* ô*Ñ.´m.¼-‡BtGV‰n */
+        $"C489 80C0 62F6 88A8 184A 79BE 3068 A9AF"            /* ĉ€Àböˆ¨.Jy¾0h©¯ */
+        $"D703 390B 1A76 3136 B799 726A AAA8 C23D"            /* ×.9..v16·™rjª¨Â= */
+        $"EEB0 E0F1 49E1 A6B7 204F 7BF3 6E44 F25E"            /* î°àñIᦷ O{ónDò^ */
+        $"7E0A 5125 CA89 B477 15CD 83CC CD21 C6BE"            /* ~ÂQ%ʉ´w.̓ÌÍ!ƾ */
+        $"F20B 99F3 C30C 5113 2E0A FF7E 1034 1BFF"            /* ò.™óÃ.Q..Âÿ~.4.ÿ */
+        $"0378 72CF B0EE D132 2A2D 14A9 E37F 6B10"            /* .xrÏ°îÑ2*-.©ã.k. */
+        $"B5CE 0500 0000 0000 0000 0160 A7E3 A715"            /* µÎ.........`§ã§. */
+        $"0C13 DE44 025B 9720 0000 0000 0000 0001"            /* ..ÞD.[— ........ */
+        $"E0F5 5A21 77FB C1F6 EAF0 244A EE78 B6FA"            /* àõZ!wûÁöêð$Jîx¶ú */
+        $"1769 3D98 AA28 2EB6 9826 A16B D6B8 BA89"            /* .i=˜ª(.¶˜&¡kÖ¸º‰ */
+        $"26C6 25C9 9E66 FD9C 6D2D FCDA FCB9 6AB2"            /* &Æ%Éžfýœm-üÚü¹j² */
+        $"B42A 7008 5069 CB61 D530 B47A FCFF 7F95"            /* ´*p.PiËaÕ0´züÿ.• */
+        $"FA58 2D11 111A 53BF FB17 59E1 63E7 0FAD"            /* úX-...S¿û.Yácç.­ */
+        $"B016 A862 3107 8DF0 7112 DD6A B6E3 2477"            /* °.¨b1.�ðq.Ýj¶ã$w */
+        $"3162 94F0 6826 75B0 D0B8 4C13 21C7 E4BC"            /* 1b”ðh&u°Ð¸L.!Çä¼ */
+        $"FB86 7A83 DF1C A4D9 C3B4 E3DE C334 1633"            /* û†zƒß.¤ÙôãÞÃ4.3 */
+        $"DC27 76B9 7ADF 50CA F95E C7C9 D5EB 402C"            /* Ü'v¹zßPÊù^ÇÉÕë@, */
+        $"276F A0B0 D88B CF4A 0FD2 380A E3E7 2BA5"            /* 'o °Ø‹ÏJ.Ò8Âãç+¥ */
+        $"DD24 A247 B631 75B1 6D3A 4C60 9BAB E4C5"            /* Ý$¢G¶1u±m:L`›«äÅ */
+        $"BBCB 2972 36B9 AC74 5FF5 B5DB 231B 95F3"            /* »Ë)r6¹¬t_õµÛ#.•ó */
+        $"7CFF 8E5F 86E9 1906 B3DF 75C7 0364 6192"            /* |ÿŽ_†é..³ßuÇ.da’ */
+        $"A000 0000 0000 0000 0000 003B B1A0 0000"            /*  ..........;± .. */
+        $"0000 0000 0000 0000 0000 0016 D51B CEEA"            /* ............Õ.Îê */
+        $"0406 C003 4E50 C0B8 8DB2 F37C FF8E 5F86"            /* ..À.NPÀ¸�²ó|ÿŽ_† */
+        $"E919 06B3 DF75 C703 6461 92A0 0000 0000"            /* é..³ßuÇ.da’ .... */
+        $"0000 0000 0000 3BB1 A000 0000 0000 0000"            /* ......;± ....... */
+        $"0000 0000 0000 16D5 1BCE EA04 06C0 034E"            /* .......Õ.Îê..À.N */
+        $"50C0 B88D B2F4 4BED 0C57 2F64 38E7 DFE6"            /* PÀ¸�²ôKí.W/d8çßæ */
+        $"95DB 93EF B9ED 1250 6A6A A6E3 4478 1E7E"            /* •Û“ï¹í.Pjj¦ãDx.~ */
+        $"F105 8E1B 961B 230C 9500 0000 0000 0C18"            /* ñ.Ž.–.#.•....... */
+        $"0EA3 5F13 6306 E1B5 4B22 3D26 79A1 06E4"            /* .£_.c.áµK"=&y¡.ä */
+        $"228F F320 0B74 8820 0000 0000 0000 0007"            /* "�ó .tˆ ........ */
+        $"9F62 443B 9A51 EAB0 7C1A A374 E7F1 52F3"            /* ŸbD;šQê°|.£tçñRó */
+        $"3BB8 C1E0 5919 6C04 A2E2 1032 6917 1394"            /* ;¸ÁàY.l.¢â.2i..” */
+        $"CCBE 472A 0652 C144 6D1E 755C ECF9 9725"            /* ̾G*.RÁDm.u\ìù—% */
+        $"A84A 55AE 7A0E 6730 FCA7 B6E0 FF31 08C0"            /* ¨JU®z.g0ü§¶àÿ1.À */
+        $"3E76 4DDC 9E24 A60B C4A7 4CDD C221 1941"            /* >vMÜž$¦.ħLÝÂ!.A */
+        $"0810 2DE3 206F C551 4910 77AA 762A 1FF2"            /* ..-ã oÅQI.wªv*.ò */
+        $"D39A 0ADC 1089 90F8 D098 1E77 BDD1 AF74"            /* ÓšÂÜ.‰�øИ.w½Ñ¯t */
+        $"4DEF D00D 0B2C CA2F 9EDC 27C4 35F9 F924"            /* MïÐ..,Ê/žÜ'Ä5ùù$ */
+        $"67FF 74E5 A746 B627 6267 F6D0 9B94 22D4"            /* gÿtå§F¶'bgöЛ”"Ô */
+        $"5FFE DF67 A7A9 E3CA 02A5 44D1 E926 DCA4"            /* _þßg§©ãÊ.¥DÑé&ܤ */
+        $"7490 4AB8 E094 7037 FF7C 8CF7 2A9B B784"            /* t�J¸à”p7ÿ|Œ÷*›·„ */
+        $"794E 9026 D48F FF7F F013 AABF F874 63DA"            /* yN�&Ô�ÿ.ð.ª¿øtcÚ */
+        $"0302 FBFA AA6A 31D5 E2DF 85F7 2ACD D98C"            /* ..ûúªj1Õâß…÷*ÍÙŒ */
+        $"175D 1243 F1C0 CEA2 344C B6FC ADCF C6AA"            /* .].CñÀ΢4L¶ü­Ïƪ */
+        $"5CAE FA82 783F 58DD 754D 5C63 A018 19F8"            /* \®ú‚x?XÝuM\c ..ø */
+        $"7EFE 8953 AE16 22B9 4ED7 43D2 8A0B FA52"            /* ~þ‰S®."¹N×CÒŠ.úR */
+        $"5703 08CA 555B E51E 307B 0565 E165 22F3"            /* W..ÊU[å.0{.eáe"ó */
+        $"7130 0CEC CA23 576D 8D58 BED1 FEB6 9A2F"            /* q0.ìÊ#Wm�X¾Ñþ¶š/ */
+        $"DCEA 3288 3EEC B12A D43C B191 2627 7723"            /* Üê2ˆ>ì±*Ô<±‘&'w# */
+        $"F40F 1B7A F1E3 9A7E 366D 7490 EE80 3570"            /* ô..zñãš~6mt�î€5p */
+        $"CB59 D05D F384 AA96 71FE 68E8 4D32 F9D2"            /* ËYÐ]󄪖qþhèM2ùÒ */
+        $"48BC 7B03 EA3B 879E 2E96 671F 8098 CE76"            /* H¼{.ê;‡ž.–g.€˜Îv */
+        $"87D8 0336 5C88 91F4 3C69 D76B 4DEF 29DA"            /* ‡Ø.6\ˆ‘ô<i×kMï)Ú */
+        $"F378 1035 720A CE61 C2E3 5776 CA53 F43B"            /* óx.5rÂÎaÂãWvÊSô; */
+        $"4FCB 79E4 5164 1270 A23E 6048 2089 7B12"            /* OËyäQd.p¢>`H ‰{. */
+        $"BCA8 E157 DFD5 E879 C14C 1B1A 3431 2856"            /* ¼¨áWßÕèyÁL..41(V */
+        $"0E74 D87F 7691 A923 632A 5EBC 6E95 6A46"            /* .tØ.v‘©#c*^¼n•jF */
+        $"8E68 7118 3704 6E41 37CB C9AC 7F84 1005"            /* Žhq.7.nA7Ëɬ.„.. */
+        $"C308 7C90 C6E0 B56C 8CF8 3C33 A97E C46C"            /* Ã.|�ÆàµlŒø<3©~Äl */
+        $"E373 91A9 4A3F 7331 481D 843F 0472 59DC"            /* ãs‘©J?s1H.„?.rYÜ */
+        $"0837 85BA 4867 C202 6BFC 7433 F093 530F"            /* .7…ºHgÂ.küt3ð“S. */
+        $"D721 8927 26CF AA6B B4E1 7981 FCE4 9F4E"            /* ×!‰'&Ϫk´áy�üäŸN */
+        $"1105 9E7B 7F68 1CE7 D811 E270 FCA3 9CDE"            /* ..ž{.h.çØ.âpü£œÞ */
+        $"BFE6 48BA AC07 B55E 4E7F 5946 115B B1DC"            /* ¿æHº¬.µ^N.YF.[±Ü */
+        $"F694 3A9B EADD 7971 E0F1 B6E1 C6FF 4337"            /* ö”:›êÝyqàñ¶áÆÿC7 */
+        $"F543 A074 FC74 AD1F 45BF 7867 C472 7605"            /* õC tüt­.E¿xgÄrv. */
+        $"1786 E496 2D22 22BE 5760 9ACE A5C9 22B9"            /* .†ä–-""¾W`šÎ¥É"¹ */
+        $"9A14 4136 93E4 3E4A 715C 6F69 8447 5764"            /* š.A6“ä>Jq\oi„GWd */
+        $"D761 77A8 2C3F E200 ACAD 8331 11D0 ABE6"            /* ×aw¨,?â.¬­ƒ1.Ыæ */
+        $"EA7B 5A22 58CF 097E 732F 894B E99C 6BAF"            /* ê{Z"XÏÆ~s/‰Kéœk¯ */
+        $"B36C 68AA 5668 EF92 66E9 DDF9 FF78 DB89"            /* ³lhªVhï’féÝùÿxÛ‰ */
+        $"FC78 2032 99D9 62F0 1380 3FE8 41DF F341"            /* üx 2™Ùbð.€?èAßóA */
+        $"F1FD 7F08 CE2E F09A 9335 6735 0FAD 8093"            /* ñý..Î.ðš“5g5.­€“ */
+        $"B6B1 53A2 964F EA7E 72A2 9A29 794D 98F0"            /* ¶±S¢–Oê~r¢š)yM˜ð */
+        $"DD57 AE65 C61E DDEC BDB4 35C2 D050 E063"            /* ÝW®eÆ.Ýì½´5ÂÐPàc */
+        $"5F54 BCA5 928D 786D CAE3 8F96 BFEB 027E"            /* _T¼¥’�xmÊã�–¿ë.~ */
+        $"6BBC 8795 7C88 1A2C 9908 36A1 6CAB 9268"            /* k¼‡•|ˆ.,™.6¡l«’h */
+        $"EB0D 816F F34D 55F5 B562 BCFF 4190 EE42"            /* ë.�oóMUõµb¼ÿA�îB */
+        $"F195 E7F3 E220 7E51 74A2 FA23 23F7 20F0"            /* ñ•çóâ ~Qt¢ú##÷ ð */
+        $"985F 011C 34B8 C988 C519 C623 81BC D026"            /* ˜_..4¸ÉˆÅ.Æ#�¼Ð& */
+        $"A8C5 B82C 7A7F 86F7 E60E 44F2 CD53 6FAB"            /* ¨Å¸,z.†÷æ.DòÍSo« */
+        $"2D69 1FD4 75B7 A011 80E7 09B3 B9CF 4503"            /* -i.Ôu· .€çƳ¹ÏE. */
+        $"F4A5 1DE3 AE8A 96F7 E245 0DF9 3859 24FA"            /* ô¥.㮊–÷âE.ù8Y$ú */
+        $"7B43 665F B15E D4D3 FB2A 666E FB6A 6CA8"            /* {Cf_±^ÔÓû*fnûjl¨ */
+        $"9CAF C052 D658 6DC3 BDD1 C752 21FA 6426"            /* œ¯ÀRÖXmýÑÇR!úd& */
+        $"857C D05D 41C2 0241 306C 6FD4 81E3 69F7"            /* …|Ð]AÂ.A0loÔ�ãi÷ */
+        $"A6F5 227F 39F9 780E 829A 17A9 C649 2BF5"            /* ¦õ".9ùx.‚š.©ÆI+õ */
+        $"01DD E500 A973 E599 890C A548 CE34 2877"            /* .Ýå.©s噉.¥HÎ4(w */
+        $"D160 A2EE 4B3B CC7A 0C87 6723 51FD C222"            /* Ñ`¢îK;Ìz.‡g#QýÂ" */
+        $"9BFB E72D 2769 6250 2054 22C9 ABB2 3125"            /* ›ûç-'ibP T"É«²1% */
+        $"7DA0 73A3 C083 1AAD 90F2 F0A8 C22D 9DF5"            /* } s£Àƒ.­�òð¨Â-�õ */
+        $"3FFB 6B56 18BE 61A6 B198 F1BC 1E4E 0CFE"            /* ?ûkV.¾a¦±˜ñ¼.N.þ */
+        $"B323 8275 A644 CAC4 D36B 9AF9 FCC8 5DEC"            /* ³#‚u¦DÊÄÓkšùüÈ]ì */
+        $"292B CC9B A0B6 9148 09DF E46D 1B2C 4EDF"            /* )+Ì› ¶‘HÆßäm.,Nß */
+        $"EDB9 2DB4 BAD5 C50B 2115 C476 E09A F407"            /* í¹-´ºÕÅ.!.Ävàšô. */
+        $"5EE8 2E9F 870F A319 32D4 EBEC CB7B FDE9"            /* ^è.Ÿ‡.£.2ÔëìË{ýé */
+        $"FB5C 0D41 61F3 BA97 0F9E 558F 6E39 C213"            /* û\.Aaóº—.žU�n9Â. */
+        $"3101 A5E8 ECEC 15E5 4F29 F69A 58CD D82D"            /* 1.¥èìì.åO)öšXÍØ- */
+        $"986E E8E0 6898 17CC 98C4 C851 AC75 9306"            /* ˜nèàh˜.̘ÄÈQ¬u“. */
+        $"5241 0350 E2EB 38CA 1682 6132 FF45 578A"            /* RA.Pâë8Ê.‚a2ÿEWŠ */
+        $"FA7F 7557 AC2C 9A18 3835 A62B 7D09 0992"            /* ú.uW¬,š.85¦+}ÆÆ’ */
+        $"EF78 BD49 5317 373A B07D 6420 DC30 5067"            /* ïx½IS.7:°}d Ü0Pg */
+        $"A659 F316 4436 8E8E 9786 1163 A6A5 B841"            /* ¦Yó.D6ŽŽ—†.c¦¥¸A */
+        $"99AA 4E1C 6163 309A 3C23 0208 FF4B 2967"            /* ™ªN.ac0š<#..ÿK)g */
+        $"B7F7 37E4 A337 D0DC C48A A742 FB2D C529"            /* ·÷7ä£7ÐÜÄŠ§Bû-Å) */
+        $"BC6C 5BBE BC5C 03B1 F87F D7EA F5AC B94B"            /* ¼l[¾¼\.±ø.×êõ¬¹K */
+        $"5A88 84AB E44E BE6A F337 96B0 7CB6 1140"            /* Zˆ„«äN¾jó7–°|¶.@ */
+        $"25CB 45D6 BE02 A9D4 7868 1EDD F660 7963"            /* %ËEÖ¾.©Ôxh.Ýö`yc */
+        $"B438 C030 3EA5 51FA F451 FA84 A6FF 2E5A"            /* ´8À0>¥QúôQú„¦ÿ.Z */
+        $"EA95 2300 C0F4 39AA 42BA 4120 4EEC AFDD"            /* ê•#.Àô9ªBºA Nì¯Ý */
+        $"20B4 6C42 0552 1177 6F1A AC6D FE8B 98E1"            /*  ´lB.R.wo.¬mþ‹˜á */
+        $"D3FB F52E BCE3 5BB1 7235 F597 3E0D 8C46"            /* Óûõ.¼ã[±r5õ—>.ŒF */
+        $"7361 1E2A C081 CA97 C8EA CD3F E91D 823F"            /* sa.*À�Ê—ÈêÍ?é.‚? */
+        $"73A7 5EA1 F641 9CBD 219D D7E4 EE0D 270E"            /* s§^¡öAœ½!�×äî.'. */
+        $"14DF F756 B4E5 062C 8251 4AD0 B090 A0AF"            /* .ß÷V´å.,‚QJа� ¯ */
+        $"CD2A 3C80 6068 C9CD C3D7 3D7F 258B 365A"            /* Í*<€`hÉÍÃ×=.%‹6Z */
+        $"5E1A 90DC D058 4ED9 DF50 6F40 07A9 2BDE"            /* ^.�ÜÐXNÙßPo@.©+Þ */
+        $"8486 5404 AB9C E323 0C4E D3DB 8352 0C0F"            /* „†T.«œã#.NÓÛƒR.. */
+        $"CD59 A5F5 56CC 0BB2 B603 85C3 C709 7D6E"            /* ÍY¥õVÌ.²¶.…ÃÇÆ}n */
+        $"A10E 33C2 AE0F D52F 5AD7 2279 E6EB 7E6C"            /* ¡.3®.Õ/Z×"yæë~l */
+        $"1757 589D C6DC B4FD 470C FFD9"                      /* .WX�ÆÜ´ýG.ÿÙ */
+};
+
diff --git a/linden/indra/newview/installers/darwin/firstlookslim-dmg/_DS_Store b/linden/indra/newview/installers/darwin/firstlookslim-dmg/_DS_Store
new file mode 100644
index 0000000..e170ac7
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/firstlookslim-dmg/_DS_Store
diff --git a/linden/indra/newview/installers/darwin/firstlookslim-dmg/_VolumeIcon.icns b/linden/indra/newview/installers/darwin/firstlookslim-dmg/_VolumeIcon.icns
new file mode 100644
index 0000000..da5307e
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/firstlookslim-dmg/_VolumeIcon.icns
diff --git a/linden/indra/newview/installers/darwin/firstlookslim-dmg/background.jpg b/linden/indra/newview/installers/darwin/firstlookslim-dmg/background.jpg
new file mode 100644
index 0000000..55294dc
--- /dev/null
+++ b/linden/indra/newview/installers/darwin/firstlookslim-dmg/background.jpg
diff --git a/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
index c73ba24..a8b7573 100644
--- a/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
+++ b/linden/indra/newview/installers/darwin/releasecandidate-dmg/_DS_Store
diff --git a/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt b/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
new file mode 100644
index 0000000..185c018
--- /dev/null
+++ b/linden/indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt
@@ -0,0 +1,6 @@
+The language files in this directory are Unicode (Little-Endian) format, also known as UTF-16 LE.

+

+This is the format required for NSIS Unicode.  See http://www.scratchpaper.com/ for details.

+

+James Cook

+September 2008

diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi
index 53c607c..c3573b5 100644
--- a/linden/indra/newview/installers/windows/installer_template.nsi
+++ b/linden/indra/newview/installers/windows/installer_template.nsi
@@ -1,990 +1,990 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; imprudence setup.nsi

-;; Copyright 2004-2007, Linden Research, Inc.

-;; For info, see http://www.nullsoft.com/free/nsis/

-;;

-;; NSIS 2.22 or higher required

-;; Author: James Cook, Don Kjer, Callum Prentice

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Detect NSIS compiler version

-!define "NSIS${NSIS_VERSION}"

-!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"

-    ;; before 2.07 defaulted lzma to solid (whole file)

-    SetCompressor lzma

-!else

-    ;; after 2.07 required /solid for whole file compression

-    SetCompressor /solid lzma

-!endif

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Compiler flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-SetOverwrite on                         ; overwrite files

-SetCompress auto                        ; compress iff saves space

-SetDatablockOptimize off        ; only saves us 0.1%, not worth it

-XPStyle on                  ; add an XP manifest to the installer

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Project flags

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

-%%VERSION%%

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; - language files - one for each language (or flavor thereof)

-;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 

-;; application directory so we have to add a path to these include files)

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-!include "%%SOURCE%%\installers\windows\lang_de.nsi"

-!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"

-!include "%%SOURCE%%\installers\windows\lang_ja.nsi"

-!include "%%SOURCE%%\installers\windows\lang_ko.nsi"

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)

-%%GRID_VARS%%

-

-Name ${INSTNAME}

-

-SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text

-

-BrandingText " "                                                ; bottom of window text

-Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon

-UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon

-WindowIcon on                                                   ; show our icon in left corner

-BGGradient off                                                  ; no big background window

-CRCCheck on                                                             ; make sure CRC is OK

-InstProgressFlags smooth colored                ; new colored smooth look

-ShowInstDetails nevershow                               ; no details, no "show" button

-SetOverwrite on                                                 ; stomp files by default

-AutoCloseWindow true                                    ; after all files install, close window

-

-InstallDir "$PROGRAMFILES\${INSTNAME}"

-InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""

-!ifdef UPDATE

-DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)

-!else

-DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

-!endif

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Variables

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Var INSTPROG

-Var INSTEXE

-Var INSTFLAGS

-Var LANGFLAGS

-Var INSTSHORTCUT

-

-;;; Function definitions should go before file includes, because the NSIS package

-;;; is a single stream of bytecodes + file data.  So if your function definitions are at

-;;; the end of the file it has to decompress the whole thing before it can call a function. JC

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; PostInstallExe

-; This just runs any post installation scripts.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function PostInstallExe

-push $0

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"

-  ;MessageBox MB_OK '$0'

-  ExecWait '$0'

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; CheckStartupParameters

-; Sets INSTFLAGS, INSTPROG, and INSTEXE.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckStartupParams

-push $0

-push $R0

-

-  ; Look for a registry entry with info about where to update.

-  Call GetProgramName

-  pop $R0

-  StrCpy $INSTPROG "$R0"

-  StrCpy $INSTEXE "$R0.exe"

-

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-  ; If key doesn't exist, skip install

-  IfErrors ABORT

-  StrCpy $INSTDIR "$0"

-

-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

-  IfErrors +2

-  StrCpy $INSTFLAGS "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

-  IfErrors +2

-  StrCpy $INSTSHORTCUT "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

-  IfErrors +2

-  StrCpy $INSTEXE "$0"

-  Goto FINISHED

-

-ABORT:

-  MessageBox MB_OK $(CheckStartupParamsMB)

-  Quit

-

-FINISHED:

-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

-pop $R0

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CheckStartupParams

-push $0

-push $R0

-

-  ; Look for a registry entry with info about where to update.

-  Call un.GetProgramName

-  pop $R0

-  StrCpy $INSTPROG "$R0"

-  StrCpy $INSTEXE "$R0.exe"

-

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-  ; If key doesn't exist, skip install

-  IfErrors ABORT

-  StrCpy $INSTDIR "$0"

-

-  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"

-  IfErrors +2

-  StrCpy $INSTFLAGS "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"

-  IfErrors +2

-  StrCpy $INSTSHORTCUT "$0"

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"

-  IfErrors +2

-  StrCpy $INSTEXE "$0"

-  Goto FINISHED

-

-ABORT:

-  MessageBox MB_OK $(CheckStartupParamsMB)

-  Quit

-

-FINISHED:

-  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"

-pop $R0

-pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; After install completes, offer readme file

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function .onInstSuccess

-        MessageBox MB_YESNO \

-        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme

-                ; Assumes SetOutPath $INSTDIR

-                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'

-        NoReadme:

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Remove old NSIS version. Modifies no variables.

-; Does NOT delete the LindenWorld directory, or any

-; user files in that directory.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveNSIS

-  Push $0

-  ; Grab the installation directory of the old version

-  DetailPrint $(RemoveOldNSISVersion)

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""

-

-  ; If key doesn't exist, skip uninstall

-  IfErrors NO_NSIS

-

-  ; Clean up legacy beta shortcuts

-  Delete "$SMPROGRAMS\Second Life Beta.lnk"

-  Delete "$DESKTOP\Second Life Beta.lnk"

-  Delete "$SMPROGRAMS\Second Life.lnk"

-  

-  ; Clean up old newview.exe file

-  Delete "$INSTDIR\newview.exe"

-

-  ; Intentionally don't delete the stuff in

-  ; Documents and Settings, so we keep the user's settings

-

-  NO_NSIS:

-  Pop $0

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Make sure we're not on Windows 98 / ME

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckWindowsVersion

-        DetailPrint "Checking Windows version..."

-        Call GetWindowsVersion

-        Pop $R0

-        ; Just get first two characters, ignore 4.0 part of "NT 4.0"

-        StrCpy $R0 $R0 2

-        ; Blacklist certain OS versions

-        StrCmp $R0 "95" win_ver_bad

-        StrCmp $R0 "98" win_ver_bad

-        StrCmp $R0 "ME" win_ver_bad

-        StrCmp $R0 "NT" win_ver_bad

-        Return

-win_ver_bad:

-        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort

-        Return

-win_ver_abort:

-        Quit

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Make sure the user can install/uninstall

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckIfAdministrator

-                DetailPrint $(CheckAdministratorInstDP)

-         UserInfo::GetAccountType

-         Pop $R0

-         StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK $(CheckAdministratorInstMB)

-         Quit

-is_admin:

-         Return

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CheckIfAdministrator

-        DetailPrint $(CheckAdministratorUnInstDP)

-         UserInfo::GetAccountType

-         Pop $R0

-         StrCmp $R0 "Admin" is_admin

-         MessageBox MB_OK $(CheckAdministratorUnInstMB)

-         Quit

-is_admin:

-         Return

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Checks to see if the current version has already been installed (according to the registry).

-; If it has, allow user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckIfAlreadyCurrent

-  Push $0

-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"

-    StrCmp $0 ${VERSION_LONG} 0 DONE

-        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE

-    Quit

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-        

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of install process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CloseSecondLife

-  Push $0

-  FindWindow $0 "Imprudence" ""

-  IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL

-

-  CANCEL_INSTALL:

-    Quit

-

-  CLOSE:

-    DetailPrint $(CloseSecondLifeInstDP)

-    SendMessage $0 16 0 0

-

-  LOOP:

-          FindWindow $0 "Imprudence" ""

-          IntCmp $0 0 DONE

-          Sleep 500

-          Goto LOOP

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Delete files in Documents and Settings\<user>\SecondLife\cache

-; Delete files in Documents and Settings\All Users\SecondLife\cache

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;Function RemoveCacheFiles

-;

-;; Delete files in Documents and Settings\<user>\SecondLife

-;Push $0

-;Push $1

-;Push $2

-;  DetailPrint $(RemoveCacheFilesDP)

-;

-;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-;

-;  LOOP:

-;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-;    StrCmp $1 "" DONE               ; no more users

-;

-;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-;

-;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-;    ExpandEnvStrings $2 $2

-;

-;       ; When explicitly uninstalling, everything goes away

-;    RMDir /r "$2\Application Data\SecondLife\cache"

-;

-;  CONTINUE:

-;    IntOp $0 $0 + 1

-;    Goto LOOP

-;  DONE:

-;Pop $2

-;Pop $1

-;Pop $0

-;

-;; Delete files in Documents and Settings\All Users\SecondLife

-;Push $0

-;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-;  StrCmp $0 "" +2

-;  RMDir /r "$0\SecondLife\cache"

-;Pop $0

-;

-;; Delete filse in C:\Windows\Application Data\SecondLife

-;; If the user is running on a pre-NT system, Application Data lives here instead of

-;; in Documents and Settings.

-;RMDir /r "$WINDIR\Application Data\SecondLife\cache"

-;

-;FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Delete the installed shader files

-;;; Since shaders are in active development, we'll likely need to shuffle them

-;;; around a bit from build to build.  This ensures that shaders that we move

-;;; or rename in the dev tree don't get left behind in the install.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveOldShaders

-

-;; Remove old shader files first so fallbacks will work. see DEV-5663

-RMDir /r "$INSTDIR\app_settings\shaders\*"

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Delete the installed XUI files

-;;; We've changed the directory hierarchy for skins, putting all XUI and texture

-;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed

-;;; to skins/xui/en-us.  Need to clean up the old path when upgrading

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveOldXUI

-

-;; remove old XUI and texture files

-RmDir /r "$INSTDIR\skins\html"

-RmDir /r "$INSTDIR\skins\xui"

-RmDir /r "$INSTDIR\skins\textures"

-Delete "$INSTDIR\skins\*.txt"

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Remove any releasenotes files.

-;;; We are no longer including release notes with the viewer. This will delete

-;;; any that were left behind by an older installer. Delete will not fail if

-;;; the files do not exist

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function RemoveOldReleaseNotes

-

-;; remove releasenotes.txt file from application directory, and the shortcut

-;; from the start menu.

-Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"

-Delete "$INSTDIR\releasenotes.txt"

-

-FunctionEnd

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Delete files in Documents and Settings\<user>\SecondLife

-; Delete files in Documents and Settings\All Users\SecondLife

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.DocumentsAndSettingsFolder

-

-; Delete files in Documents and Settings\<user>\SecondLife

-Push $0

-Push $1

-Push $2

-

-  DetailPrint "Deleting files in Documents and Settings folder"

-

-  StrCpy $0 0 ; Index number used to iterate via EnumRegKey

-

-  LOOP:

-    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

-    StrCmp $1 "" DONE               ; no more users

-

-    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

-    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing

-

-    ; Required since ProfileImagePath is of type REG_EXPAND_SZ

-    ExpandEnvStrings $2 $2

-

-        ; If uninstalling a normal install remove everything

-        ; Otherwise (preview/dmz etc) just remove cache

-    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE

-      RM_ALL:

-        RMDir /r "$2\Application Data\SecondLife"

-        GoTo CONTINUE

-      RM_CACHE:

-        RMDir /r "$2\Application Data\SecondLife\Cache"

-        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"

-

-  CONTINUE:

-    IntOp $0 $0 + 1

-    Goto LOOP

-  DONE:

-

-Pop $2

-Pop $1

-Pop $0

-

-; Delete files in Documents and Settings\All Users\SecondLife

-Push $0

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

-  StrCmp $0 "" +2

-  RMDir /r "$0\SecondLife"

-Pop $0

-

-; Delete filse in C:\Windows\Application Data\SecondLife

-; If the user is running on a pre-NT system, Application Data lives here instead of

-; in Documents and Settings.

-RMDir /r "$WINDIR\Application Data\SecondLife"

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Close the program, if running. Modifies no variables.

-; Allows user to bail out of uninstall process.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CloseSecondLife

-  Push $0

-  FindWindow $0 "Imprudence" ""

-  IntCmp $0 0 DONE

-  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL

-

-  CANCEL_UNINSTALL:

-    Quit

-

-  CLOSE:

-    DetailPrint $(CloseSecondLifeUnInstDP)

-    SendMessage $0 16 0 0

-

-  LOOP:

-          FindWindow $0 "Imprudence" ""

-          IntCmp $0 0 DONE

-          Sleep 500

-          Goto LOOP

-

-  DONE:

-    Pop $0

-    Return

-FunctionEnd

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;

-;   Delete the stored password for the current Windows user

-;   DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled

-;

-Function un.RemovePassword

-

-DetailPrint "Removing Second Life password"

-

-SetShellVarContext current

-Delete "$APPDATA\SecondLife\user_settings\password.dat"

-SetShellVarContext all

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Delete the installed files

-;;; This deletes the uninstall executable, but it works 

-;;; because it is copied to temp directory before running

-;;;

-;;; Note:  You must list all files here, because we only

-;;; want to delete our files, not things users left in the

-;;; application directories.

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.ProgramFiles

-

-;; Remove mozilla file first so recursive directory deletion doesn't get hung up

-Delete "$INSTDIR\app_settings\mozilla\components"

-

-;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py

-%%DELETE_FILES%%

-

-;; Optional/obsolete files.  Delete won't fail if they don't exist.

-Delete "$INSTDIR\dronesettings.ini"

-Delete "$INSTDIR\message_template.msg"

-Delete "$INSTDIR\newview.pdb"

-Delete "$INSTDIR\newview.map"

-Delete "$INSTDIR\SecondLife.pdb"

-Delete "$INSTDIR\SecondLife.map"

-Delete "$INSTDIR\comm.dat"

-Delete "$INSTDIR\*.glsl"

-Delete "$INSTDIR\motions\*.lla"

-Delete "$INSTDIR\trial\*.html"

-Delete "$INSTDIR\newview.exe"

-;; Remove entire help directory

-Delete "$INSTDIR\help\Advanced\*"

-RMDir  "$INSTDIR\help\Advanced"

-Delete "$INSTDIR\help\basics\*"

-RMDir  "$INSTDIR\help\basics"

-Delete "$INSTDIR\help\Concepts\*"

-RMDir  "$INSTDIR\help\Concepts"

-Delete "$INSTDIR\help\welcome\*"

-RMDir  "$INSTDIR\help\welcome"

-Delete "$INSTDIR\help\*"

-RMDir  "$INSTDIR\help"

-

-Delete "$INSTDIR\uninst.exe"

-RMDir "$INSTDIR"

-

-IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER

-

-FOLDERFOUND:

-  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER

-  RMDir /r "$INSTDIR"

-

-NOFOLDER:

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Uninstall settings

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-UninstallText $(UninstallTextMsg)

-ShowUninstDetails show

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Uninstall section

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Section Uninstall

-

-; Start with some default values.

-StrCpy $INSTFLAGS ""

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.

-Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall

-

-; uninstall for all users (if you change this, change it in the install as well)

-SetShellVarContext all                  

-

-; Make sure we're not running

-Call un.CloseSecondLife

-

-; Clean up registry keys (these should all be !defines somewhere)

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 

-

-; Clean up shortcuts

-Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"

-RMDir  "$SMPROGRAMS\$INSTSHORTCUT"

-

-Delete "$DESKTOP\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\$INSTSHORTCUT.lnk"

-Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"

-

-; Clean up cache and log files.

-; Leave them in-place for non AGNI installs.

-

-!ifdef UNINSTALL_SETTINGS

-Call un.DocumentsAndSettingsFolder

-!endif

-

-; remove stored password on uninstall

-Call un.RemovePassword

-

-Call un.ProgramFiles

-

-SectionEnd                              ; end of uninstall section

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; (From the NSIS wiki, DK)

-; GetParameterValue

-;

-; Usage:

-; !insertmacro GetParameterValue "/L=" "1033"

-; pop $R0

-;

-; Returns on top of stack

-;

-; Example command lines:

-; foo.exe /S /L=1033 /D=C:\Program Files\Foo

-; or:

-; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"

-; gpv "/L=" "1033"

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-

- !macro GetParameterValue SWITCH DEFAULT

-   Push $0

-   Push $1

-   Push $2

-   Push $3

-   Push $4

-

- ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'

-   Push "$CMDLINE"

-   Push '${SWITCH}"'

-   !insertmacro StrStr

-   Pop $0

-   StrCmp "$0" "" gpv_notquoted

- ;$0='/L="1033" /S'

-   StrLen $2 "$0"

-   Strlen $1 "${SWITCH}"

-   IntOp $1 $1 + 1

-   StrCpy $0 "$0" $2 $1

- ;$0='1033" /S'

-   Push "$0"

-   Push '"'

-   !insertmacro StrStr

-   Pop $1

-   StrLen $2 "$0"

-   StrLen $3 "$1"

-   IntOp $4 $2 - $3

-   StrCpy $0 $0 $4 0

-   Goto gpv_done

-

-   gpv_notquoted:

-   Push "$CMDLINE"

-   Push "${SWITCH}"

-   !insertmacro StrStr

-   Pop $0

-   StrCmp "$0" "" gpv_done

- ;$0='/L="1033" /S'

-   StrLen $2 "$0"

-   Strlen $1 "${SWITCH}"

-   StrCpy $0 "$0" $2 $1

- ;$0=1033 /S'

-   Push "$0"

-   Push ' '

-   !insertmacro StrStr

-   Pop $1

-   StrLen $2 "$0"

-   StrLen $3 "$1"

-   IntOp $4 $2 - $3

-   StrCpy $0 $0 $4 0

-   Goto gpv_done

-

-   gpv_done:

-   StrCmp "$0" "" 0 +2

-   StrCpy $0 "${DEFAULT}"

-

-   Pop $4

-   Pop $3

-   Pop $2

-   Pop $1

-   Exch $0

- !macroend

-

-; And I had to modify StrStr a tiny bit.

-; Possible upgrade switch the goto's to use ${__LINE__}

-

-!macro STRSTR

-  Exch $R1 ; st=haystack,old$R1, $R1=needle

-  Exch    ; st=old$R1,haystack

-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack

-  Push $R3

-  Push $R4

-  Push $R5

-  StrLen $R3 $R1

-  StrCpy $R4 0

-  ; $R1=needle

-  ; $R2=haystack

-  ; $R3=len(needle)

-  ; $R4=cnt

-  ; $R5=tmp

- ;  loop;

-    StrCpy $R5 $R2 $R3 $R4

-    StrCmp $R5 $R1 +4

-    StrCmp $R5 "" +3

-    IntOp $R4 $R4 + 1

-    Goto -4

- ;  done;

-  StrCpy $R1 $R2 "" $R4

-  Pop $R5

-  Pop $R4

-  Pop $R3

-  Pop $R2

-  Exch $R1

-!macroend

-

-Function GetProgramName

-  !insertmacro GetParameterValue "/P=" "Imprudence"

-FunctionEnd

-

-Function un.GetProgramName

-  !insertmacro GetParameterValue "/P=" "Imprudence"

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; (From the NSIS documentation, JC)

-; GetWindowsVersion

-;

-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/

-; Updated by Joost Verburg

-;

-; Returns on top of stack

-;

-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)

-; or

-; '' (Unknown Windows Version)

-;

-; Usage:

-;   Call GetWindowsVersion

-;   Pop $R0

-;   ; at this point $R0 is "NT 4.0" or whatnot

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function GetWindowsVersion

- 

-   Push $R0

-   Push $R1

- 

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion

-

-   IfErrors 0 lbl_winnt

-   

-   ; we are not NT

-   ReadRegStr $R0 HKLM \

-   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber

- 

-   StrCpy $R1 $R0 1

-   StrCmp $R1 '4' 0 lbl_error

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '4.0' lbl_win32_95

-   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98

- 

-   lbl_win32_95:

-     StrCpy $R0 '95'

-   Goto lbl_done

- 

-   lbl_win32_98:

-     StrCpy $R0 '98'

-   Goto lbl_done

- 

-   lbl_win32_ME:

-     StrCpy $R0 'ME'

-   Goto lbl_done

- 

-   lbl_winnt:

- 

-   StrCpy $R1 $R0 1

- 

-   StrCmp $R1 '3' lbl_winnt_x

-   StrCmp $R1 '4' lbl_winnt_x

- 

-   StrCpy $R1 $R0 3

- 

-   StrCmp $R1 '5.0' lbl_winnt_2000

-   StrCmp $R1 '5.1' lbl_winnt_XP

-   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error

- 

-   lbl_winnt_x:

-     StrCpy $R0 "NT $R0" 6

-   Goto lbl_done

- 

-   lbl_winnt_2000:

-     Strcpy $R0 '2000'

-   Goto lbl_done

- 

-   lbl_winnt_XP:

-     Strcpy $R0 'XP'

-   Goto lbl_done

- 

-   lbl_winnt_2003:

-     Strcpy $R0 '2003'

-   Goto lbl_done

- 

-   lbl_error:

-     Strcpy $R0 ''

-   lbl_done:

- 

-   Pop $R1

-   Exch $R0

- 

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;  Note: to add new languages, add a language file include to the list 

-;;  at the top of this file, add an entry to the menu and then add an 

-;;  entry to the language ID selector below

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function .onInit

-

-        ; read the language from registry (ok if not there) and set langauge menu

-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

-        StrCpy $LANGUAGE $0

-

-        Push ""

-        Push ${LANG_ENGLISH}

-        Push English

-        Push ${LANG_GERMAN}

-        Push German

-        Push ${LANG_JAPANESE}

-        Push Japanese

-        Push ${LANG_KOREAN}

-        Push Korean

-        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain

-        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"

-        Pop $LANGUAGE

-        StrCmp $LANGUAGE "cancel" 0 +2

-                Abort

-

-        ; save language in registry             

-        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.onInit

-

-        ; read language from registry and set for ininstaller

-        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

-        StrCpy $LANGUAGE $0

-

-FunctionEnd

-

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Sections

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Section ""                                              ; (default section)

-

-SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)

-

-; Start with some default values.

-StrCpy $INSTFLAGS "${INSTFLAGS}"

-StrCpy $INSTPROG "${INSTNAME}"

-StrCpy $INSTEXE "${INSTEXE}"

-StrCpy $INSTSHORTCUT "${SHORTCUT}"

-

-IfSilent +2

-Goto NOT_SILENT

-  Call CheckStartupParams                 ; Figure out where, what and how to install.

-NOT_SILENT:

-Call CheckWindowsVersion                ; warn if on Windows 98/ME

-Call CheckIfAdministrator               ; Make sure the user can install/uninstall

-Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version

-Call CloseSecondLife                    ; Make sure we're not running

-Call RemoveNSIS                                 ; Check for old NSIS install to remove

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.

-;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted

-                                                                ; VFS and cache files.

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Need to clean out shader files from previous installs to fix DEV-5663

-Call RemoveOldShaders

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Need to clean out old XUI files that predate skinning

-Call RemoveOldXUI

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Clear out old releasenotes.txt files. These are now on the public wiki.

-Call RemoveOldReleaseNotes

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;;; Files

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py

-%%INSTALL_FILES%%

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; If this is a silent update, we don't need to re-create these shortcuts or registry entries.

-IfSilent POST_INSTALL

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Shortcuts in start menu

-CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"

-SetOutPath "$INSTDIR"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-

-!ifdef MUSEUM

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \

-

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \

-

-                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-!endif

-

-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \

-                                "InternetShortcut" "URL" \

-                                "http://www.secondlife.com/registration/"

-WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \

-                                "InternetShortcut" "URL" \

-                                "http://www.secondlife.com/account/"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \

-                                "$INSTDIR\lsl_guide.html"

-CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \

-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Other shortcuts

-SetOutPath "$INSTDIR"

-CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"

-CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \

-                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'

-

-!ifdef MUSEUM

-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-

-CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-

-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"

-

-CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"

-

-!endif

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Write registry

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-; Write URL registry info

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""

-WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'

-WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'

-

-Goto WRITE_UNINST

-

-POST_INSTALL:

-; Run a post-executable script if necessary.

-Call PostInstallExe

-

-WRITE_UNINST:

-; write out uninstaller

-WriteUninstaller "$INSTDIR\uninst.exe"

-

-; end of default section

-SectionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; imprudence setup.nsi
+;; Copyright 2004-2007, Linden Research, Inc.
+;; For info, see http://www.nullsoft.com/free/nsis/
+;;
+;; NSIS 2.22 or higher required
+;; Author: James Cook, Don Kjer, Callum Prentice
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Detect NSIS compiler version
+!define "NSIS${NSIS_VERSION}"
+!ifdef "NSISv2.02" | "NSISv2.03" | "NSISv2.04" | "NSISv2.05" | "NSISv2.06"
+    ;; before 2.07 defaulted lzma to solid (whole file)
+    SetCompressor lzma
+!else
+    ;; after 2.07 required /solid for whole file compression
+    SetCompressor /solid lzma
+!endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Compiler flags
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+SetOverwrite on                         ; overwrite files
+SetCompress auto                        ; compress iff saves space
+SetDatablockOptimize off        ; only saves us 0.1%, not worth it
+XPStyle on                  ; add an XP manifest to the installer
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Project flags
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+%%VERSION%%
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; - language files - one for each language (or flavor thereof)
+;; (these files are in the same place as the nsi template but the python script generates a new nsi file in the 
+;; application directory so we have to add a path to these include files)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+!include "%%SOURCE%%\installers\windows\lang_de.nsi"
+!include "%%SOURCE%%\installers\windows\lang_en-us.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ja.nsi"
+!include "%%SOURCE%%\installers\windows\lang_ko.nsi"
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Tweak for different servers/builds (this placeholder is replaced by viewer_manifest.py)
+%%GRID_VARS%%
+
+Name ${INSTNAME}
+
+SubCaption 0 $(LicenseSubTitleSetup)    ; override "license agreement" text
+
+BrandingText " "                                                ; bottom of window text
+Icon %%SOURCE%%\res\install_icon.ico    ; our custom icon
+UninstallIcon %%SOURCE%%\res\uninstall_icon.ico    ; our custom icon
+WindowIcon on                                                   ; show our icon in left corner
+BGGradient off                                                  ; no big background window
+CRCCheck on                                                             ; make sure CRC is OK
+InstProgressFlags smooth colored                ; new colored smooth look
+ShowInstDetails nevershow                               ; no details, no "show" button
+SetOverwrite on                                                 ; stomp files by default
+AutoCloseWindow true                                    ; after all files install, close window
+
+InstallDir "$PROGRAMFILES\${INSTNAME}"
+InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
+!ifdef UPDATE
+DirText $(DirectoryChooseTitle) $(DirectoryChooseUpdate)
+!else
+DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
+!endif
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Variables
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Var INSTPROG
+Var INSTEXE
+Var INSTFLAGS
+Var LANGFLAGS
+Var INSTSHORTCUT
+
+;;; Function definitions should go before file includes, because the NSIS package
+;;; is a single stream of bytecodes + file data.  So if your function definitions are at
+;;; the end of the file it has to decompress the whole thing before it can call a function. JC
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; PostInstallExe
+; This just runs any post installation scripts.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function PostInstallExe
+push $0
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "PostInstallExe"
+  ;MessageBox MB_OK '$0'
+  ExecWait '$0'
+pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; CheckStartupParameters
+; Sets INSTFLAGS, INSTPROG, and INSTEXE.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckStartupParams
+push $0
+push $R0
+
+  ; Look for a registry entry with info about where to update.
+  Call GetProgramName
+  pop $R0
+  StrCpy $INSTPROG "$R0"
+  StrCpy $INSTEXE "$R0.exe"
+
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+  ; If key doesn't exist, skip install
+  IfErrors ABORT
+  StrCpy $INSTDIR "$0"
+
+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
+  IfErrors +2
+  StrCpy $INSTFLAGS "$0"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
+  IfErrors +2
+  StrCpy $INSTSHORTCUT "$0"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
+  IfErrors +2
+  StrCpy $INSTEXE "$0"
+  Goto FINISHED
+
+ABORT:
+  MessageBox MB_OK $(CheckStartupParamsMB)
+  Quit
+
+FINISHED:
+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
+pop $R0
+pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.CheckStartupParams
+push $0
+push $R0
+
+  ; Look for a registry entry with info about where to update.
+  Call un.GetProgramName
+  pop $R0
+  StrCpy $INSTPROG "$R0"
+  StrCpy $INSTEXE "$R0.exe"
+
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+  ; If key doesn't exist, skip install
+  IfErrors ABORT
+  StrCpy $INSTDIR "$0"
+
+  ; We now have a directory to install to.  Get the startup parameters and shortcut as well.
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags"
+  IfErrors +2
+  StrCpy $INSTFLAGS "$0"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut"
+  IfErrors +2
+  StrCpy $INSTSHORTCUT "$0"
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe"
+  IfErrors +2
+  StrCpy $INSTEXE "$0"
+  Goto FINISHED
+
+ABORT:
+  MessageBox MB_OK $(CheckStartupParamsMB)
+  Quit
+
+FINISHED:
+  ;MessageBox MB_OK "INSTPROG: $INSTPROG, INSTEXE: $INSTEXE, INSTFLAGS: $INSTFLAGS"
+pop $R0
+pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; After install completes, offer readme file
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function .onInstSuccess
+        MessageBox MB_YESNO \
+        $(InstSuccesssQuestion) /SD IDYES IDNO NoReadme
+                ; Assumes SetOutPath $INSTDIR
+                Exec '"$INSTDIR\$INSTEXE" $INSTFLAGS'
+        NoReadme:
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Remove old NSIS version. Modifies no variables.
+; Does NOT delete the LindenWorld directory, or any
+; user files in that directory.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveNSIS
+  Push $0
+  ; Grab the installation directory of the old version
+  DetailPrint $(RemoveOldNSISVersion)
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" ""
+
+  ; If key doesn't exist, skip uninstall
+  IfErrors NO_NSIS
+
+  ; Clean up legacy beta shortcuts
+  Delete "$SMPROGRAMS\Second Life Beta.lnk"
+  Delete "$DESKTOP\Second Life Beta.lnk"
+  Delete "$SMPROGRAMS\Second Life.lnk"
+  
+  ; Clean up old newview.exe file
+  Delete "$INSTDIR\newview.exe"
+
+  ; Intentionally don't delete the stuff in
+  ; Documents and Settings, so we keep the user's settings
+
+  NO_NSIS:
+  Pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Make sure we're not on Windows 98 / ME
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckWindowsVersion
+        DetailPrint "Checking Windows version..."
+        Call GetWindowsVersion
+        Pop $R0
+        ; Just get first two characters, ignore 4.0 part of "NT 4.0"
+        StrCpy $R0 $R0 2
+        ; Blacklist certain OS versions
+        StrCmp $R0 "95" win_ver_bad
+        StrCmp $R0 "98" win_ver_bad
+        StrCmp $R0 "ME" win_ver_bad
+        StrCmp $R0 "NT" win_ver_bad
+        Return
+win_ver_bad:
+        MessageBox MB_YESNO $(CheckWindowsVersionMB) IDNO win_ver_abort
+        Return
+win_ver_abort:
+        Quit
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Make sure the user can install/uninstall
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckIfAdministrator
+                DetailPrint $(CheckAdministratorInstDP)
+         UserInfo::GetAccountType
+         Pop $R0
+         StrCmp $R0 "Admin" is_admin
+         MessageBox MB_OK $(CheckAdministratorInstMB)
+         Quit
+is_admin:
+         Return
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.CheckIfAdministrator
+        DetailPrint $(CheckAdministratorUnInstDP)
+         UserInfo::GetAccountType
+         Pop $R0
+         StrCmp $R0 "Admin" is_admin
+         MessageBox MB_OK $(CheckAdministratorUnInstMB)
+         Quit
+is_admin:
+         Return
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Checks to see if the current version has already been installed (according to the registry).
+; If it has, allow user to bail out of install process.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CheckIfAlreadyCurrent
+  Push $0
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version"
+    StrCmp $0 ${VERSION_LONG} 0 DONE
+        MessageBox MB_OKCANCEL $(CheckIfCurrentMB) /SD IDOK IDOK DONE
+    Quit
+
+  DONE:
+    Pop $0
+    Return
+FunctionEnd
+        
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Close the program, if running. Modifies no variables.
+; Allows user to bail out of install process.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function CloseSecondLife
+  Push $0
+  FindWindow $0 "Imprudence" ""
+  IntCmp $0 0 DONE
+  MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL
+
+  CANCEL_INSTALL:
+    Quit
+
+  CLOSE:
+    DetailPrint $(CloseSecondLifeInstDP)
+    SendMessage $0 16 0 0
+
+  LOOP:
+          FindWindow $0 "Imprudence" ""
+          IntCmp $0 0 DONE
+          Sleep 500
+          Goto LOOP
+
+  DONE:
+    Pop $0
+    Return
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete files in Documents and Settings\<user>\SecondLife\cache
+; Delete files in Documents and Settings\All Users\SecondLife\cache
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;Function RemoveCacheFiles
+;
+;; Delete files in Documents and Settings\<user>\SecondLife
+;Push $0
+;Push $1
+;Push $2
+;  DetailPrint $(RemoveCacheFilesDP)
+;
+;  StrCpy $0 0 ; Index number used to iterate via EnumRegKey
+;
+;  LOOP:
+;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0
+;    StrCmp $1 "" DONE               ; no more users
+;
+;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 
+;    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing
+;
+;    ; Required since ProfileImagePath is of type REG_EXPAND_SZ
+;    ExpandEnvStrings $2 $2
+;
+;       ; When explicitly uninstalling, everything goes away
+;    RMDir /r "$2\Application Data\SecondLife\cache"
+;
+;  CONTINUE:
+;    IntOp $0 $0 + 1
+;    Goto LOOP
+;  DONE:
+;Pop $2
+;Pop $1
+;Pop $0
+;
+;; Delete files in Documents and Settings\All Users\SecondLife
+;Push $0
+;  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
+;  StrCmp $0 "" +2
+;  RMDir /r "$0\SecondLife\cache"
+;Pop $0
+;
+;; Delete filse in C:\Windows\Application Data\SecondLife
+;; If the user is running on a pre-NT system, Application Data lives here instead of
+;; in Documents and Settings.
+;RMDir /r "$WINDIR\Application Data\SecondLife\cache"
+;
+;FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Delete the installed shader files
+;;; Since shaders are in active development, we'll likely need to shuffle them
+;;; around a bit from build to build.  This ensures that shaders that we move
+;;; or rename in the dev tree don't get left behind in the install.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveOldShaders
+
+;; Remove old shader files first so fallbacks will work. see DEV-5663
+RMDir /r "$INSTDIR\app_settings\shaders\*"
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Delete the installed XUI files
+;;; We've changed the directory hierarchy for skins, putting all XUI and texture
+;;; files under a specific skin directory, i.e. skins/default/xui/en-us as opposed
+;;; to skins/xui/en-us.  Need to clean up the old path when upgrading
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveOldXUI
+
+;; remove old XUI and texture files
+RmDir /r "$INSTDIR\skins\html"
+RmDir /r "$INSTDIR\skins\xui"
+RmDir /r "$INSTDIR\skins\textures"
+Delete "$INSTDIR\skins\*.txt"
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Remove any releasenotes files.
+;;; We are no longer including release notes with the viewer. This will delete
+;;; any that were left behind by an older installer. Delete will not fail if
+;;; the files do not exist
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function RemoveOldReleaseNotes
+
+;; remove releasenotes.txt file from application directory, and the shortcut
+;; from the start menu.
+Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
+Delete "$INSTDIR\releasenotes.txt"
+
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Delete files in Documents and Settings\<user>\SecondLife
+; Delete files in Documents and Settings\All Users\SecondLife
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.DocumentsAndSettingsFolder
+
+; Delete files in Documents and Settings\<user>\SecondLife
+Push $0
+Push $1
+Push $2
+
+  DetailPrint "Deleting files in Documents and Settings folder"
+
+  StrCpy $0 0 ; Index number used to iterate via EnumRegKey
+
+  LOOP:
+    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0
+    StrCmp $1 "" DONE               ; no more users
+
+    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 
+    StrCmp $2 "" CONTINUE 0         ; "ProfileImagePath" value is missing
+
+    ; Required since ProfileImagePath is of type REG_EXPAND_SZ
+    ExpandEnvStrings $2 $2
+
+        ; If uninstalling a normal install remove everything
+        ; Otherwise (preview/dmz etc) just remove cache
+    StrCmp $INSTFLAGS "" RM_ALL RM_CACHE
+      RM_ALL:
+        RMDir /r "$2\Application Data\SecondLife"
+        GoTo CONTINUE
+      RM_CACHE:
+        RMDir /r "$2\Application Data\SecondLife\Cache"
+        Delete "$2\Application Data\SecondLife\user_settings\settings_windlight.xml"
+
+  CONTINUE:
+    IntOp $0 $0 + 1
+    Goto LOOP
+  DONE:
+
+Pop $2
+Pop $1
+Pop $0
+
+; Delete files in Documents and Settings\All Users\SecondLife
+Push $0
+  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"
+  StrCmp $0 "" +2
+  RMDir /r "$0\SecondLife"
+Pop $0
+
+; Delete filse in C:\Windows\Application Data\SecondLife
+; If the user is running on a pre-NT system, Application Data lives here instead of
+; in Documents and Settings.
+RMDir /r "$WINDIR\Application Data\SecondLife"
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Close the program, if running. Modifies no variables.
+; Allows user to bail out of uninstall process.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.CloseSecondLife
+  Push $0
+  FindWindow $0 "Imprudence" ""
+  IntCmp $0 0 DONE
+  MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL
+
+  CANCEL_UNINSTALL:
+    Quit
+
+  CLOSE:
+    DetailPrint $(CloseSecondLifeUnInstDP)
+    SendMessage $0 16 0 0
+
+  LOOP:
+          FindWindow $0 "Imprudence" ""
+          IntCmp $0 0 DONE
+          Sleep 500
+          Goto LOOP
+
+  DONE:
+    Pop $0
+    Return
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+;   Delete the stored password for the current Windows user
+;   DEV-10821 -- Unauthorised user can gain access to an SL account after a real user has uninstalled
+;
+Function un.RemovePassword
+
+DetailPrint "Removing Second Life password"
+
+SetShellVarContext current
+Delete "$APPDATA\SecondLife\user_settings\password.dat"
+SetShellVarContext all
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Delete the installed files
+;;; This deletes the uninstall executable, but it works 
+;;; because it is copied to temp directory before running
+;;;
+;;; Note:  You must list all files here, because we only
+;;; want to delete our files, not things users left in the
+;;; application directories.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.ProgramFiles
+
+;; Remove mozilla file first so recursive directory deletion doesn't get hung up
+Delete "$INSTDIR\app_settings\mozilla\components"
+
+;; This placeholder is replaced by the complete list of files to uninstall by viewer_manifest.py
+%%DELETE_FILES%%
+
+;; Optional/obsolete files.  Delete won't fail if they don't exist.
+Delete "$INSTDIR\dronesettings.ini"
+Delete "$INSTDIR\message_template.msg"
+Delete "$INSTDIR\newview.pdb"
+Delete "$INSTDIR\newview.map"
+Delete "$INSTDIR\SecondLife.pdb"
+Delete "$INSTDIR\SecondLife.map"
+Delete "$INSTDIR\comm.dat"
+Delete "$INSTDIR\*.glsl"
+Delete "$INSTDIR\motions\*.lla"
+Delete "$INSTDIR\trial\*.html"
+Delete "$INSTDIR\newview.exe"
+;; Remove entire help directory
+Delete "$INSTDIR\help\Advanced\*"
+RMDir  "$INSTDIR\help\Advanced"
+Delete "$INSTDIR\help\basics\*"
+RMDir  "$INSTDIR\help\basics"
+Delete "$INSTDIR\help\Concepts\*"
+RMDir  "$INSTDIR\help\Concepts"
+Delete "$INSTDIR\help\welcome\*"
+RMDir  "$INSTDIR\help\welcome"
+Delete "$INSTDIR\help\*"
+RMDir  "$INSTDIR\help"
+
+Delete "$INSTDIR\uninst.exe"
+RMDir "$INSTDIR"
+
+IfFileExists "$INSTDIR" FOLDERFOUND NOFOLDER
+
+FOLDERFOUND:
+  MessageBox MB_YESNO $(DeleteProgramFilesMB) IDNO NOFOLDER
+  RMDir /r "$INSTDIR"
+
+NOFOLDER:
+
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Uninstall settings
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+UninstallText $(UninstallTextMsg)
+ShowUninstDetails show
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Uninstall section
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Section Uninstall
+
+; Start with some default values.
+StrCpy $INSTFLAGS ""
+StrCpy $INSTPROG "${INSTNAME}"
+StrCpy $INSTEXE "${INSTEXE}"
+StrCpy $INSTSHORTCUT "${SHORTCUT}"
+Call un.CheckStartupParams              ; Figure out where, what and how to uninstall.
+Call un.CheckIfAdministrator            ; Make sure the user can install/uninstall
+
+; uninstall for all users (if you change this, change it in the install as well)
+SetShellVarContext all                  
+
+; Make sure we're not running
+Call un.CloseSecondLife
+
+; Clean up registry keys (these should all be !defines somewhere)
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"
+DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"
+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Linden Research, Inc.\Installer Language" 
+
+; Clean up shortcuts
+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
+RMDir  "$SMPROGRAMS\$INSTSHORTCUT"
+
+Delete "$DESKTOP\$INSTSHORTCUT.lnk"
+Delete "$INSTDIR\$INSTSHORTCUT.lnk"
+Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"
+
+; Clean up cache and log files.
+; Leave them in-place for non AGNI installs.
+
+!ifdef UNINSTALL_SETTINGS
+Call un.DocumentsAndSettingsFolder
+!endif
+
+; remove stored password on uninstall
+Call un.RemovePassword
+
+Call un.ProgramFiles
+
+SectionEnd                              ; end of uninstall section
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; (From the NSIS wiki, DK)
+; GetParameterValue
+;
+; Usage:
+; !insertmacro GetParameterValue "/L=" "1033"
+; pop $R0
+;
+; Returns on top of stack
+;
+; Example command lines:
+; foo.exe /S /L=1033 /D=C:\Program Files\Foo
+; or:
+; foo.exe /S "/L=1033" /D="C:\Program Files\Foo"
+; gpv "/L=" "1033"
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+ !macro GetParameterValue SWITCH DEFAULT
+   Push $0
+   Push $1
+   Push $2
+   Push $3
+   Push $4
+
+ ;$CMDLINE='"My Setup\Setup.exe" /L=1033 /S'
+   Push "$CMDLINE"
+   Push '${SWITCH}"'
+   !insertmacro StrStr
+   Pop $0
+   StrCmp "$0" "" gpv_notquoted
+ ;$0='/L="1033" /S'
+   StrLen $2 "$0"
+   Strlen $1 "${SWITCH}"
+   IntOp $1 $1 + 1
+   StrCpy $0 "$0" $2 $1
+ ;$0='1033" /S'
+   Push "$0"
+   Push '"'
+   !insertmacro StrStr
+   Pop $1
+   StrLen $2 "$0"
+   StrLen $3 "$1"
+   IntOp $4 $2 - $3
+   StrCpy $0 $0 $4 0
+   Goto gpv_done
+
+   gpv_notquoted:
+   Push "$CMDLINE"
+   Push "${SWITCH}"
+   !insertmacro StrStr
+   Pop $0
+   StrCmp "$0" "" gpv_done
+ ;$0='/L="1033" /S'
+   StrLen $2 "$0"
+   Strlen $1 "${SWITCH}"
+   StrCpy $0 "$0" $2 $1
+ ;$0=1033 /S'
+   Push "$0"
+   Push ' '
+   !insertmacro StrStr
+   Pop $1
+   StrLen $2 "$0"
+   StrLen $3 "$1"
+   IntOp $4 $2 - $3
+   StrCpy $0 $0 $4 0
+   Goto gpv_done
+
+   gpv_done:
+   StrCmp "$0" "" 0 +2
+   StrCpy $0 "${DEFAULT}"
+
+   Pop $4
+   Pop $3
+   Pop $2
+   Pop $1
+   Exch $0
+ !macroend
+
+; And I had to modify StrStr a tiny bit.
+; Possible upgrade switch the goto's to use ${__LINE__}
+
+!macro STRSTR
+  Exch $R1 ; st=haystack,old$R1, $R1=needle
+  Exch    ; st=old$R1,haystack
+  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+  Push $R3
+  Push $R4
+  Push $R5
+  StrLen $R3 $R1
+  StrCpy $R4 0
+  ; $R1=needle
+  ; $R2=haystack
+  ; $R3=len(needle)
+  ; $R4=cnt
+  ; $R5=tmp
+ ;  loop;
+    StrCpy $R5 $R2 $R3 $R4
+    StrCmp $R5 $R1 +4
+    StrCmp $R5 "" +3
+    IntOp $R4 $R4 + 1
+    Goto -4
+ ;  done;
+  StrCpy $R1 $R2 "" $R4
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Exch $R1
+!macroend
+
+Function GetProgramName
+  !insertmacro GetParameterValue "/P=" "Imprudence"
+FunctionEnd
+
+Function un.GetProgramName
+  !insertmacro GetParameterValue "/P=" "Imprudence"
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; (From the NSIS documentation, JC)
+; GetWindowsVersion
+;
+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
+; Updated by Joost Verburg
+;
+; Returns on top of stack
+;
+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003)
+; or
+; '' (Unknown Windows Version)
+;
+; Usage:
+;   Call GetWindowsVersion
+;   Pop $R0
+;   ; at this point $R0 is "NT 4.0" or whatnot
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function GetWindowsVersion
+ 
+   Push $R0
+   Push $R1
+ 
+   ReadRegStr $R0 HKLM \
+   "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+
+   IfErrors 0 lbl_winnt
+   
+   ; we are not NT
+   ReadRegStr $R0 HKLM \
+   "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
+ 
+   StrCpy $R1 $R0 1
+   StrCmp $R1 '4' 0 lbl_error
+ 
+   StrCpy $R1 $R0 3
+ 
+   StrCmp $R1 '4.0' lbl_win32_95
+   StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
+ 
+   lbl_win32_95:
+     StrCpy $R0 '95'
+   Goto lbl_done
+ 
+   lbl_win32_98:
+     StrCpy $R0 '98'
+   Goto lbl_done
+ 
+   lbl_win32_ME:
+     StrCpy $R0 'ME'
+   Goto lbl_done
+ 
+   lbl_winnt:
+ 
+   StrCpy $R1 $R0 1
+ 
+   StrCmp $R1 '3' lbl_winnt_x
+   StrCmp $R1 '4' lbl_winnt_x
+ 
+   StrCpy $R1 $R0 3
+ 
+   StrCmp $R1 '5.0' lbl_winnt_2000
+   StrCmp $R1 '5.1' lbl_winnt_XP
+   StrCmp $R1 '5.2' lbl_winnt_2003 lbl_error
+ 
+   lbl_winnt_x:
+     StrCpy $R0 "NT $R0" 6
+   Goto lbl_done
+ 
+   lbl_winnt_2000:
+     Strcpy $R0 '2000'
+   Goto lbl_done
+ 
+   lbl_winnt_XP:
+     Strcpy $R0 'XP'
+   Goto lbl_done
+ 
+   lbl_winnt_2003:
+     Strcpy $R0 '2003'
+   Goto lbl_done
+ 
+   lbl_error:
+     Strcpy $R0 ''
+   lbl_done:
+ 
+   Pop $R1
+   Exch $R0
+ 
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  Note: to add new languages, add a language file include to the list 
+;;  at the top of this file, add an entry to the menu and then add an 
+;;  entry to the language ID selector below
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function .onInit
+
+        ; read the language from registry (ok if not there) and set langauge menu
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
+        StrCpy $LANGUAGE $0
+
+        Push ""
+        Push ${LANG_ENGLISH}
+        Push English
+        Push ${LANG_GERMAN}
+        Push German
+        Push ${LANG_JAPANESE}
+        Push Japanese
+        Push ${LANG_KOREAN}
+        Push Korean
+        Push A ; A means auto count languages for the auto count to work the first empty push (Push "") must remain
+        LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
+        Pop $LANGUAGE
+        StrCmp $LANGUAGE "cancel" 0 +2
+                Abort
+
+        ; save language in registry             
+        WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Function un.onInit
+
+        ; read language from registry and set for ininstaller
+        ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"
+        StrCpy $LANGUAGE $0
+
+FunctionEnd
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Sections
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+Section ""                                              ; (default section)
+
+SetShellVarContext all                  ; install for all users (if you change this, change it in the uninstall as well)
+
+; Start with some default values.
+StrCpy $INSTFLAGS "${INSTFLAGS}"
+StrCpy $INSTPROG "${INSTNAME}"
+StrCpy $INSTEXE "${INSTEXE}"
+StrCpy $INSTSHORTCUT "${SHORTCUT}"
+
+IfSilent +2
+Goto NOT_SILENT
+  Call CheckStartupParams                 ; Figure out where, what and how to install.
+NOT_SILENT:
+Call CheckWindowsVersion                ; warn if on Windows 98/ME
+Call CheckIfAdministrator               ; Make sure the user can install/uninstall
+Call CheckIfAlreadyCurrent              ; Make sure that we haven't already installed this version
+Call CloseSecondLife                    ; Make sure we're not running
+Call RemoveNSIS                                 ; Check for old NSIS install to remove
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Don't remove cache files during a regular install, removing the inventory cache on upgrades results in lots of damage to the servers.
+;Call RemoveCacheFiles                  ; Installing over removes potentially corrupted
+                                                                ; VFS and cache files.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Need to clean out shader files from previous installs to fix DEV-5663
+Call RemoveOldShaders
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Need to clean out old XUI files that predate skinning
+Call RemoveOldXUI
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Clear out old releasenotes.txt files. These are now on the public wiki.
+Call RemoveOldReleaseNotes
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Files
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
+%%INSTALL_FILES%%
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; If this is a silent update, we don't need to re-create these shortcuts or registry entries.
+IfSilent POST_INSTALL
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Shortcuts in start menu
+CreateDirectory "$SMPROGRAMS\$INSTSHORTCUT"
+SetOutPath "$INSTDIR"
+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS"
+
+!ifdef MUSEUM
+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum.lnk" \
+
+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT Museum Spanish.lnk" \
+
+                                "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
+!endif
+
+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Create Trial Account.url" \
+                                "InternetShortcut" "URL" \
+                                "http://www.secondlife.com/registration/"
+WriteINIStr             "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
+                                "InternetShortcut" "URL" \
+                                "http://www.secondlife.com/account/"
+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\SL Scripting Language Help.lnk" \
+                                "$INSTDIR\lsl_guide.html"
+CreateShortCut  "$SMPROGRAMS\$INSTSHORTCUT\Uninstall $INSTSHORTCUT.lnk" \
+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Other shortcuts
+SetOutPath "$INSTDIR"
+CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
+CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS"
+CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
+                                '"$INSTDIR\uninst.exe"' '/P="$INSTPROG"'
+
+!ifdef MUSEUM
+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
+
+CreateShortCut "$DESKTOP\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
+
+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple"
+
+CreateShortCut "$INSTDIR\$INSTSHORTCUT Museum Spanish.lnk" "$INSTDIR\$INSTEXE" "$INSTFLAGS -simple -spanish"
+
+!endif
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Write registry
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Flags" "$INSTFLAGS"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"
+WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$INSTEXE"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG (remove only)"
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe" /P="$INSTPROG"'
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Write URL registry info
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "URL Protocol" ""
+WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}\DefaultIcon" "" '"$INSTDIR\$INSTEXE"'
+WriteRegExpandStr HKEY_CLASSES_ROOT "${URLNAME}\shell\open\command" "" '"$INSTDIR\$INSTEXE" $INSTFLAGS -url "%1"'
+
+Goto WRITE_UNINST
+
+POST_INSTALL:
+; Run a post-executable script if necessary.
+Call PostInstallExe
+
+WRITE_UNINST:
+; write out uninstaller
+WriteUninstaller "$INSTDIR\uninst.exe"
+
+; end of default section
+SectionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; EOF  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi
index 6be219e..e45b3b1 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

-LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"

-

-; subtitle on license text caption (setup new version or update current one

-LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"

-LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"

-

-; description on license page

-LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen."

-LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren."

-LangString LicenseDescNext ${LANG_GERMAN} "Weiter"

-

-; installation directory text

-LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"

-LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:"

-LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:"

-

-; CheckStartupParams message box

-LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."

-

-; installation success dialog

-LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?"

-

-; remove old NSIS version

-LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."

-

-; check windows version

-LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."

-LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence 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)

-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 Imprudence installieren zu können.'

-

-; checkifadministrator function (uninstall)

-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 Imprudence entfernen zu können..'

-

-; checkifalreadycurrent

-LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"

-

-; closeimprudence function (install)

-LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

-LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."

-

-; closeimprudence function (uninstall)

-LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."

-LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."

-

-; removecachefiles

-LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."

-

-; delete program files

-LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence 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

-LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen."

+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
+
+; subtitle on license text caption (setup new version or update current one
+LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update"
+LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup"
+
+; description on license page
+LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen."
+LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren."
+LangString LicenseDescNext ${LANG_GERMAN} "Weiter"
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner"
+LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:"
+LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..."
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..."
+LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence 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)
+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 Imprudence installieren zu können.'
+
+; checkifadministrator function (uninstall)
+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 Imprudence entfernen zu können..'
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?"
+
+; closeimprudence function (install)
+LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."
+LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen."
+
+; closeimprudence function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..."
+LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen."
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen."
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence 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
+LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${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 e203fb6..0d28c3f 100644
--- a/linden/indra/newview/installers/windows/lang_en-us.nsi
+++ b/linden/indra/newview/installers/windows/lang_en-us.nsi
@@ -1,52 +1,52 @@
-; First is default

-LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"

-

-; subtitle on license text caption

-LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"

-LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"

-

-; installation directory text

-LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 

-LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):"

-LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:"

-

-; CheckStartupParams message box

-LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."

-

-; installation success dialog

-LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?"

-

-; remove old NSIS version

-LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."

-

-; check windows version

-LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."

-LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence 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 (install)

-LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."

-LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.'

-

-; checkifadministrator function (uninstall)

-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 Imprudence.'

-

-; checkifalreadycurrent

-LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"

-

-; closeimprudence function (install)

-LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

-LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation."

-

-; closeimprudence function (uninstall)

-LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."

-LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel."

-

-; removecachefiles

-LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"

-

-; delete program files

-LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence 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 Imprudence ${VERSION_LONG} from your system."

+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_ENGLISH} " Update"
+LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup"
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" 
+LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):"
+LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..."
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..."
+LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence 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 (install)
+LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..."
+LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.'
+
+; checkifadministrator function (uninstall)
+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 Imprudence.'
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?"
+
+; closeimprudence function (install)
+LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."
+LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation."
+
+; closeimprudence function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..."
+LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel."
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder"
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence 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 Imprudence ${VERSION_LONG} from your system."
diff --git a/linden/indra/newview/installers/windows/lang_es.nsi b/linden/indra/newview/installers/windows/lang_es.nsi
new file mode 100644
index 0000000..c6a7f38
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_es.nsi
diff --git a/linden/indra/newview/installers/windows/lang_fr.nsi b/linden/indra/newview/installers/windows/lang_fr.nsi
new file mode 100644
index 0000000..d23615d
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_fr.nsi
diff --git a/linden/indra/newview/installers/windows/lang_it.nsi b/linden/indra/newview/installers/windows/lang_it.nsi
new file mode 100644
index 0000000..1208ec4
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_it.nsi
diff --git a/linden/indra/newview/installers/windows/lang_ja.nsi b/linden/indra/newview/installers/windows/lang_ja.nsi
index f59957a..16bfd5c 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

-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"

-

-; subtitle on license text caption

-LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 

-LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 

-

-; 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 LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 

-LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 

-

-; installation directory text

-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 DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 

-

-; CheckStartupParams message box

-LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 

-

-; installation success dialog

-LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 

-

-; remove old NSIS version

-LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 

-

-; check windows version

-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" 

-

-; checkifadministrator function (install)

-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"

-

-; checkifadministrator function (uninstall)

-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" 

-

-; checkifalreadycurrent

-LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 

-

-; closeimprudence function (install)

-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"

-

-; closeimprudence function (uninstall)

-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" 

-

-; removecachefiles

-LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 

-

-; 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 " 

-

-; uninstall text

-LangString UninstallTextMsg ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG}‚ðƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B"

+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_JAPANESE} " ƒAƒbƒvƒf�[ƒg" 
+LangString LicenseSubTitleSetup ${LANG_JAPANESE} " ƒZƒbƒgƒAƒbƒv" 
+
+; 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 LicenseDescSetup ${LANG_JAPANESE} "‚±‚̃pƒbƒP�[ƒW‚Í‚ ‚È‚½‚̃Rƒ“ƒsƒ…�[ƒ^‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·�B" 
+LangString LicenseDescNext ${LANG_JAPANESE} "ŽŸ" 
+
+; installation directory text
+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 DirectoryChooseSetup ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢�B: " 
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_JAPANESE} "ƒvƒ�ƒOƒ‰ƒ€–¼'$INSTPROG'‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ�BƒTƒCƒŒƒ“ƒg�EƒAƒbƒvƒf�[ƒg‚ÉŽ¸”s‚µ‚Ü‚µ‚½�B" 
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_JAPANESE} "’¼‚¿‚ɃZƒJƒ“ƒhƒ‰ƒCƒt‚ðŠJŽn‚µ‚Ü‚·‚©�H " 
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_JAPANESE} "ŒÃ‚¢ƒo�[ƒWƒ‡ƒ“�î•ñ‚ðƒ`ƒFƒbƒN’†‚Å‚·�c" 
+
+; check windows version
+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" 
+
+; checkifadministrator function (install)
+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"
+
+; checkifadministrator function (uninstall)
+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" 
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_JAPANESE} "ƒZƒJƒ“ƒhƒ‰ƒCƒt${VERSION_LONG} ‚̓Cƒ“ƒXƒg�[ƒ‹�Ï‚Ý‚Å‚·�B�Ä“xƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ü‚·‚©�H " 
+
+; closeimprudence function (install)
+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"
+
+; closeimprudence function (uninstall)
+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" 
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_JAPANESE} " Documents and Settings ƒtƒHƒ‹ƒ_‚̃LƒƒƒbƒVƒ…ƒtƒ@ƒCƒ‹‚ðƒfƒŠ�[ƒg’†‚Å‚·�B" 
+
+; 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 " 
+
+; uninstall text
+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 2530e4b..a50d998 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

-LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"

-

-; subtitle on license text caption

-LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"

-LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"

-

-; description on license page

-LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "

-LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."

-LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"

-

-; installation directory text

-LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"

-LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "

-LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"

-

-; CheckStartupParams message box

-LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."

-

-; installation success dialog

-LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"

-

-; remove old NSIS version

-LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "

-

-; check windows version

-LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."

-LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "

-

-; checkifadministrator function (install)

-LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "

-LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."

-

-; checkifadministrator function (uninstall)

-LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "

-LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "

-

-; checkifalreadycurrent

-LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "

-

-; closeimprudence function (install)

-LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "

-LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 

-

-; closeimprudence function (uninstall)

-LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"

-LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "

-

-; removecachefiles

-LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."

-

-; delete program files

-LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 

-

-; uninstall text

-LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."

+; First is default
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\Korean.nlf"
+
+; subtitle on license text caption
+LangString LicenseSubTitleUpdate ${LANG_KOREAN} "¾÷µ¥ÀÌÆ®"
+LangString LicenseSubTitleSetup ${LANG_KOREAN} " ¼³Ä¡Çϱâ"
+
+; description on license page
+LangString LicenseDescUpdate ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¹öÀü${VERSION_LONG}.À¸·Î ¾÷µ¥ÀÌÆ® ÇÕ´Ï´Ù. "
+LangString LicenseDescSetup ${LANG_KOREAN} "ÀÌ ÆÑÅ°Áö´Â ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÕ´Ï´Ù."
+LangString LicenseDescNext ${LANG_KOREAN} "´ÙÀ½"
+
+; installation directory text
+LangString DirectoryChooseTitle ${LANG_KOREAN} "¼³Ä¡ µð·ºÅ丮"
+LangString DirectoryChooseUpdate ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¾÷µ¥ÀÌÆ®ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä. "
+LangString DirectoryChooseSetup ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡ÇÒ µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä:"
+
+; CheckStartupParams message box
+LangString CheckStartupParamsMB ${LANG_KOREAN} " ¡®$INSTPROG¡¯ ÇÁ·Î±×·¥À» ãÁö ¸øÇß½À´Ï´Ù. ÀÚµ¿ ¾÷µ¥ÀÌÆ®¿¡ ½ÇÆÐÇß½À´Ï´Ù."
+
+; installation success dialog
+LangString InstSuccesssQuestion ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï±î?"
+
+; remove old NSIS version
+LangString RemoveOldNSISVersion ${LANG_KOREAN} "ÀÌÀü ¹öÀüÀ» ã°í ÀÖ½À´Ï´Ù¡¦ "
+
+; check windows version
+LangString CheckWindowsVersionDP ${LANG_KOREAN} "À©µµ¿ì ¹öÀüÀ» È®ÀÎÇÏ°í ÀÖ½À´Ï´Ù."
+LangString CheckWindowsVersionMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ´Â À©µµ¿ì XP, À©µµ¿ì 2000, ±×¸®°í ¸Æ OS X¸¦ Áö¿øÇÕ´Ï´Ù. À©µµ¿ì $R0¿¡ ¼³Ä¡¸¦ ½ÃµµÇÏ¸é ¿ÀÀÛµ¿°ú µ¥ÀÌÅÍ ºÐ½ÇÀÌ ÀϾ ¼ö ÀÖ½À´Ï´Ù. °è¼Ó ¼³Ä¡ÇÏ°Ú½À´Ï±î? "
+
+; checkifadministrator function (install)
+LangString CheckAdministratorInstDP ${LANG_KOREAN} "¼³Ä¡ ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù... "
+LangString CheckAdministratorInstMB ${LANG_KOREAN} "ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ ¼³Ä¡Çϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù."
+
+; checkifadministrator function (uninstall)
+LangString CheckAdministratorUnInstDP ${LANG_KOREAN} "Á¦°Å ±ÇÇÑÀ» È®ÀÎ ÁßÀÔ´Ï´Ù. "
+LangString CheckAdministratorUnInstMB ${LANG_KOREAN} " ÇöÀç ¡®¼Õ´Ô¡¯°èÁ¤À» »ç¿ë ÁßÀÔ´Ï´Ù. ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¦°ÅÇϱâ À§Çؼ± ¡®¿î¿µÀÚ¡± °èÁ¤À» »ç¿ëÇØ¾ß ÇÕ´Ï´Ù. "
+
+; checkifalreadycurrent
+LangString CheckIfCurrentMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ¹öÀü ${VERSION_LONG}ÀÌ ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù. ´Ù½Ã ¼³Ä¡ÇϽðڽÀ´Ï±î? "
+
+; closeimprudence function (install)
+LangString CloseSecondLifeInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦ "
+LangString CloseSecondLifeInstMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì ¼³Ä¡¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ Ãë¼ÒÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä." 
+
+; closeimprudence function (uninstall)
+LangString CloseSecondLifeUnInstDP ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÒ ¶§ ±îÁö ´ë±â Áß¡¦¡±"
+LangString CloseSecondLifeUnInstMB ${LANG_KOREAN} " ¼¼ÄÁµå¶óÀÌÇÁ°¡ ÀÌ¹Ì ÀÛµ¿ ÁßÀÏ °æ¿ì Á¦°Å¸¦ °è¼Ó ÇÒ ¼ö ¾ø½À´Ï´Ù. ÇöÀç ÀÛ¾÷À» ¸ØÃß°í ¡®È®ÀΡ¯À» ´­·¯ ¼¼ÄÁµå¶óÀÌÇÁ¸¦ Á¾·áÇÑ ´ÙÀ½ ÁøÇàÇϱ⠹ٶø´Ï´Ù. ¼³Ä¡¸¦ ÃëÇÏ·Á¸é ¡®Ãë¼Ò¡¯¸¦ ´©¸£¼¼¿ä. "
+
+; removecachefiles
+LangString RemoveCacheFilesDP ${LANG_KOREAN} " Documents and Settings Æú´õ ³»ÀÇ Ä³½Ã ÆÄÀϵéÀ» Áö¿ó´Ï´Ù."
+
+; delete program files
+LangString DeleteProgramFilesMB ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ ÇÁ·Î±×·¥ µð·ºÅ丮¿¡ ¾ÆÁ÷ ÆÄÀϵéÀÌ ³²¾Æ ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀº »ç¿ëÀÚ°¡ ¸¸µç °ÍµéÀ̰ųª$\n$INSTDIR$\n$\n·Î À̵¿ÇÑ ÆÄÀϵéÀÏ ¼ö ÀÖ½À´Ï´Ù. ÀÌ ÆÄÀϵéÀ» Á¦°ÅÇÏ°Ú½À´Ï±î?" 
+
+; uninstall text
+LangString UninstallTextMsg ${LANG_KOREAN} "¼¼ÄÁµå¶óÀÌÇÁ${VERSION_LONG}À» ½Ã½ºÅÛ¿¡¼­ Á¦°ÅÇÕ´Ï´Ù."
diff --git a/linden/indra/newview/installers/windows/lang_nl.nsi b/linden/indra/newview/installers/windows/lang_nl.nsi
new file mode 100644
index 0000000..c8ffa8b
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_nl.nsi
diff --git a/linden/indra/newview/installers/windows/lang_pt-br.nsi b/linden/indra/newview/installers/windows/lang_pt-br.nsi
new file mode 100644
index 0000000..da56a3c
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_pt-br.nsi
diff --git a/linden/indra/newview/installers/windows/lang_zh.nsi b/linden/indra/newview/installers/windows/lang_zh.nsi
new file mode 100644
index 0000000..d17e860
--- /dev/null
+++ b/linden/indra/newview/installers/windows/lang_zh.nsi
diff --git a/linden/indra/newview/installers/windows/language_menu.nsi b/linden/indra/newview/installers/windows/language_menu.nsi
new file mode 100644
index 0000000..988f452
--- /dev/null
+++ b/linden/indra/newview/installers/windows/language_menu.nsi
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index 179cb9e..a3ff6cb 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -15,7 +15,7 @@ Life itself - please see <http://www.secondlife.com/whatis/>.
    5.3. Blank window after minimizing it
    5.4. Audio
    5.5. 'Alt' key for camera controls doesn't work
-   5.6. In-world movie playback
+   5.6. In-world streaming movie/music playback
 6. Advanced Troubleshooting
    6.1. Audio
    6.2. OpenGL
@@ -79,9 +79,9 @@ unpacked it into - no installation step is required.
 
 Run ./secondlife from the installation directory to start Second Life.
 
-For in-world MOVIE PLAYBACK, you will need GStreamer 0.10 installed on your
-system.  This is optional - it is not required for general client
-functionality.  If you have GStreamer 0.10 installed, the selection of
+For in-world MOVIE and MUSIC PLAYBACK, you will need (32-bit) GStreamer 0.10
+installed on your system.  This is optional - it is not required for general
+client functionality.  If you have GStreamer 0.10 installed, the selection of
 in-world movies you can successfully play will depend on the GStreamer
 plugins you have; if you cannot play a certain in-world movie then you are
 probably missing the appropriate GStreamer plugin on your system - you may
@@ -169,11 +169,11 @@ SOLUTION:- Some window managers eat the Alt key for their own purposes; you
    example, the 'Windows' key!) which will allow the Alt key to function
    properly with mouse actions in Second Life and other applications.
 
-PROBLEM 6:- In-world movie playback doesn't work for me.
+PROBLEM 6:- In-world movie and/or music playback doesn't work for me.
 SOLUTION:- You need to have a working installation of GStreamer 0.10; this
    is usually an optional package for most versions of Linux.  If you have
-   installed GStreamer 0.10 and you can play some movies but not others then
-   you need to install a wider selection of GStreamer plugins, either
+   installed GStreamer 0.10 and you can play some music/movies but not others
+   then you need to install a wider selection of GStreamer plugins, either
    from your vendor or an appropriate third party.
 
 
@@ -183,11 +183,11 @@ SOLUTION:- You need to have a working installation of GStreamer 0.10; this
 The 'secondlife' script which launches Second Life contains some
 configuration options for advanced troubleshooters.
 
-* AUDIO - Edit the 'secondlife' script and you will see three audio
-  options: LL_BAD_ESD, LL_BAD_OSS, LL_BAD_ALSA.  Second Life tries to
-  use ESD, OSS, then ALSA audio drivers in this order; you may uncomment
-  the corresponding LL_BAD_* option to skip an audio driver which you
-  believe may be causing you trouble.
+* AUDIO - Edit the 'secondlife' script and you will see these audio
+  options: LL_BAD_OPENAL_DRIVER, LL_BAD_FMOD_ESD, LL_BAD_FMOD_OSS, and
+  LL_BAD_FMOD_ALSA.  Second Life tries to use OpenAL, ESD, OSS, then ALSA
+  audio drivers in this order; you may uncomment the corresponding LL_BAD_*
+  option to skip an audio driver which you believe may be causing you trouble.
 
 * OPENGL - For advanced troubleshooters, the LL_GL_BLACKLIST option lets
   you disable specific GL extensions, each of which is represented by a
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index 23053d3..2834947 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -4,14 +4,17 @@
 ## These options are for self-assisted troubleshooting during this beta
 ## testing phase; you should not usually need to touch them.
 
-## - Avoids using the ESD audio driver.
-#export LL_BAD_ESD=x
-
-## - Avoids using the OSS audio driver.
-#export LL_BAD_OSS=x
-
-## - Avoids using the ALSA audio driver.
-#export LL_BAD_ALSA=x
+## - Avoids using any OpenAL audio driver.
+#export LL_BAD_OPENAL_DRIVER=x
+## - Avoids using any FMOD audio driver.
+#export LL_BAD_FMOD_DRIVER=x
+
+## - Avoids using the FMOD ESD audio driver.
+#export LL_BAD_FMOD_ESD=x
+## - Avoids using the FMOD OSS audio driver.
+#export LL_BAD_FMOD_OSS=x
+## - Avoids using the FMOD ALSA audio driver.
+#export LL_BAD_FMOD_ALSA=x
 
 ## - Avoids the optional OpenGL extensions which have proven most problematic
 ##   on some hardware.  Disabling this option may cause BETTER PERFORMANCE but
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index d268397..301f00b 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,7 @@
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 #include "llgroupmgr.h"
+#include "llhomelocationresponder.h"
 #include "llhudeffectlookat.h"
 #include "llhudmanager.h"
 #include "llinventorymodel.h"
@@ -90,6 +91,7 @@
 #include "llmoveview.h"
 #include "llnotify.h"
 #include "llquantize.h"
+#include "llsdutil.h"
 #include "llselectmgr.h"
 #include "llsky.h"
 #include "llrendersphere.h"
@@ -445,7 +447,7 @@ void LLAgent::init()
         mCameraFocusOffsetTarget = LLVector4(gSavedSettings.getVector3("CameraOffsetBuild"));
         mCameraOffsetDefault = gSavedSettings.getVector3("CameraOffsetDefault");
 //      mCameraOffsetNorm = mCameraOffsetDefault;
-//      mCameraOffsetNorm.normVec();
+//      mCameraOffsetNorm.normalize();
         mCameraCollidePlane.clearVec();
         mCurrentCameraDistance = mCameraOffsetDefault.magVec();
         mTargetCameraDistance = mCurrentCameraDistance;
@@ -490,7 +492,7 @@ LLAgent::~LLAgent()
 //-----------------------------------------------------------------------------
 // resetView()
 //-----------------------------------------------------------------------------
-void LLAgent::resetView(BOOL reset_camera)
+void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
 {
         if (mAutoPilot)
         {
@@ -515,6 +517,30 @@ void LLAgent::resetView(BOOL reset_camera)
                 gMenuHolder->hideMenus();
         }
 
+        if (change_camera && !gSavedSettings.getBOOL("FreezeTime"))
+        {
+                changeCameraToDefault();
+                
+                if (LLViewerJoystick::getInstance()->getOverrideCamera())
+                {
+                        handle_toggle_flycam();
+                }
+
+                // reset avatar mode from eventual residual motion
+                if (LLToolMgr::getInstance()->inBuildMode())
+                {
+                        LLViewerJoystick::getInstance()->moveAvatar(true);
+                }
+
+                gFloaterTools->close();
+                
+                gViewerWindow->showCursor();
+
+                // Switch back to basic toolset
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
+        }
+
+
         if (reset_camera && !gSavedSettings.getBOOL("FreezeTime"))
         {
                 if (!gViewerWindow->getLeftMouseDown() && cameraThirdPerson())
@@ -522,7 +548,7 @@ void LLAgent::resetView(BOOL reset_camera)
                         // leaving mouse-steer mode
                         LLVector3 agent_at_axis = getAtAxis();
                         agent_at_axis -= projected_vec(agent_at_axis, getReferenceUpVector());
-                        agent_at_axis.normVec();
+                        agent_at_axis.normalize();
                         gAgent.resetAxes(lerp(getAtAxis(), agent_at_axis, LLCriticalDamp::getInterpolant(0.3f)));
                 }
 
@@ -1033,7 +1059,7 @@ void LLAgent::slamLookAt(const LLVector3 &look_at)
 {
         LLVector3 look_at_norm = look_at;
         look_at_norm.mV[VZ] = 0.f;
-        look_at_norm.normVec();
+        look_at_norm.normalize();
         resetAxes(look_at_norm);
 }
 
@@ -1294,7 +1320,7 @@ LLQuaternion LLAgent::getQuat() const
 //-----------------------------------------------------------------------------
 // calcFocusOffset()
 //-----------------------------------------------------------------------------
-LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
+LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, LLVector3 pos_agent, S32 x, S32 y)
 {
         // calculate offset based on view direction
         BOOL is_avatar = object->isAvatar();
@@ -1305,7 +1331,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
 
         LLVector3 obj_dir_abs = obj_pos - LLViewerCamera::getInstance()->getOrigin();
         obj_dir_abs.rotVec(inv_obj_rot);
-        obj_dir_abs.normVec();
+        obj_dir_abs.normalize();
         obj_dir_abs.abs();
 
         LLVector3 object_extents = object->getScale();
@@ -1330,7 +1356,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
         {
                 normal.setVec(obj_matrix.getUpRow4());
         }
-        normal.normVec();
+        normal.normalize();
 
         LLVector3d focus_pt_global;
         // RN: should we check return value for valid pick?
@@ -1397,7 +1423,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
         if (!is_avatar) 
         {
                 //unproject relative clicked coordinate from window coordinate using GL
-                GLint viewport[4];
+                /*GLint viewport[4];
                 GLdouble modelview[16];
                 GLdouble projection[16];
                 GLfloat winX, winY, winZ;
@@ -1419,11 +1445,9 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
                 winY = ((F32)y) * gViewerWindow->getDisplayScale().mV[VY];
                 glReadPixels( llfloor(winX), llfloor(winY), 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ );
 
-                gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);
+                gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);*/
 
-                LLVector3 obj_rel((F32)posX, (F32)posY, (F32)posZ);
-                obj_rel = obj_rel * object->getRenderMatrix();
-                obj_rel -= object->getRenderPosition();
+                LLVector3 obj_rel = pos_agent - object->getRenderPosition();
                 
                 LLVector3 obj_center = LLVector3(0, 0, 0) * object->getRenderMatrix();
 
@@ -1534,7 +1558,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
         camera_offset_target_abs_norm.abs();
         // make sure offset is non-zero
         camera_offset_target_abs_norm.clamp(0.001f, F32_MAX);
-        camera_offset_target_abs_norm.normVec();
+        camera_offset_target_abs_norm.normalize();
 
         // find camera position relative to normalized object extents
         LLVector3 camera_offset_target_scaled = camera_offset_target_abs_norm;
@@ -1580,7 +1604,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
         LLVector3 object_split_axis;
         LLVector3 target_offset_scaled = target_offset_origin;
         target_offset_scaled.abs();
-        target_offset_scaled.normVec();
+        target_offset_scaled.normalize();
         target_offset_scaled.mV[VX] /= object_extents.mV[VX];
         target_offset_scaled.mV[VY] /= object_extents.mV[VY];
         target_offset_scaled.mV[VZ] /= object_extents.mV[VZ];
@@ -1703,7 +1727,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
         else if (cameraCustomizeAvatar())
         {
                 LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
-                camera_offset_dir.normVec();
+                camera_offset_dir.normalize();
                 mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, APPEARANCE_MAX_ZOOM, APPEARANCE_MIN_ZOOM);
         }
         else
@@ -1730,7 +1754,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
                 }
 
                 LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
-                camera_offset_dir.normVec();
+                camera_offset_dir.normalize();
                 mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, max_zoom, min_zoom);
         }
         startCameraAnimation();
@@ -1777,7 +1801,7 @@ void LLAgent::cameraOrbitOver(const F32 angle)
         else
         {
                 LLVector3 camera_offset_unit(mCameraFocusOffsetTarget);
-                camera_offset_unit.normVec();
+                camera_offset_unit.normalize();
 
                 F32 angle_from_up = acos( camera_offset_unit * getReferenceUpVector() );
 
@@ -1812,7 +1836,7 @@ void LLAgent::cameraZoomIn(const F32 fraction)
         LLVector3d      camera_offset(mCameraFocusOffsetTarget);
         LLVector3d      camera_offset_unit(mCameraFocusOffsetTarget);
         F32 min_zoom = LAND_MIN_ZOOM;
-        F32 current_distance = (F32)camera_offset_unit.normVec();
+        F32 current_distance = (F32)camera_offset_unit.normalize();
         F32 new_distance = current_distance * fraction;
 
         // Don't move through focus point
@@ -1881,7 +1905,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
         {
                 LLVector3d      camera_offset(mCameraFocusOffsetTarget);
                 LLVector3d      camera_offset_unit(mCameraFocusOffsetTarget);
-                F32 current_distance = (F32)camera_offset_unit.normVec();
+                F32 current_distance = (F32)camera_offset_unit.normalize();
                 F32 new_distance = current_distance - meters;
                 F32 min_zoom = LAND_MIN_ZOOM;
                 
@@ -1938,6 +1962,8 @@ void LLAgent::cameraPanIn(F32 meters)
         mFocusGlobal = mFocusTargetGlobal;
         // don't enforce zoom constraints as this is the only way for users to get past them easily
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -1956,6 +1982,8 @@ void LLAgent::cameraPanLeft(F32 meters)
         
         cameraZoomIn(1.f);
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind - Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -1974,6 +2002,8 @@ void LLAgent::cameraPanUp(F32 meters)
 
         cameraZoomIn(1.f);
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -2246,7 +2276,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s
                 mAutoPilotUseRotation = TRUE;
                 mAutoPilotTargetFacing = LLVector3::x_axis * *target_rotation;
                 mAutoPilotTargetFacing.mV[VZ] = 0.f;
-                mAutoPilotTargetFacing.normVec();
+                mAutoPilotTargetFacing.normalize();
         }
         else
         {
@@ -2369,8 +2399,8 @@ void LLAgent::autoPilot(F32 *delta_yaw)
                 at.mV[VZ] = 0.f;
                 direction.mV[VZ] = 0.f;
 
-                at.normVec();
-                F32 xy_distance = direction.normVec();
+                at.normalize();
+                F32 xy_distance = direction.normalize();
 
                 F32 yaw = 0.f;
                 if (mAutoPilotTargetDist > mAutoPilotStopDistance)
@@ -3529,7 +3559,7 @@ void LLAgent::setupSitCamera()
                 // slam agent coordinate frame to proper parent local version
                 LLVector3 at_axis = mFrameAgent.getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis * ~parent_rot);
         }
 }
@@ -3665,7 +3695,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                 // slam agent coordinate frame to proper parent local version
                                 LLVector3 at_axis = mFrameAgent.getAtAxis() * parent_rot;
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis * ~parent_rot);
 
                                 local_camera_offset = local_camera_offset * mFrameAgent.getQuaternion() * parent_rot;
@@ -3686,7 +3716,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                         offset_dot_norm = 0.001f;
                                 }
                                 
-                                camera_distance = local_camera_offset.normVec();
+                                camera_distance = local_camera_offset.normalize();
 
                                 F32 pos_dot_norm = getPosAgentFromGlobal(frame_center_global + head_offset) * plane_normal;
                                 
@@ -3710,7 +3740,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                         }
                         else
                         {
-                                camera_distance = local_camera_offset.normVec();
+                                camera_distance = local_camera_offset.normalize();
                         }
 
                         mTargetCameraDistance = llmax(camera_distance, MIN_CAMERA_DISTANCE);
@@ -3745,7 +3775,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                 {
                                         LLVector3 frame_at_axis = mFrameAgent.getAtAxis();
                                         frame_at_axis -= projected_vec(frame_at_axis, getReferenceUpVector());
-                                        frame_at_axis.normVec();
+                                        frame_at_axis.normalize();
 
                                         //transition smoothly in air mode, to avoid camera pop
                                         F32 u = (time_in_air - GROUND_TO_AIR_CAMERA_TRANSITION_START_TIME) / GROUND_TO_AIR_CAMERA_TRANSITION_TIME;
@@ -3932,7 +3962,7 @@ void LLAgent::resetCamera()
         // Remove any pitch from the avatar
         LLVector3 at = mFrameAgent.getAtAxis();
         at.mV[VZ] = 0.f;
-        at.normVec();
+        at.normalize();
         gAgent.resetAxes(at);
         // have to explicitly clear field of view zoom now
         mCameraFOVZoomFactor = 0.f;
@@ -4101,7 +4131,10 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 
         if (mAvatarObject)
         {
-                mAvatarObject->mPelvisp->setPosition(LLVector3::zero);
+                if (!mAvatarObject->mIsSitting)
+                {
+                        mAvatarObject->mPelvisp->setPosition(LLVector3::zero);
+                }
                 mAvatarObject->startMotion( ANIM_AGENT_BODY_NOISE );
                 mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT );
         }
@@ -4147,14 +4180,14 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
                 LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis * ~obj_rot);
         }
         else
         {
                 at_axis = mFrameAgent.getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis);
         }
 
@@ -4201,7 +4234,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
         // Remove any pitch from the avatar
         //LLVector3 at = mFrameAgent.getAtAxis();
         //at.mV[VZ] = 0.f;
-        //at.normVec();
+        //at.normalize();
         //gAgent.resetAxes(at);
 
         if( mCameraMode != CAMERA_MODE_CUSTOMIZE_AVATAR )
@@ -4228,7 +4261,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
                                 // Remove any pitch from the avatar
                         LLVector3 at = mFrameAgent.getAtAxis();
                         at.mV[VZ] = 0.f;
-                        at.normVec();
+                        at.normalize();
                         gAgent.resetAxes(at);
 
                         sendAnimationRequest(ANIM_AGENT_CUSTOMIZE, ANIM_REQUEST_START);
@@ -4508,14 +4541,14 @@ void LLAgent::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
                                 LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
                                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis * ~obj_rot);
                         }
                         else
                         {
                                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis);
                         }
                 }
@@ -4578,7 +4611,7 @@ void LLAgent::lookAtLastChat()
                         {
                                 delta_pos = chatter->getPositionAgent() - getPositionAgent();
                         }
-                        delta_pos.normVec();
+                        delta_pos.normalize();
 
                         setControlFlags(AGENT_CONTROL_STOP);
 
@@ -4586,9 +4619,9 @@ void LLAgent::lookAtLastChat()
 
                         LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
                         LLVector3 left = delta_pos % LLVector3::z_axis;
-                        left.normVec();
+                        left.normalize();
                         LLVector3 up = left % delta_pos;
-                        up.normVec();
+                        up.normalize();
                         new_camera_pos -= delta_pos * 0.4f;
                         new_camera_pos += left * 0.3f;
                         new_camera_pos += up * 0.2f;
@@ -4607,7 +4640,7 @@ void LLAgent::lookAtLastChat()
                 else
                 {
                         delta_pos = chatter->getRenderPosition() - getPositionAgent();
-                        delta_pos.normVec();
+                        delta_pos.normalize();
 
                         setControlFlags(AGENT_CONTROL_STOP);
 
@@ -4615,9 +4648,9 @@ void LLAgent::lookAtLastChat()
 
                         LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
                         LLVector3 left = delta_pos % LLVector3::z_axis;
-                        left.normVec();
+                        left.normalize();
                         LLVector3 up = left % delta_pos;
-                        up.normVec();
+                        up.normalize();
                         new_camera_pos -= delta_pos * 0.4f;
                         new_camera_pos += left * 0.3f;
                         new_camera_pos += up * 0.2f;
@@ -4631,68 +4664,107 @@ void LLAgent::lookAtLastChat()
 
 const F32 SIT_POINT_EXTENTS = 0.2f;
 
-// Grabs current position
-void LLAgent::setStartPosition(U32 location_id)
-{
-        LLViewerObject          *object;
-
-        if ( !(gAgentID == LLUUID::null) )
-        {
-                // we've got an ID for an agent viewerobject
-                object = gObjectList.findObject(gAgentID);
-                if (object)
-                {
-                        // we've got the viewer object
-                        // Sometimes the agent can be velocity interpolated off of
-                        // 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 = LLWorld::getInstance()->getRegionWidthInMeters();
-
-                        LLVector3 agent_pos = getPositionAgent();
-
-                        if (mAvatarObject)
-                        {
-                                // the z height is at the agent's feet
-                                agent_pos.mV[VZ] -= 0.5f * mAvatarObject->mBodySize.mV[VZ];
-                        }
-
-                        agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET );
-                        agent_pos.mV[VY] = llclamp( agent_pos.mV[VY], INSET, REGION_WIDTH - INSET );
-
-                        // Don't let them go below ground, or too high.
-                        agent_pos.mV[VZ] = llclamp( agent_pos.mV[VZ], 
-                                mRegionp->getLandHeightRegion( agent_pos ), 
-                                LLWorld::getInstance()->getRegionMaxHeight() );
-
-                        LLMessageSystem* msg = gMessageSystem;
-                        msg->newMessageFast(_PREHASH_SetStartLocationRequest);
-                        msg->nextBlockFast( _PREHASH_AgentData);
-                        msg->addUUIDFast(_PREHASH_AgentID, getID());
-                        msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
-                        msg->nextBlockFast( _PREHASH_StartLocationData);
-                        // corrected by sim
-                        msg->addStringFast(_PREHASH_SimName, "");
-                        msg->addU32Fast(_PREHASH_LocationID, location_id);
-                        msg->addVector3Fast(_PREHASH_LocationPos, agent_pos);
-                        msg->addVector3Fast(_PREHASH_LocationLookAt,mFrameAgent.getAtAxis());
-
-                        // Reliable only helps when setting home location.  Last
-                        // location is sent on quit, and we don't have time to ack
-                        // the packets.
-                        msg->sendReliable(mRegionp->getHost());
-
-                        const U32 HOME_INDEX = 1;
-                        if( HOME_INDEX == location_id )
-                        {
-                                setHomePosRegion( mRegionp->getHandle(), getPositionAgent() );
-                        }
-                }
-                else
-                {
-                        llinfos << "setStartPosition - Can't find agent viewerobject id " << gAgentID << llendl;
-                }
-        }
+void LLAgent::setStartPosition( U32 location_id )
+{
+  LLViewerObject          *object;
+
+  if ( !(gAgentID == LLUUID::null) )
+  {
+    // we've got an ID for an agent viewerobject
+    object = gObjectList.findObject(gAgentID);
+    if (object)
+    {
+      // we've got the viewer object
+      // Sometimes the agent can be velocity interpolated off of
+      // 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 = LLWorld::getInstance()->getRegionWidthInMeters();
+
+      LLVector3 agent_pos = getPositionAgent();
+      LLVector3 agent_look_at = mFrameAgent.getAtAxis();
+
+      if (mAvatarObject)
+      {
+        // the z height is at the agent's feet
+        agent_pos.mV[VZ] -= 0.5f * mAvatarObject->mBodySize.mV[VZ];
+      }
+
+      agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET );
+      agent_pos.mV[VY] = llclamp( agent_pos.mV[VY], INSET, REGION_WIDTH - INSET );
+
+      // Don't let them go below ground, or too high.
+      agent_pos.mV[VZ] = llclamp( agent_pos.mV[VZ],
+                                  mRegionp->getLandHeightRegion( agent_pos ),
+                                  LLWorld::getInstance()->getRegionMaxHeight() );
+      // Send the CapReq
+
+      LLSD body;
+
+      std::string url = gAgent.getRegion()->getCapability("HomeLocation");
+      std::ostringstream strBuffer;
+      if( url.empty() )
+      {
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_SetStartLocationRequest);
+        msg->nextBlockFast( _PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, getID());
+        msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
+        msg->nextBlockFast( _PREHASH_StartLocationData);
+        // corrected by sim
+        msg->addStringFast(_PREHASH_SimName, "");
+        msg->addU32Fast(_PREHASH_LocationID, location_id);
+        msg->addVector3Fast(_PREHASH_LocationPos, agent_pos);
+        msg->addVector3Fast(_PREHASH_LocationLookAt,mFrameAgent.getAtAxis());
+        
+        // Reliable only helps when setting home location.  Last
+        // location is sent on quit, and we don't have time to ack
+        // the packets.
+        msg->sendReliable(mRegionp->getHost());
+
+        const U32 HOME_INDEX = 1;
+        if( HOME_INDEX == location_id )
+          {
+            setHomePosRegion( mRegionp->getHandle(), getPositionAgent() );
+          }
+      }
+      else
+      {
+        strBuffer << location_id;
+        body["HomeLocation"]["LocationId"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VX];
+        body["HomeLocation"]["LocationPos"]["X"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VY];
+        body["HomeLocation"]["LocationPos"]["Y"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VZ];
+        body["HomeLocation"]["LocationPos"]["Z"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VX];
+        body["HomeLocation"]["LocationLookAt"]["X"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VY];
+        body["HomeLocation"]["LocationLookAt"]["Y"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VZ];
+        body["HomeLocation"]["LocationLookAt"]["Z"] = strBuffer.str();
+
+        LLHTTPClient::post( url, body, new LLHomeLocationResponder() );
+      }
+    }
+    else
+    {
+      llinfos << "setStartPosition - Can't find agent viewerobject id " << gAgentID << llendl;
+    }
+  }
 }
 
 void LLAgent::requestStopMotion( LLMotion* motion )
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 97f9aed..3d3a94b 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -139,7 +139,7 @@ public:
 
         // Called whenever the agent moves.  Puts camera back in default position,
         // deselects items, etc.
-        void                    resetView(BOOL reset_camera = TRUE);
+        void                    resetView(BOOL reset_camera = TRUE, BOOL change_camera = FALSE);
 
         // Called on camera movement, to allow the camera to be unlocked from the 
         // default position behind the avatar.
@@ -378,7 +378,7 @@ public:
         void                    sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request);
         void                    sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request);
 
-        LLVector3               calcFocusOffset(LLViewerObject *object, S32 x, S32 y);
+        LLVector3               calcFocusOffset(LLViewerObject *object, LLVector3 pos_agent, S32 x, S32 y);
         BOOL                    calcCameraMinDistance(F32 &obj_min_distance);
 
         void                    startCameraAnimation();
diff --git a/linden/indra/newview/llagentdata.cpp b/linden/indra/newview/llagentdata.cpp
index 031663a..d47074d 100644
--- a/linden/indra/newview/llagentdata.cpp
+++ b/linden/indra/newview/llagentdata.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llagentdata.h b/linden/indra/newview/llagentdata.h
index 3736bf1..2f49940 100644
--- a/linden/indra/newview/llagentdata.h
+++ b/linden/indra/newview/llagentdata.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llagentlanguage.cpp b/linden/indra/newview/llagentlanguage.cpp
index 5656f76..7f4322a 100644
--- a/linden/indra/newview/llagentlanguage.cpp
+++ b/linden/indra/newview/llagentlanguage.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -31,13 +31,17 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llagentlanguage.h"
+// viewer includes
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewerregion.h"
+// library includes
+#include "llui.h"                                       // getLanguage()
 
 LLAgentLanguage::LLAgentLanguage()
 {
         gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update));
+        gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&update));
         gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update));
         gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update));
 }
@@ -51,9 +55,7 @@ bool LLAgentLanguage::update()
         std::string url = gAgent.getRegion()->getCapability("UpdateAgentLanguage");
         if (!url.empty())
         {
-                std::string language = gSavedSettings.getString("Language");
-                if (language == "default")
-                        language = gSavedSettings.getString("SystemLanguage");
+                std::string language = LLUI::getLanguage();
                 
                 body["language"] = language;
                 body["language_is_public"] = gSavedSettings.getBOOL("LanguageIsPublic");
@@ -62,4 +64,3 @@ bool LLAgentLanguage::update()
         }
     return true;
 }
-
diff --git a/linden/indra/newview/llagentlanguage.h b/linden/indra/newview/llagentlanguage.h
index d86a8f1..d2be5f9 100644
--- a/linden/indra/newview/llagentlanguage.h
+++ b/linden/indra/newview/llagentlanguage.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,7 +32,7 @@
 #ifndef LL_LLAGENTLANGUAGE_H
 #define LL_LLAGENTLANGUAGE_H
 
-#include "llmemory.h"
+#include "llmemory.h"   // LLSingleton<>
 #include "llevent.h"
 
 class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLSimpleListener
diff --git a/linden/indra/newview/llagentpilot.cpp b/linden/indra/newview/llagentpilot.cpp
index f2a1903..8286c4d 100644
--- a/linden/indra/newview/llagentpilot.cpp
+++ b/linden/indra/newview/llagentpilot.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llagentpilot.h b/linden/indra/newview/llagentpilot.h
index a1da4c2..983d473 100644
--- a/linden/indra/newview/llagentpilot.h
+++ b/linden/indra/newview/llagentpilot.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llanimstatelabels.cpp b/linden/indra/newview/llanimstatelabels.cpp
index 3e78c33..199f203 100644
--- a/linden/indra/newview/llanimstatelabels.cpp
+++ b/linden/indra/newview/llanimstatelabels.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llanimstatelabels.h b/linden/indra/newview/llanimstatelabels.h
index db1c1d8..c1fe7fd 100644
--- a/linden/indra/newview/llanimstatelabels.h
+++ b/linden/indra/newview/llanimstatelabels.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llappearance.h b/linden/indra/newview/llappearance.h
index ee8c22c..994cc33 100644
--- a/linden/indra/newview/llappearance.h
+++ b/linden/indra/newview/llappearance.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index b2bfccf..4ab5d8d 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -192,35 +192,22 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
-extern void disable_win_error_reporting();
 
 #if LL_DARWIN
-#include <Carbon/Carbon.h>
 extern void init_apple_menu(const char* product);
-extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
-#include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
-
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-BOOL gHandleKeysAsync = 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()
 F32 gSimFrames;
 
-std::string gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
-
-BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
-
 BOOL gAllowIdleAFK = TRUE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
@@ -246,7 +233,7 @@ F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
 F32 gFrameDTClamped = 0.f;                                      // Time between adjacent checks to network for packets
 U64     gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
 U32 gFrameStalls = 0;
-const F64 FRAME_STALL_THRESHOLD = 5.0;
+const F64 FRAME_STALL_THRESHOLD = 1.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
@@ -316,6 +303,7 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
+LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
 
 void idle_afk_check()
 {
@@ -331,8 +319,7 @@ static void ui_audio_callback(const LLUUID& uuid)
 {
         if (gAudiop)
         {
-                F32 volume = gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI");
-                gAudiop->triggerSound(uuid, gAgent.getID(), volume);
+                gAudiop->triggerSound(uuid, gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
         }
 }
 
@@ -419,7 +406,6 @@ static void settings_to_globals()
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
         gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
-        gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
         LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
@@ -498,30 +484,17 @@ void LLAppViewer::initGridChoice()
         }
 }
 
-bool send_url_to_other_instance(const std::string& url)
+//virtual
+bool LLAppViewer::initSLURLHandler()
 {
-#if LL_WINDOWS
-        wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
-        mbstowcs(window_class, sWindowClass, 255);
-        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;
-                COPYDATASTRUCT cds;
-                const S32 SLURL_MESSAGE_TYPE = 0;
-                cds.dwData = SLURL_MESSAGE_TYPE;
-                cds.cbData = url.length() + 1;
-                cds.lpData = (void*)url.c_str();
-
-                LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
-                lldebugs << "SendMessage(WM_COPYDATA) to other window '" 
-                                 << gWindowTitle << "' returned " << msg_result << llendl;
-                return true;
-        }
-#endif
+        // does nothing unless subclassed
+        return false;
+}
+
+//virtual
+bool LLAppViewer::sendURLToOtherInstance(const std::string& url)
+{
+        // does nothing unless subclassed
         return false;
 }
 
@@ -690,6 +663,7 @@ bool LLAppViewer::init()
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
         LLWeb::initClass();                       // do this after LLUI
+
         LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
                                 &LLURLDispatcher::dispatchFromTextEditor,
                                 &LLURLDispatcher::dispatchFromTextEditor);
@@ -710,7 +684,6 @@ bool LLAppViewer::init()
         // load MIME type -> media impl mappings
         LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
-
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();
         // Setup settings listeners
@@ -721,6 +694,9 @@ bool LLAppViewer::init()
         // Find partition serial number (Windows) or hardware serial (Mac)
         mSerialNumber = generateSerialNumber();
 
+        // do any necessary set-up for accepting incoming SLURLs from apps
+        initSLURLHandler();
+
         if(false == initHardwareTest())
         {
                 // Early out from user choice.
@@ -851,7 +827,10 @@ bool LLAppViewer::init()
                 }
 
         }
-        
+
+        // save the graphics card
+        gDebugInfo["GraphicsCard"] = LLFeatureManager::getInstance()->getGPUString();
+
         // Save the current version to the prefs file
         gSavedSettings.setString("LastRunVersion", gCurrentVersion);
 
@@ -896,16 +875,21 @@ bool LLAppViewer::mainLoop()
                 {
                         LLFastTimer t(LLFastTimer::FTM_FRAME);
                         
+                        pingMainloopTimeout("Main:MiscNativeWindowEvents");
+                        
+                        {
+                                LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
+                                gViewerWindow->mWindow->processMiscNativeEvents();
+                        }
+                        
                         pingMainloopTimeout("Main:GatherInput");
                         
                         {
                                 LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
-                        #if LL_WINDOWS
-                                if (!LLWinDebug::checkExceptionHandler())
+                                if (!restoreErrorTrap())
                                 {
-                                        llwarns << " Someone took over my exception handler (post messagehandling)!" << llendl;
+                                        llwarns << " Someone took over my signal/exception handler (post messagehandling)!" << llendl;
                                 }
-                        #endif
 
                                 gViewerWindow->mWindow->gatherInput();
                         }
@@ -961,7 +945,7 @@ bool LLAppViewer::mainLoop()
                                         
                                         resumeMainloopTimeout();
                                 }
-
+ 
                                 if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
                                 {
                                         pauseMainloopTimeout();
@@ -1183,17 +1167,24 @@ bool LLAppViewer::cleanup()
         
         llinfos << "Global stuff deleted" << llendflush;
 
-#if (!defined(LL_FMOD)) || (!LL_RELEASE_FOR_DOWNLOAD)
-        // OpenAL likes to crash on exit if we *don't* explicitly shut it down.
         if (gAudiop)
         {
-                gAudiop->shutdown();
+                bool want_longname = false;
+                if (gAudiop->getDriverName(want_longname) == "FMOD")
+                {
+                        // This hack exists because fmod likes to occasionally
+                        // hang forever when shutting down, for no apparent
+                        // reason.
+                        llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
+                }
+                else
+                {
+                        gAudiop->shutdown();
+                }
+
+                delete gAudiop;
+                gAudiop = NULL;
         }
-#else
-        // This hack exists because fmod likes to occasionally hang forever
-        // when shutting down for no apparent reason.
-        llwarns << "Hack, skipping audio engine cleanup" << llendflush;
-#endif
 
         // Note: this is where LLFeatureManager::getInstance()-> used to be deleted.
 
@@ -1204,9 +1195,6 @@ bool LLAppViewer::cleanup()
         cleanupSavedSettings();
         llinfos << "Settings patched up" << llendflush;
 
-        delete gAudiop;
-        gAudiop = NULL;
-
         // delete some of the files left around in the cache.
         removeCacheFiles("*.wav");
         removeCacheFiles("*.tmp");
@@ -1375,12 +1363,15 @@ bool LLAppViewer::cleanup()
         delete sImageDecodeThread;
     sImageDecodeThread = NULL;
 
+        //Note:
+        //LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
+        //because some new image might be generated during cleaning up media. --bao
+        LLViewerMedia::cleanupClass();
         gImageList.shutdown(); // shutdown again in case a callback added something
         LLUIImageList::getInstance()->cleanUp();
         
         // This should eventually be done in LLAppViewer
-        LLImageJ2C::closeDSO();
-        LLImageFormatted::cleanupClass();
+        LLImage::cleanupClass();
         LLVFSThread::cleanupClass();
         LLLFSThread::cleanupClass();
 
@@ -1401,14 +1392,17 @@ bool LLAppViewer::cleanup()
         LLWatchdog::getInstance()->cleanup();
 
         end_messaging_system();
+        llinfos << "Message system deleted." << llendflush;
 
         // *NOTE:Mani - The following call is not thread safe. 
         LLCurl::cleanupClass();
+        llinfos << "LLCurl cleaned up." << llendflush;
 
         // 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())
         {
+                llinfos << "Launch file on quit." << llendflush;
 #if LL_WINDOWS
                 // Indicate an application is starting.
                 SetCursor(LoadCursor(NULL, IDC_WAIT));
@@ -1418,9 +1412,8 @@ bool LLAppViewer::cleanup()
                 ms_sleep(1000);
 
                 LLWeb::loadURLExternal( gLaunchFileOnQuit );
+                llinfos << "File launched." << llendflush;
         }
-        
-        LLViewerMedia::cleanupClass();
 
     llinfos << "Goodbye" << llendflush;
 
@@ -1428,6 +1421,25 @@ bool LLAppViewer::cleanup()
         return true;
 }
 
+// A callback for llerrs to call during the watchdog error.
+void watchdog_llerrs_callback(const std::string &error_string)
+{
+        gLLErrorActivated = true;
+
+#ifdef LL_WINDOWS
+        RaiseException(0,0,0,0);
+#else
+        raise(SIGQUIT);
+#endif
+}
+
+// A callback for the watchdog to call.
+void watchdog_killer_callback()
+{
+        LLError::setFatalFunction(watchdog_llerrs_callback);
+        llerrs << "Watchdog killer event" << llendl;
+}
+
 bool LLAppViewer::initThreads()
 {
 #if MEM_TRACK_MEM
@@ -1437,10 +1449,11 @@ bool LLAppViewer::initThreads()
 #endif
 
         const S32 NEVER_SUBMIT_REPORT = 2;
-        if(TRUE == gSavedSettings.getBOOL("WatchdogEnabled") 
-                && (gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT))
+        bool use_watchdog = gSavedSettings.getBOOL("WatchdogEnabled");
+        bool send_reports = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT;
+        if(use_watchdog && send_reports)
         {
-                LLWatchdog::getInstance()->init();
+                LLWatchdog::getInstance()->init(watchdog_killer_callback);
         }
 
         LLVFSThread::initClass(enable_threads && true);
@@ -1450,8 +1463,7 @@ bool LLAppViewer::initThreads()
         LLAppViewer::sImageDecodeThread = new LLWorkerThread("ImageDecode", enable_threads && true);
         LLAppViewer::sTextureCache = new LLTextureCache(enable_threads && true);
         LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), enable_threads && false);
-        LLImageWorker::initClass(LLAppViewer::getImageDecodeThread());
-        LLImageJ2C::openDSO();
+        LLImage::initClass(LLAppViewer::getImageDecodeThread());
 
         // *FIX: no error handling here!
         return true;
@@ -1883,22 +1895,6 @@ bool LLAppViewer::initConfiguration()
         //              llerrs << "Failed to parse skin definition." << llendl;
         //      }
 
-        //      LLXmlTreeNode* rootp = skin_def_tree.getRoot();
-        //      LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
-        //      if (disabled_message_node)
-        //      {
-        //              gDisabledMessage = disabled_message_node->getContents();
-        //      }
-
-        //      static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
-        //      rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
-
-        //      // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
-        //      // Just set gHideLinks instead.
-        //      static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
-        //      BOOL silent_update;
-        //      rootp->getFastAttributeBOOL(silent_string, silent_update);
-        //      gHideLinks = (gHideLinks || silent_update);
         //}
 
 #if LL_DARWIN
@@ -1951,7 +1947,7 @@ bool LLAppViewer::initConfiguration()
 #endif
         LLStringUtil::truncate(gWindowTitle, 255);
 
-        //RN: if we received a URL, hand it off to the existing instance
+        //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
@@ -1966,7 +1962,7 @@ bool LLAppViewer::initConfiguration()
         }
         if (!slurl.empty())
         {
-                if (send_url_to_other_instance(slurl))
+                if (sendURLToOtherInstance(slurl))
                 {
                         // successfully handed off URL to existing instance, exit
                         return false;
@@ -1997,7 +1993,7 @@ bool LLAppViewer::initConfiguration()
                 }
 
                 initMarkerFile();
-
+                
 #if LL_SEND_CRASH_REPORTS
                 if (gLastExecEvent == LAST_EXEC_FROZE)
                 {
@@ -2019,52 +2015,8 @@ bool LLAppViewer::initConfiguration()
                         {
                                 llinfos << "Sending crash report." << llendl;
 
-#if LL_WINDOWS
-                                std::string exe_path = gDirUtilp->getAppRODataDir();
-                                exe_path += gDirUtilp->getDirDelimiter();
-                                exe_path += "win_crash_logger.exe";
-
-                                std::string arg_string = "-previous ";
-                                // Spawn crash logger.
-                                // NEEDS to wait until completion, otherwise log files will get smashed.
-                                _spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-#elif LL_DARWIN
-                                std::string command_str;
-                                command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger ";
-                                command_str += "-previous";
-                                // XXX -- We need to exit fullscreen mode for this to work.
-                                // XXX -- system() also doesn't wait for completion.  Hmm...
-                                system(command_str.c_str());            /* Flawfinder: Ignore */
-#elif LL_LINUX || LL_SOLARIS
-                                std::string cmd =gDirUtilp->getAppRODataDir();
-                                cmd += gDirUtilp->getDirDelimiter();
-#if LL_LINUX
-                                cmd += "linux-crash-logger.bin";
-#else // LL_SOLARIS
-                                cmd += "bin/solaris-crash-logger";
-#endif // LL_LINUX
-                                char* const cmdargv[] =
-                                        {(char*)cmd.c_str(),
-                                         (char*)"-previous",
-                                         NULL};
-                                fflush(NULL); // flush all buffers before the child inherits them
-                                pid_t pid = fork();
-                                if (pid == 0)
-                                { // child
-                                        execv(cmd.c_str(), cmdargv);            /* Flawfinder: Ignore */
-                                        llwarns << "execv failure when trying to start " << cmd << llendl;
-                                        _exit(1); // avoid atexit()
-                                } else {
-                                        if (pid > 0)
-                                        {
-                                                // wait for child proc to die
-                                                int childExitStatus;
-                                                waitpid(pid, &childExitStatus, 0);
-                                        } else {
-                                                llwarns << "fork failure." << llendl;
-                                        }
-                                }
-#endif
+                                bool report_freeze = true;
+                                handleCrashReporting(report_freeze);
                         }
                         else
                         {
@@ -2229,7 +2181,6 @@ void LLAppViewer::cleanupSavedSettings()
 
         gSavedSettings.setF32("MapScale", gMapScale );
         gSavedSettings.setF32("MiniMapScale", gMiniMapScale );
-        gSavedSettings.setBOOL("AsyncKeyboard", gHandleKeysAsync);
         gSavedSettings.setBOOL("ShowHoverTips", LLHoverView::sShowHoverTips);
 
         // Some things are cached in LLAgent.
@@ -2271,7 +2222,7 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
         gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
         gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-                
+
         // The user is not logged on yet, but record the current grid choice login url
         // which may have been the intended grid. This can b
         gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
@@ -2282,6 +2233,13 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["MainloopThreadID"] = (S32)thread_id;
 #endif
 
+        // "CrashNotHandled" is set here, while things are running well,
+        // in case of a freeze. If there is a freeze, the crash logger will be launched
+        // and can read this value from the debug_info.log.
+        // If the crash is handled by LLAppViewer::handleViewerCrash, ie not a freeze,
+        // then the value of "CrashNotHandled" will be set to true.
+        gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
+        
         // Dump some debugging info
         LL_INFOS("SystemInfo") << gCurrentVersion << LL_ENDL;
 
@@ -2358,6 +2316,10 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+        gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
+        gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+        gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
+
         if(gLogoutInProgress)
         {
                 gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
@@ -2383,6 +2345,9 @@ void LLAppViewer::handleViewerCrash()
                 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
         }
         
+        // The crash is being handled here so set this value to false.
+        // Otherwise the crash logger will think this crash was a freeze.
+        gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)false;
     
         //Write out the crash status file
         //Use marker file style setup, as that's the simplest, especially since
@@ -2466,24 +2431,23 @@ bool LLAppViewer::anotherInstanceRunning()
                 {
                         // Another instance is running. Skip the rest of these operations.
                         LL_INFOS("MarkerFile") << "Marker file is locked." << LL_ENDL;
-                        return TRUE;
+                        return true;
                 }
                 if (apr_file_lock(fMarker, APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) //flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
                 {
                         apr_file_close(fMarker);
                         LL_INFOS("MarkerFile") << "Marker file is locked." << LL_ENDL;
-                        return TRUE;
+                        return true;
                 }
                 // No other instances; we'll lock this file now & delete on quit.
                 apr_file_close(fMarker);
         }
         LL_DEBUGS("MarkerFile") << "Marker file isn't locked." << LL_ENDL;
-        return FALSE;
+        return false;
 }
 
 void LLAppViewer::initMarkerFile()
 {
-
         //First, check for the existence of other files.
         //There are marker files for two different types of crashes
         
@@ -2738,7 +2702,7 @@ bool LLAppViewer::initCache()
         
         // Init the texture cache
         // Allocate 80% of the cache size for textures
-        BOOL read_only = mSecondInstance ? true : false;
+        BOOL read_only = mSecondInstance ? TRUE : FALSE;
         const S32 MB = 1024*1024;
         S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
         const S64 MAX_CACHE_SIZE = 1024*MB;
@@ -3539,12 +3503,12 @@ void LLAppViewer::sendLogoutRequest()
                 if (mLogoutMarkerFile)
                 {
                         llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
+                apr_file_close(mLogoutMarkerFile);
                 }
                 else
                 {
                         llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
                 }
-                apr_file_close(mLogoutMarkerFile);
         }
 }
 
@@ -3765,6 +3729,11 @@ void LLAppViewer::forceErrorSoftwareException()
     throw; 
 }
 
+void LLAppViewer::forceErrorDriverCrash()
+{
+        glDeleteTextures(1, NULL);
+}
+
 void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs)
 {
         if(!mMainloopTimeout)
@@ -3807,6 +3776,11 @@ void LLAppViewer::pauseMainloopTimeout()
 
 void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 {
+//      if(!restoreErrorTrap())
+//      {
+//              llwarns << "!!!!!!!!!!!!! Its an error trap!!!!" << state << llendl;
+//      }
+        
         if(mMainloopTimeout)
         {
                 if(secs < 0.0f)
@@ -3819,3 +3793,42 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
         }
 }
 
+void LLAppViewer::handleLoginComplete()
+{
+        initMainloopTimeout("Mainloop Init");
+
+        // Store some data to DebugInfo in case of a freeze.
+        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"] = gSavedSettings.getString("ClientSettingsFile");
+        gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
+        gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
+        gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+
+        if(gAgent.getRegion())
+        {
+                gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
+                gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
+        }
+
+        if(LLAppViewer::instance()->mMainloopTimeout)
+        {
+                gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
+        }
+        writeDebugInfo();
+}
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 58dc835..9583982 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -77,7 +77,9 @@ public:
         // Report true if under the control of a debugger. A null-op default.
         virtual bool beingDebugged() { return false; } 
 
-        virtual void handleCrashReporting() = 0; // What to do with crash report?
+        virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism.
+                                             // return false if the error trap needed restoration.
+        virtual void handleCrashReporting(bool reportFreeze = false) = 0; // What to do with crash report?
         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.
@@ -112,6 +114,7 @@ public:
     virtual void forceErrorBadMemoryAccess();
     virtual void forceErrorInifiniteLoop();
     virtual void forceErrorSoftwareException();
+    virtual void forceErrorDriverCrash();
 
         // *NOTE: There are currently 3 settings files: 
         // "Global", "PerAccount" and "CrashSettings"
@@ -136,16 +139,22 @@ public:
         void resumeMainloopTimeout(const std::string& state = "", F32 secs = -1.0f);
         void pingMainloopTimeout(const std::string& state, F32 secs = -1.0f);
 
+        // Handle the 'login completed' event.
+        // *NOTE:Mani Fix this for login abstraction!!
+        void handleLoginComplete();
+
 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 initSLURLHandler();
+        virtual bool sendURLToOtherInstance(const std::string& url);
 
-    virtual bool initParseCommandLine(LLCommandLineParser& clp) 
+        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:
@@ -211,6 +220,15 @@ private:
         // for tracking viewer<->region circuit death
         bool mAgentRegionLastAlive;
         LLUUID mAgentRegionLastID;
+
+public:
+        //some information for updater
+        typedef struct
+        {
+                std::string mUpdateExePath;
+                std::ostringstream mParams;
+        }LLUpdaterInfo ;
+        static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
@@ -221,9 +239,6 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
 
-extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & llviewermenu.cpp
-extern std::string gDisabledMessage; // llstartup
-extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 
 extern BOOL     gAllowIdleAFK;
diff --git a/linden/indra/newview/llappviewerlinux.cpp b/linden/indra/newview/llappviewerlinux.cpp
index 0a4a9cf..ad90b82 100644
--- a/linden/indra/newview/llappviewerlinux.cpp
+++ b/linden/indra/newview/llappviewerlinux.cpp
@@ -1,10 +1,10 @@
 /**
  * @file llappviewerlinux.cpp
- * @brief The LLAppViewerWin32 class definitions
+ * @brief The LLAppViewerLinux class definitions
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -36,8 +36,10 @@
 #include "llcommandlineparser.h"
 
 #include "llmemtype.h"
+#include "llurldispatcher.h"            // SLURL from other app instance
 #include "llviewernetwork.h"
 #include "llviewercontrol.h"
+#include "llwindowsdl.h"
 #include "llmd5.h"
 #include "llfindlocale.h"
 
@@ -60,6 +62,17 @@
 # include "ELFIO/ELFIO.h"               // for better backtraces
 #endif
 
+#if LL_DBUS_ENABLED
+# include "llappviewerlinux_api_dbus.h"
+
+// regrettable hacks to give us better runtime compatibility with older systems inside llappviewerlinux_api.h:
+#define llg_return_if_fail(COND) do{if (!(COND)) return;}while(0)
+#undef g_return_if_fail
+#define g_return_if_fail(COND) llg_return_if_fail(COND)
+// The generated API
+# include "llappviewerlinux_api.h"
+#endif
+
 namespace
 {
         int gArgC = 0;
@@ -321,6 +334,193 @@ bool LLAppViewerLinux::init()
         return LLAppViewer::init();
 }
 
+bool LLAppViewerLinux::restoreErrorTrap()
+{
+        // *NOTE:Mani there is a case for implementing this or the mac.
+        // Linux doesn't need it to my knowledge.
+        return true;
+}
+
+/////////////////////////////////////////
+#if LL_DBUS_ENABLED
+
+typedef struct
+{
+        GObjectClass parent_class;
+} ViewerAppAPIClass;
+
+static void viewerappapi_init(ViewerAppAPI *server);
+static void viewerappapi_class_init(ViewerAppAPIClass *klass);
+
+///
+
+// regrettable hacks to give us better runtime compatibility with older systems in general
+static GType llg_type_register_static_simple_ONCE(GType parent_type,
+                                                  const gchar *type_name,
+                                                  guint class_size,
+                                                  GClassInitFunc class_init,
+                                                  guint instance_size,
+                                                  GInstanceInitFunc instance_init,
+                                                  GTypeFlags flags)
+{
+        static GTypeInfo type_info;
+        memset(&type_info, 0, sizeof(type_info));
+
+        type_info.class_size = class_size;
+        type_info.class_init = class_init;
+        type_info.instance_size = instance_size;
+        type_info.instance_init = instance_init;
+
+        return g_type_register_static(parent_type, type_name, &type_info, flags);
+}
+#define llg_intern_static_string(S) (S)
+#define g_intern_static_string(S) llg_intern_static_string(S)
+#define g_type_register_static_simple(parent_type, type_name, class_size, class_init, instance_size, instance_init, flags) llg_type_register_static_simple_ONCE(parent_type, type_name, class_size, class_init, instance_size, instance_init, flags)
+
+G_DEFINE_TYPE(ViewerAppAPI, viewerappapi, G_TYPE_OBJECT);
+
+void viewerappapi_class_init(ViewerAppAPIClass *klass)
+{
+}
+
+static bool dbus_server_init = false;
+
+void viewerappapi_init(ViewerAppAPI *server)
+{
+        // Connect to the default DBUS, register our service/API.
+
+        if (!dbus_server_init)
+        {
+                GError *error = NULL;
+                
+                server->connection = lldbus_g_bus_get(DBUS_BUS_SESSION, &error);
+                if (server->connection)
+                {
+                        lldbus_g_object_type_install_info(viewerappapi_get_type(), &dbus_glib_viewerapp_object_info);
+                        
+                        lldbus_g_connection_register_g_object(server->connection, VIEWERAPI_PATH, G_OBJECT(server));
+                        
+                        DBusGProxy *serverproxy = lldbus_g_proxy_new_for_name(server->connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+
+                        guint request_name_ret_unused;
+                        // akin to org_freedesktop_DBus_request_name
+                        if (lldbus_g_proxy_call(serverproxy, "RequestName", &error, G_TYPE_STRING, VIEWERAPI_SERVICE, G_TYPE_UINT, 0, G_TYPE_INVALID, G_TYPE_UINT, &request_name_ret_unused, G_TYPE_INVALID))
+                        {
+                                // total success.
+                                dbus_server_init = true;
+                        }
+                        else 
+                        {
+                                llwarns << "Unable to register service name: " << error->message << llendl;
+                        }
+        
+                        g_object_unref(serverproxy);
+                }
+                else
+                {
+                        g_warning("Unable to connect to dbus: %s", error->message);
+                }
+
+                if (error)
+                        g_error_free(error);
+        }
+}
+
+gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error)
+{
+        bool success = false;
+
+        llinfos << "Was asked to go to slurl: " << slurl << llendl;
+
+        const bool from_external_browser = true;
+        if (LLURLDispatcher::dispatch(slurl, from_external_browser))
+        {
+                // bring window to foreground, as it has just been "launched" from a URL
+                // todo: hmm, how to get there from here?
+                //xxx->mWindow->bringToFront();
+                success = true;
+        }               
+
+        *success_rtn = g_new (gboolean, 1);
+        (*success_rtn)[0] = (gboolean)success;
+
+        return TRUE; // the invokation succeeded, even if the actual dispatch didn't.
+}
+
+///
+
+//virtual
+bool LLAppViewerLinux::initSLURLHandler()
+{
+        if (!grab_dbus_syms(DBUSGLIB_DYLIB_DEFAULT_NAME))
+        {
+                return false; // failed
+        }
+
+        g_type_init();
+
+        //ViewerAppAPI *api_server = (ViewerAppAPI*)
+        g_object_new(viewerappapi_get_type(), NULL);
+
+        return true;
+}
+
+//virtual
+bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
+{
+        if (!grab_dbus_syms(DBUSGLIB_DYLIB_DEFAULT_NAME))
+        {
+                return false; // failed
+        }
+
+        bool success = false;
+        DBusGConnection *bus;
+        GError *error = NULL;
+
+        g_type_init();
+        
+        bus = lldbus_g_bus_get (DBUS_BUS_SESSION, &error);
+        if (bus)
+        {
+                gboolean rtn = FALSE;
+                DBusGProxy *remote_object =
+                        lldbus_g_proxy_new_for_name(bus, VIEWERAPI_SERVICE, VIEWERAPI_PATH, VIEWERAPI_INTERFACE);
+
+                if (lldbus_g_proxy_call(remote_object, "GoSLURL", &error,
+                                        G_TYPE_STRING, url.c_str(), G_TYPE_INVALID,
+                                       G_TYPE_BOOLEAN, &rtn, G_TYPE_INVALID))
+                {
+                        success = rtn;
+                }
+                else
+                {
+                        llinfos << "Call-out to other instance failed (perhaps not running): " << error->message << llendl;
+                }
+
+                g_object_unref(G_OBJECT(remote_object));
+        }
+        else
+        {
+                llwarns << "Couldn't connect to session bus: " << error->message << llendl;
+        }
+
+        if (error)
+                g_error_free(error);
+        
+        return success;
+}
+
+#else // LL_DBUS_ENABLED
+bool LLAppViewerLinux::initSLURLHandler()
+{
+        return false; // not implemented without dbus
+}
+bool LLAppViewerLinux::sendURLToOtherInstance(const std::string& url)
+{
+        return false; // not implemented without dbus
+}
+#endif // LL_DBUS_ENABLED
+
 void LLAppViewerLinux::handleSyncCrashTrace()
 {
         // This backtrace writes into stack_trace.log
@@ -331,57 +531,90 @@ void LLAppViewerLinux::handleSyncCrashTrace()
 #  endif // LL_ELFBIN
 }
 
-void LLAppViewerLinux::handleCrashReporting()
+void LLAppViewerLinux::handleCrashReporting(bool reportFreeze)
 {
-        const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-
-        // 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 != cb)
-        {       
-                // launch the actual crash logger
-                const char* ask_dialog = "-dialog";
-                if (CRASH_BEHAVIOR_ASK != cb)
-                        ask_dialog = ""; // omit '-dialog' option
-                std::string cmd =gDirUtilp->getAppRODataDir();
-                cmd += gDirUtilp->getDirDelimiter();
-                cmd += "linux-crash-logger.bin";
-                const char * cmdargv[] =
-                        {cmd.c_str(),
-                         ask_dialog,
-                         "-user",
-                         (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
-                         "-name",
-                         LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+        std::string cmd =gDirUtilp->getAppRODataDir();
+        cmd += gDirUtilp->getDirDelimiter();
+#if LL_LINUX
+        cmd += "linux-crash-logger.bin";
+#else // LL_SOLARIS
+        cmd += "bin/solaris-crash-logger";
+#endif // LL_LINUX
+
+        if(reportFreeze)
+        {
+                char* const cmdargv[] =
+                        {(char*)cmd.c_str(),
+                         (char*)"-previous",
                          NULL};
-                fflush(NULL);
+
+                fflush(NULL); // flush all buffers before the child inherits them
                 pid_t pid = fork();
                 if (pid == 0)
                 { // child
-                        execv(cmd.c_str(), (char* const*) cmdargv);             /* Flawfinder: ignore */
+                        execv(cmd.c_str(), cmdargv);            /* Flawfinder: Ignore */
                         llwarns << "execv failure when trying to start " << cmd << llendl;
                         _exit(1); // avoid atexit()
-                } 
-                else
-                {
+                } else {
                         if (pid > 0)
                         {
-                                // DO NOT wait for child proc to die; we want
-                                // the logger to outlive us while we quit to
-                                // free up the screen/keyboard/etc.
-                                ////int childExitStatus;
-                                ////waitpid(pid, &childExitStatus, 0);
+                                // wait for child proc to die
+                                int childExitStatus;
+                                waitpid(pid, &childExitStatus, 0);
+                        } else {
+                                llwarns << "fork failure." << llendl;
+                        }
+                }
+        }
+        else
+        {
+                const S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+
+                // 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 != cb)
+                {       
+                        // launch the actual crash logger
+                        const char* ask_dialog = "-dialog";
+                        if (CRASH_BEHAVIOR_ASK != cb)
+                                ask_dialog = ""; // omit '-dialog' option
+                        const char * cmdargv[] =
+                                {cmd.c_str(),
+                                 ask_dialog,
+                                 "-user",
+                                 (char*)LLViewerLogin::getInstance()->getGridLabel().c_str(),
+                                 "-name",
+                                 LLAppViewer::instance()->getSecondLifeTitle().c_str(),
+                                 NULL};
+                        fflush(NULL);
+                        pid_t pid = fork();
+                        if (pid == 0)
+                        { // child
+                                execv(cmd.c_str(), (char* const*) cmdargv);             /* Flawfinder: ignore */
+                                llwarns << "execv failure when trying to start " << cmd << llendl;
+                                _exit(1); // avoid atexit()
                         } 
                         else
                         {
-                                llwarns << "fork failure." << llendl;
+                                if (pid > 0)
+                                {
+                                        // DO NOT wait for child proc to die; we want
+                                        // the logger to outlive us while we quit to
+                                        // free up the screen/keyboard/etc.
+                                        ////int childExitStatus;
+                                        ////waitpid(pid, &childExitStatus, 0);
+                                } 
+                                else
+                                {
+                                        llwarns << "fork failure." << llendl;
+                                }
                         }
                 }
+                // 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); // avoid atexit(), else we may re-crash in dtors.
         }
-        // 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); // avoid atexit(), else we may re-crash in dtors.
 }
 
 bool LLAppViewerLinux::beingDebugged()
diff --git a/linden/indra/newview/llappviewerlinux.h b/linden/indra/newview/llappviewerlinux.h
index a180b4d..b464e48 100644
--- a/linden/indra/newview/llappviewerlinux.h
+++ b/linden/indra/newview/llappviewerlinux.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,6 +32,14 @@
 #ifndef LL_LLAPPVIEWERLINUX_H
 #define LL_LLAPPVIEWERLINUX_H
 
+#if LL_DBUS_ENABLED
+extern "C" {
+# include <glib.h>
+# include <glib-object.h>
+# include <dbus/dbus-glib.h>
+}
+#endif
+
 #ifndef LL_LLAPPVIEWER_H
 #include "llappviewer.h"
 #endif
@@ -49,15 +57,37 @@ public:
         //
         virtual bool init();                    // Override to do application initialization
         std::string generateSerialNumber();
+        bool setupSLURLHandler();
 
 protected:
         virtual bool beingDebugged();
-
-        virtual void handleCrashReporting();
+        
+        virtual bool restoreErrorTrap();
+        virtual void handleCrashReporting(bool reportFreeze);
         virtual void handleSyncCrashTrace();
 
         virtual bool initLogging();
         virtual bool initParseCommandLine(LLCommandLineParser& clp);
+
+        virtual bool initSLURLHandler();
+        virtual bool sendURLToOtherInstance(const std::string& url);
 };
 
+#if LL_DBUS_ENABLED
+typedef struct
+{
+        GObject parent;
+        DBusGConnection *connection;
+} ViewerAppAPI;
+
+extern "C" {
+        gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error);
+}
+
+#define VIEWERAPI_SERVICE "com.secondlife.ViewerAppAPIService"
+#define VIEWERAPI_PATH "/com/secondlife/ViewerAppAPI"
+#define VIEWERAPI_INTERFACE "com.secondlife.ViewerAppAPI"
+
+#endif // LL_DBUS_ENABLED
+
 #endif // LL_LLAPPVIEWERLINUX_H
diff --git a/linden/indra/newview/llappviewerlinux_api.h b/linden/indra/newview/llappviewerlinux_api.h
new file mode 100644
index 0000000..e05e1c7
--- /dev/null
+++ b/linden/indra/newview/llappviewerlinux_api.h
@@ -0,0 +1,148 @@
+/* Generated by dbus-binding-tool; do not edit! */
+/**
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */ 
+
+#ifndef __dbus_glib_marshal_viewerapp_MARSHAL_H__
+#define __dbus_glib_marshal_viewerapp_MARSHAL_H__
+
+#include        <glib-object.h>
+
+G_BEGIN_DECLS
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v)      g_value_get_int (v)
+#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
+#define g_marshal_value_peek_long(v)     g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
+#define g_marshal_value_peek_float(v)    g_value_get_float (v)
+#define g_marshal_value_peek_double(v)   g_value_get_double (v)
+#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v)    g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v)   g_value_get_object (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ *          Do not access GValues directly in your code. Instead, use the
+ *          g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
+#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
+#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
+#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* BOOLEAN:STRING,POINTER,POINTER (/tmp/dbus-binding-tool-c-marshallers.5XXD8T:1) */
+extern void dbus_glib_marshal_viewerapp_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
+                                                                         GValue       *return_value,
+                                                                         guint         n_param_values,
+                                                                         const GValue *param_values,
+                                                                         gpointer      invocation_hint,
+                                                                         gpointer      marshal_data);
+void
+dbus_glib_marshal_viewerapp_BOOLEAN__STRING_POINTER_POINTER (GClosure     *closure,
+                                                             GValue       *return_value,
+                                                             guint         n_param_values,
+                                                             const GValue *param_values,
+                                                             gpointer      invocation_hint,
+                                                             gpointer      marshal_data)
+{
+  typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (gpointer     data1,
+                                                                    gpointer     arg_1,
+                                                                    gpointer     arg_2,
+                                                                    gpointer     arg_3,
+                                                                    gpointer     data2);
+  register GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
+
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 4);
+
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_marshal_value_peek_string (param_values + 1),
+                       g_marshal_value_peek_pointer (param_values + 2),
+                       g_marshal_value_peek_pointer (param_values + 3),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
+}
+
+G_END_DECLS
+
+#endif /* __dbus_glib_marshal_viewerapp_MARSHAL_H__ */
+
+#include <dbus/dbus-glib.h>
+static const DBusGMethodInfo dbus_glib_viewerapp_methods[] = {
+  { (GCallback) viewer_app_api_GoSLURL, dbus_glib_marshal_viewerapp_BOOLEAN__STRING_POINTER_POINTER, 0 },
+};
+
+const DBusGObjectInfo dbus_glib_viewerapp_object_info = {
+  0,
+  dbus_glib_viewerapp_methods,
+  1,
+"com.secondlife.ViewerAppAPI\0GoSLURL\0S\0slurl\0I\0s\0success_ret\0O\0F\0N\0b\0\0\0",
+"\0",
+"\0"
+};
+
diff --git a/linden/indra/newview/llappviewerlinux_api.xml b/linden/indra/newview/llappviewerlinux_api.xml
new file mode 100644
index 0000000..fac35b7
--- /dev/null
+++ b/linden/indra/newview/llappviewerlinux_api.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- dbus-binding-tool -mode=glib-server llappviewerlinux_api.xml -prefix=viewerapp -output=llappviewerlinux_api.h -->
+
+<node name="/com/secondlife/ViewerAppAPI">
+  <interface name="com.secondlife.ViewerAppAPI">
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="viewer_app_api"/>
+    <method name="GoSLURL">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="viewer_app_api_GoSLURL"/>
+      <arg type="s" name="slurl" direction="in" />
+      <arg type="b" name="success_ret" direction="out" />
+    </method>
+  </interface>
+</node>
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus.cpp b/linden/indra/newview/llappviewerlinux_api_dbus.cpp
new file mode 100644
index 0000000..623d048
--- /dev/null
+++ b/linden/indra/newview/llappviewerlinux_api_dbus.cpp
@@ -0,0 +1,131 @@
+/** 
+ * @file llappviewerlinux_api_dbus.cpp
+ * @brief dynamic DBus symbol-grabbing code
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if LL_DBUS_ENABLED
+
+#include "linden_common.h"
+
+extern "C" {
+#include <dbus/dbus-glib.h>
+
+#include "apr_pools.h"
+#include "apr_dso.h"
+}
+
+#define DEBUGMSG(...) lldebugs << llformat(__VA_ARGS__) << llendl
+#define INFOMSG(...) llinfos << llformat(__VA_ARGS__) << llendl
+#define WARNMSG(...) llwarns << llformat(__VA_ARGS__) << llendl
+
+#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) RTN (*ll##DBUSSYM)(__VA_ARGS__) = NULL
+#include "llappviewerlinux_api_dbus_syms_raw.inc"
+#undef LL_DBUS_SYM
+
+static bool sSymsGrabbed = false;
+static apr_pool_t *sSymDBUSDSOMemoryPool = NULL;
+static apr_dso_handle_t *sSymDBUSDSOHandleG = NULL;
+
+bool grab_dbus_syms(std::string dbus_dso_name)
+{
+        if (sSymsGrabbed)
+        {
+                // already have grabbed good syms
+                return TRUE;
+        }
+
+        bool sym_error = false;
+        bool rtn = false;
+        apr_status_t rv;
+        apr_dso_handle_t *sSymDBUSDSOHandle = NULL;
+
+#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##DBUSSYM, sSymDBUSDSOHandle, #DBUSSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #DBUSSYM); if (REQUIRED) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #DBUSSYM, (void*)ll##DBUSSYM);}while(0)
+
+        //attempt to load the shared library
+        apr_pool_create(&sSymDBUSDSOMemoryPool, NULL);
+  
+        if ( APR_SUCCESS == (rv = apr_dso_load(&sSymDBUSDSOHandle,
+                                               dbus_dso_name.c_str(),
+                                               sSymDBUSDSOMemoryPool) ))
+        {
+                INFOMSG("Found DSO: %s", dbus_dso_name.c_str());
+
+#include "llappviewerlinux_api_dbus_syms_raw.inc"
+      
+                if ( sSymDBUSDSOHandle )
+                {
+                        sSymDBUSDSOHandleG = sSymDBUSDSOHandle;
+                        sSymDBUSDSOHandle = NULL;
+                }
+      
+                rtn = !sym_error;
+        }
+        else
+        {
+                INFOMSG("Couldn't load DSO: %s", dbus_dso_name.c_str());
+                rtn = false; // failure
+        }
+
+        if (sym_error)
+        {
+                WARNMSG("Failed to find necessary symbols in DBUS-GLIB libraries.");
+        }
+#undef LL_DBUS_SYM
+
+        sSymsGrabbed = rtn;
+        return rtn;
+}
+
+
+void ungrab_dbus_syms()
+{ 
+        // should be safe to call regardless of whether we've
+        // actually grabbed syms.
+
+        if ( sSymDBUSDSOHandleG )
+        {
+                apr_dso_unload(sSymDBUSDSOHandleG);
+                sSymDBUSDSOHandleG = NULL;
+        }
+        
+        if ( sSymDBUSDSOMemoryPool )
+        {
+                apr_pool_destroy(sSymDBUSDSOMemoryPool);
+                sSymDBUSDSOMemoryPool = NULL;
+        }
+        
+        // NULL-out all of the symbols we'd grabbed
+#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) do{ll##DBUSSYM = NULL;}while(0)
+#include "llappviewerlinux_api_dbus_syms_raw.inc"
+#undef LL_DBUS_SYM
+
+        sSymsGrabbed = false;
+}
+
+#endif // LL_DBUS_ENABLED
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus.h b/linden/indra/newview/llappviewerlinux_api_dbus.h
new file mode 100644
index 0000000..920602b
--- /dev/null
+++ b/linden/indra/newview/llappviewerlinux_api_dbus.h
@@ -0,0 +1,49 @@
+/** 
+ * @file llappviewerlinux_api_dbus.h
+ * @brief DBus-glib symbol handling
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#if LL_DBUS_ENABLED
+
+extern "C" {
+#include <dbus/dbus-glib.h>
+}
+
+#define DBUSGLIB_DYLIB_DEFAULT_NAME "libdbus-glib-1.so.2"
+
+bool grab_dbus_syms(std::string dbus_dso_name);
+void ungrab_dbus_syms();
+
+#define LL_DBUS_SYM(REQUIRED, DBUSSYM, RTN, ...) extern RTN (*ll##DBUSSYM)(__VA_ARGS__)
+#include "llappviewerlinux_api_dbus_syms_raw.inc"
+#undef LL_DBUS_SYM
+
+#endif // LL_DBUS_ENABLED
diff --git a/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc b/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc
new file mode 100644
index 0000000..c0548e2
--- /dev/null
+++ b/linden/indra/newview/llappviewerlinux_api_dbus_syms_raw.inc
@@ -0,0 +1,9 @@
+
+// required symbols to grab
+LL_DBUS_SYM(true, dbus_g_bus_get, DBusGConnection*, DBusBusType, GError**);
+LL_DBUS_SYM(true, dbus_g_proxy_new_for_name, DBusGProxy*, DBusGConnection*, const char *, const char*, const char*);
+LL_DBUS_SYM(true, dbus_g_proxy_call, gboolean, DBusGProxy*, const char*, GError**, GType, ...);
+LL_DBUS_SYM(true, dbus_g_object_type_install_info, void, GType, const DBusGObjectInfo*);
+LL_DBUS_SYM(true, dbus_g_connection_register_g_object, void, DBusGConnection*, const char*, GObject*);
+
+// optional symbols to grab
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index 68c3a16..0e5062d 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -48,12 +48,25 @@
 #include "llurldispatcher.h"
 #include <Carbon/Carbon.h>
 #include "lldir.h"
+#include <signal.h>
+
 namespace 
 {
         // The command line args stored.
         // They are not used immediately by the app.
         int gArgC;
         char** gArgV;
+        
+        bool sCrashReporterIsRunning = false;
+        
+        OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
+        {
+                OSErr result = noErr;
+                
+                LLAppViewer::instance()->userQuit();
+                
+                return(result);
+        }
 }
 
 int main( int argc, char **argv ) 
@@ -193,22 +206,189 @@ bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
     return true;
 }
 
+// *FIX:Mani It would be nice to provide a clean interface to get the
+// default_unix_signal_handler for the LLApp class.
+extern void default_unix_signal_handler(int, siginfo_t *, void *);
+bool LLAppViewerMacOSX::restoreErrorTrap()
+{
+        // This method intends to reinstate signal handlers.
+        // *NOTE:Mani It was found that the first execution of a shader was overriding
+        // our initial signal handlers somehow.
+        // This method will be called (at least) once per mainloop execution.
+        // *NOTE:Mani The signals used below are copied over from the 
+        // setup_signals() func in LLApp.cpp
+        // LLApp could use some way of overriding that func, but for this viewer
+        // fix I opt to avoid affecting the server code.
+        
+        // Set up signal handlers that may result in program termination
+        //
+        struct sigaction act;
+        struct sigaction old_act;
+        act.sa_sigaction = default_unix_signal_handler;
+        sigemptyset( &act.sa_mask );
+        act.sa_flags = SA_SIGINFO;
+        
+        unsigned int reset_count = 0;
+        
+#define SET_SIG(S)      sigaction(SIGABRT, &act, &old_act); \
+                                        if((unsigned int)act.sa_sigaction != (unsigned int) old_act.sa_sigaction) \
+                                                ++reset_count;
+        // Synchronous signals
+        SET_SIG(SIGABRT)
+        SET_SIG(SIGALRM)
+        SET_SIG(SIGBUS)
+        SET_SIG(SIGFPE)
+        SET_SIG(SIGHUP) 
+        SET_SIG(SIGILL)
+        SET_SIG(SIGPIPE)
+        SET_SIG(SIGSEGV)
+        SET_SIG(SIGSYS)
+        
+        SET_SIG(LL_HEARTBEAT_SIGNAL)
+        SET_SIG(LL_SMACKDOWN_SIGNAL)
+        
+        // Asynchronous signals that are normally ignored
+        SET_SIG(SIGCHLD)
+        SET_SIG(SIGUSR2)
+        
+        // Asynchronous signals that result in attempted graceful exit
+        SET_SIG(SIGHUP)
+        SET_SIG(SIGTERM)
+        SET_SIG(SIGINT)
+        
+        // Asynchronous signals that result in core
+        SET_SIG(SIGQUIT)        
+#undef SET_SIG
+        
+        return reset_count == 0;
+}
+
 void LLAppViewerMacOSX::handleSyncCrashTrace()
 {
         // do nothing
 }
 
-void LLAppViewerMacOSX::handleCrashReporting()
+static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef, 
+                                                                   EventRef inEvent, 
+                                                                   void* inUserData)
+{
+    ProcessSerialNumber psn;
+        
+    GetEventParameter(inEvent, 
+                                          kEventParamProcessID, 
+                                          typeProcessSerialNumber, 
+                                          NULL, 
+                                          sizeof(psn), 
+                                          NULL, 
+                                          &psn);
+        
+    if( GetEventKind(inEvent) == kEventAppTerminated ) 
+        {
+                Boolean matching_psn = FALSE;   
+                OSErr os_result = SameProcess(&psn, (ProcessSerialNumber*)inUserData, &matching_psn);
+                if(os_result >= 0 && matching_psn)
+                {
+                        sCrashReporterIsRunning = false;
+                }
+    }
+    return noErr;
+}
+
+void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
 {
-        // Macintosh
+        // This used to use fork&exec, but is switched to LSOpenApplication to 
+        // Make sure the crash reporter launches in front of the SL window.
+        
         std::string command_str;
-        command_str += "open mac-crash-logger.app";     
+        //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app";
+        command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger";
         
-        clear_signals();
-        llinfos << "Launching crash reporter using: '" << command_str << "'" << llendl;
-        system(command_str.c_str());            /* Flawfinder: ignore */
-        llinfos << "returned from crash reporter... dying" << llendl;   
-        _exit(1);
+        FSRef appRef;
+        Boolean isDir = 0;
+        OSStatus os_result = FSPathMakeRef((UInt8*)command_str.c_str(),
+                                                                           &appRef,
+                                                                           &isDir);
+        if(os_result >= 0)
+        {
+                LSApplicationParameters appParams;
+                memset(&appParams, 0, sizeof(appParams));
+                appParams.version = 0;
+                appParams.flags = kLSLaunchNoParams | kLSLaunchStartClassic;
+                appParams.application = &appRef;
+                
+                if(reportFreeze)
+                {
+                        // Make sure freeze reporting launches the crash logger synchronously, lest 
+                        // Log files get changed by SL while the logger is running.
+                
+                        // *NOTE:Mani A better way - make a copy of the data that the crash reporter will send
+                        // and let SL go about its business. This way makes the mac work like windows and linux
+                        // and is the smallest patch for the issue. 
+                        sCrashReporterIsRunning = true;
+                        ProcessSerialNumber o_psn;
+
+                        static EventHandlerRef sCarbonEventsRef = NULL;
+                        static const EventTypeSpec kEvents[] = 
+                        {
+                                { kEventClassApplication, kEventAppTerminated }
+                        };
+                        
+                        // Install the handler to detect crash logger termination
+                        InstallEventHandler(GetApplicationEventTarget(), 
+                                                                (EventHandlerUPP) CarbonEventHandler,
+                                                                GetEventTypeCount(kEvents),
+                                                                kEvents,
+                                                                &o_psn,
+                                                                &sCarbonEventsRef
+                                                                );
+                        
+                        // Remove, temporarily the quit handler - which has *crash* behavior before 
+                        // the mainloop gets running!
+                        AERemoveEventHandler(kCoreEventClass, 
+                                                                 kAEQuitApplication, 
+                                                                 NewAEEventHandlerUPP(AEQuitHandler),
+                                                                 false);
+
+                        // Launch the crash reporter.
+                        os_result = LSOpenApplication(&appParams, &o_psn);
+                        
+                        if(os_result >= 0)
+                        {       
+                                EventRecord evt;
+                                while(sCrashReporterIsRunning)
+                                {
+                                        while(WaitNextEvent(osMask, &evt, 0, NULL))
+                                        {
+                                                // null op!?!
+                                        }
+                                }
+                        }       
+
+                        // Re-install the apps quit handler.
+                        AEInstallEventHandler(kCoreEventClass, 
+                                                                  kAEQuitApplication, 
+                                                                  NewAEEventHandlerUPP(AEQuitHandler),
+                                                                  0, 
+                                                                  false);
+                        
+                        // Remove the crash reporter quit handler.
+                        RemoveEventHandler(sCarbonEventsRef);
+                }
+                else
+                {
+                        appParams.flags |= kLSLaunchAsync;
+                        clear_signals();
+
+                        ProcessSerialNumber o_psn;
+                        os_result = LSOpenApplication(&appParams, &o_psn);
+                }
+                
+        }
+
+        if(!reportFreeze)
+        {
+                _exit(1);
+        }
 }
 
 std::string LLAppViewerMacOSX::generateSerialNumber()
@@ -267,15 +447,6 @@ OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
         return(result);
 }
 
-OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn)
-{
-        OSErr result = noErr;
-        
-        LLAppViewer::instance()->userQuit();
-        
-        return(result);
-}
-
 OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata)
 {
         OSStatus result = eventNotHandledErr;
diff --git a/linden/indra/newview/llappviewermacosx.h b/linden/indra/newview/llappviewermacosx.h
index 0d8c460..1cb2713 100644
--- a/linden/indra/newview/llappviewermacosx.h
+++ b/linden/indra/newview/llappviewermacosx.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -49,7 +49,8 @@ public:
 
 
 protected:
-        virtual void handleCrashReporting(); 
+        virtual bool restoreErrorTrap();
+        virtual void handleCrashReporting(bool reportFreeze); 
         virtual void handleSyncCrashTrace();
 
         std::string generateSerialNumber();
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 9f37534..b68cad6 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -64,7 +64,7 @@
 
 #include "llcommandlineparser.h"
 
-//*FIX:Mani - This hack is to fix a linker issue with libndofdev.lib
+// *FIX:Mani - This hack is to fix a linker issue with libndofdev.lib
 // The lib was compiled under VS2005 - in VS2003 we need to remap assert
 #ifdef LL_DEBUG
 #ifdef LL_MSVC7 
@@ -77,12 +77,15 @@ extern "C" {
 #endif
 #endif
 
+const std::string LLAppViewerWin32::sWindowClass = "Second Life";
+
 LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop)
 {
     // *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
-        
+        //OSMessageBox("Attach Debugger Now", "Error", OSMB_OK);
     // Translate the signals/exceptions into cross-platform stuff
         // Windows implementation
+    _tprintf( _T("Entering Windows Exception Handler...\n") );
         llinfos << "Entering Windows Exception Handler..." << llendl;
 
         // Make sure the user sees something to indicate that the app crashed.
@@ -90,7 +93,9 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 
         if (LLApp::isError())
         {
+            _tprintf( _T("Got another fatal signal while in the error handler, die now!\n") );
                 llwarns << "Got another fatal signal while in the error handler, die now!" << llendl;
+
                 retval = EXCEPTION_EXECUTE_HANDLER;
                 return retval;
         }
@@ -119,7 +124,28 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
         return retval;
 }
 
+// Create app mutex creates a unique global windows object. 
+// If the object can be created it returns true, otherwise
+// it returns false. The false result can be used to determine 
+// if another instance of a second life app (this vers. or later)
+// is running.
+// *NOTE: Do not use this method to run a single instance of the app.
+// This is intended to help debug problems with the cross-platform 
+// locked file method used for that purpose.
+bool create_app_mutex()
+{
+        bool result = true;
+        LPCWSTR unique_mutex_name = L"SecondLifeAppMutex";
+        HANDLE hMutex;
+        hMutex = CreateMutex(NULL, TRUE, unique_mutex_name); 
+        if(GetLastError() == ERROR_ALREADY_EXISTS) 
+        {     
+                result = false;
+        }
+        return result;
+}
 
+//#define DEBUGGING_SEH_FILTER 1
 #if DEBUGGING_SEH_FILTER
 #       define WINMAIN DebuggingWinMain
 #else
@@ -146,6 +172,10 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
         
         viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
+        // Set a debug info flag to indicate if multiple instances are running.
+        bool found_other_instance = !create_app_mutex();
+        gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance);
+
         bool ok = viewer_app_ptr->init();
         if(!ok)
         {
@@ -195,6 +225,16 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
         }
         delete viewer_app_ptr;
         viewer_app_ptr = NULL;
+
+        //start updater
+        if(LLAppViewer::sUpdaterInfo)
+        {
+                _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
+
+                delete LLAppViewer::sUpdaterInfo ;
+                LLAppViewer::sUpdaterInfo = NULL ;
+        }
+
         return 0;
 }
 
@@ -324,6 +364,17 @@ bool LLAppViewerWin32::cleanup()
         return result;
 }
 
+bool LLAppViewerWin32::initLogging()
+{
+        // Remove the crash stack log from previous executions.
+        // Since we've started logging a new instance of the app, we can assume 
+        // *NOTE: This should happen before the we send a 'previous instance froze'
+        // crash report, but it must happen after we initialize the DirUtil.
+        LLWinDebug::clearCrashStacks();
+
+        return LLAppViewer::initLogging();
+}
+
 void LLAppViewerWin32::initConsole()
 {
         // pop up debug console
@@ -405,7 +456,7 @@ bool LLAppViewerWin32::initHardwareTest()
                 LLSplashScreen::update(splash_msg.str());
         }
 
-        if (!LLWinDebug::checkExceptionHandler())
+        if (!restoreErrorTrap())
         {
                 LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
         }
@@ -445,39 +496,69 @@ bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
         return true;
 }
 
+bool LLAppViewerWin32::restoreErrorTrap()
+{
+        return LLWinDebug::checkExceptionHandler();
+}
+
 void LLAppViewerWin32::handleSyncCrashTrace()
 {
         // do nothing
 }
 
-void LLAppViewerWin32::handleCrashReporting()
+void LLAppViewerWin32::handleCrashReporting(bool reportFreeze)
 {
-        // Windows only behaivor. Spawn win crash reporter.
-        std::string exe_path = gDirUtilp->getAppRODataDir();
+        const char* logger_name = "win_crash_logger.exe";
+        std::string exe_path = gDirUtilp->getExecutableDir();
         exe_path += gDirUtilp->getDirDelimiter();
-        exe_path += "win_crash_logger.exe";
+        exe_path += logger_name;
 
-        std::string arg_string = "-user ";
-        arg_string += LLViewerLogin::getInstance()->getGridLabel();
-        
-        S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-        switch(cb)
+        const char* arg_str = logger_name;
+
+        // *NOTE:Mani - win_crash_logger.exe no longer parses command line options.
+        if(reportFreeze)
         {
-        case CRASH_BEHAVIOR_ASK:
-        default:
-                arg_string += " -dialog ";
-                _spawnl(_P_NOWAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-                break;
-
-        case CRASH_BEHAVIOR_ALWAYS_SEND:
-                _spawnl(_P_NOWAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-                break;
-
-        case CRASH_BEHAVIOR_NEVER_SEND:
-                break;
+                // Spawn crash logger.
+                // NEEDS to wait until completion, otherwise log files will get smashed.
+                _spawnl(_P_WAIT, exe_path.c_str(), arg_str, NULL);
         }
+        else
+        {
+                S32 cb = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
+                if(cb != CRASH_BEHAVIOR_NEVER_SEND)
+                {
+                        _spawnl(_P_NOWAIT, exe_path.c_str(), arg_str, NULL);
+                }
+        }
+}
+
+//virtual
+bool LLAppViewerWin32::sendURLToOtherInstance(const std::string& url)
+{
+        wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
+        mbstowcs(window_class, sWindowClass.c_str(), 255);
+        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 '" << getWindowTitle() << "'" << llendl;
+                COPYDATASTRUCT cds;
+                const S32 SLURL_MESSAGE_TYPE = 0;
+                cds.dwData = SLURL_MESSAGE_TYPE;
+                cds.cbData = url.length() + 1;
+                cds.lpData = (void*)url.c_str();
+
+                LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
+                lldebugs << "SendMessage(WM_COPYDATA) to other window '" 
+                                 << getWindowTitle() << "' returned " << msg_result << llendl;
+                return true;
+        }
+        return false;
 }
 
+
 std::string LLAppViewerWin32::generateSerialNumber()
 {
         char serial_md5[MD5HEX_STR_SIZE];               // Flawfinder: ignore
diff --git a/linden/indra/newview/llappviewerwin32.h b/linden/indra/newview/llappviewerwin32.h
index fe16ec4..3812c43 100644
--- a/linden/indra/newview/llappviewerwin32.h
+++ b/linden/indra/newview/llappviewerwin32.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -49,15 +49,21 @@ public:
         virtual bool cleanup();
 
 protected:
+        virtual bool initLogging(); // Override to clean stack_trace info.
         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 bool restoreErrorTrap();
+        virtual void handleCrashReporting(bool reportFreeze); 
         virtual void handleSyncCrashTrace();
 
+        virtual bool sendURLToOtherInstance(const std::string& url);
+
         std::string generateSerialNumber();
 
+        static const std::string sWindowClass;
+
 private:
         void disableWinErrorReporting();
 
diff --git a/linden/indra/newview/llassetuploadqueue.cpp b/linden/indra/newview/llassetuploadqueue.cpp
index f645828..5bd0b63 100644
--- a/linden/indra/newview/llassetuploadqueue.cpp
+++ b/linden/indra/newview/llassetuploadqueue.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llassetuploadqueue.h b/linden/indra/newview/llassetuploadqueue.h
index 7c98a99..f375e49 100644
--- a/linden/indra/newview/llassetuploadqueue.h
+++ b/linden/indra/newview/llassetuploadqueue.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 2d40e94..be3882e 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index dd74c13..92b3c88 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llaudiosourcevo.cpp b/linden/indra/newview/llaudiosourcevo.cpp
index 9c25d94..6e0caad 100644
--- a/linden/indra/newview/llaudiosourcevo.cpp
+++ b/linden/indra/newview/llaudiosourcevo.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -39,7 +39,7 @@
 #include "llviewerparcelmgr.h"
 
 LLAudioSourceVO::LLAudioSourceVO(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain, LLViewerObject *objectp)
-: LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX), 
+        :       LLAudioSource(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX), 
         mObjectp(objectp), 
         mActualGain(gain)
 {
diff --git a/linden/indra/newview/llaudiosourcevo.h b/linden/indra/newview/llaudiosourcevo.h
index 7e07491..f5eba1f 100644
--- a/linden/indra/newview/llaudiosourcevo.h
+++ b/linden/indra/newview/llaudiosourcevo.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llbbox.cpp b/linden/indra/newview/llbbox.cpp
index 98db7b7..19cbe6d 100644
--- a/linden/indra/newview/llbbox.cpp
+++ b/linden/indra/newview/llbbox.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llbbox.h b/linden/indra/newview/llbbox.h
index 5242a9b..debf932 100644
--- a/linden/indra/newview/llbbox.h
+++ b/linden/indra/newview/llbbox.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llbox.cpp b/linden/indra/newview/llbox.cpp
index 1e6d282..2e9b022 100644
--- a/linden/indra/newview/llbox.cpp
+++ b/linden/indra/newview/llbox.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -81,7 +81,7 @@ void LLBox::renderface(S32 which_face)
                 {7, 4, 0, 3}
         };
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
                 //gGL.normal3fv(&normals[which_face][0]);
                 gGL.texCoord2f(1,0);
                 gGL.vertex3fv(&mVertex[ faces[which_face][0] ][0]);
diff --git a/linden/indra/newview/llbox.h b/linden/indra/newview/llbox.h
index b9fdc35..7ba7173 100644
--- a/linden/indra/newview/llbox.h
+++ b/linden/indra/newview/llbox.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcallbacklist.cpp b/linden/indra/newview/llcallbacklist.cpp
index 3f6fcce..e233ab7 100644
--- a/linden/indra/newview/llcallbacklist.cpp
+++ b/linden/indra/newview/llcallbacklist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcallbacklist.h b/linden/indra/newview/llcallbacklist.h
index 5c03909..d1e1246 100644
--- a/linden/indra/newview/llcallbacklist.h
+++ b/linden/indra/newview/llcallbacklist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 3252b30..b7fd3b0 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 13709cd..cbcb237 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcaphttpsender.cpp b/linden/indra/newview/llcaphttpsender.cpp
index a227931..e3eca6f 100644
--- a/linden/indra/newview/llcaphttpsender.cpp
+++ b/linden/indra/newview/llcaphttpsender.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcaphttpsender.h b/linden/indra/newview/llcaphttpsender.h
index d4b4747..0a05cd1 100644
--- a/linden/indra/newview/llcaphttpsender.h
+++ b/linden/indra/newview/llcaphttpsender.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 31fa653..84ebf98 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -553,15 +553,17 @@ void LLChatBar::onInputEditorGainFocus( LLFocusableElement* caller, void* userda
 // static
 void LLChatBar::onClickSay( LLUICtrl* ctrl, void* userdata )
 {
-        LLChatBar* self = (LLChatBar*) userdata;
+        e_chat_type chat_type = CHAT_TYPE_NORMAL;
         if (ctrl->getValue().asString() == "shout")
         {
-                self->sendChat( CHAT_TYPE_SHOUT );
+                chat_type = CHAT_TYPE_SHOUT;
         }
-        else
+        else if (ctrl->getValue().asString() == "whisper")
         {
-                self->sendChat( CHAT_TYPE_NORMAL );
+                chat_type = CHAT_TYPE_WHISPER;
         }
+        LLChatBar* self = (LLChatBar*) userdata;
+        self->sendChat(chat_type);
 }
 
 void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 93aaaa4..72c797a 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llclassifiedinfo.cpp b/linden/indra/newview/llclassifiedinfo.cpp
index 6a830cf..3ff2882 100644
--- a/linden/indra/newview/llclassifiedinfo.cpp
+++ b/linden/indra/newview/llclassifiedinfo.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llclassifiedinfo.h b/linden/indra/newview/llclassifiedinfo.h
index ce648f7..496d138 100644
--- a/linden/indra/newview/llclassifiedinfo.h
+++ b/linden/indra/newview/llclassifiedinfo.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llclassifiedstatsresponder.cpp b/linden/indra/newview/llclassifiedstatsresponder.cpp
index 48aef45..6e7ff89 100644
--- a/linden/indra/newview/llclassifiedstatsresponder.cpp
+++ b/linden/indra/newview/llclassifiedstatsresponder.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llclassifiedstatsresponder.h b/linden/indra/newview/llclassifiedstatsresponder.h
index cedd481..775daf4 100644
--- a/linden/indra/newview/llclassifiedstatsresponder.h
+++ b/linden/indra/newview/llclassifiedstatsresponder.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index 92199a7..754a3a7 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcloud.h b/linden/indra/newview/llcloud.h
index a28119d..33e9685 100644
--- a/linden/indra/newview/llcloud.h
+++ b/linden/indra/newview/llcloud.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp
index 460f1a2..3b12acf 100644
--- a/linden/indra/newview/llcolorscheme.cpp
+++ b/linden/indra/newview/llcolorscheme.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h
index bf1e053..9660042 100644
--- a/linden/indra/newview/llcolorscheme.h
+++ b/linden/indra/newview/llcolorscheme.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcolorswatch.cpp b/linden/indra/newview/llcolorswatch.cpp
index d2a0aba..954bd9a 100644
--- a/linden/indra/newview/llcolorswatch.cpp
+++ b/linden/indra/newview/llcolorswatch.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcolorswatch.h b/linden/indra/newview/llcolorswatch.h
index 5db9ea5..159e7b2 100644
--- a/linden/indra/newview/llcolorswatch.h
+++ b/linden/indra/newview/llcolorswatch.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcommandhandler.cpp b/linden/indra/newview/llcommandhandler.cpp
index 6e7014c..154fc51 100644
--- a/linden/indra/newview/llcommandhandler.cpp
+++ b/linden/indra/newview/llcommandhandler.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcommandhandler.h b/linden/indra/newview/llcommandhandler.h
index 8bad6b4..d12fd19 100644
--- a/linden/indra/newview/llcommandhandler.h
+++ b/linden/indra/newview/llcommandhandler.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcommandlineparser.cpp b/linden/indra/newview/llcommandlineparser.cpp
index dc6a1e2..d1cf9a7 100644
--- a/linden/indra/newview/llcommandlineparser.cpp
+++ b/linden/indra/newview/llcommandlineparser.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -416,11 +416,6 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
                        const std::string& 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
@@ -457,7 +452,7 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
         default:
             {
                 // For the default types, let llsd do the conversion.
-                if(value.size() > 1)
+                if(value.size() > 1 && ctrl->isType(TYPE_LLSD))
                 {
                     // Assume its an array...
                     LLSD llsdArray;
@@ -472,6 +467,11 @@ void setControlValueCB(const LLCommandLineParser::token_vector_t& value,
                 }
                 else if(value.size() > 0)
                 {
+                                        if(value.size() > 1)
+                                        {
+                                                llwarns << "Ignoring extra tokens mapped to the setting: " << opt_name << "." << llendl; 
+                                        }
+
                     LLSD llsdValue;
                     llsdValue.assign(LLSD::String(value[0]));
                     ctrl->setValue(llsdValue, false);
diff --git a/linden/indra/newview/llcommandlineparser.h b/linden/indra/newview/llcommandlineparser.h
index 601a255..be296b5 100644
--- a/linden/indra/newview/llcommandlineparser.h
+++ b/linden/indra/newview/llcommandlineparser.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcompass.cpp b/linden/indra/newview/llcompass.cpp
index f4dbbb8..03a431e 100644
--- a/linden/indra/newview/llcompass.cpp
+++ b/linden/indra/newview/llcompass.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcompass.h b/linden/indra/newview/llcompass.h
index 4f1498f..3d4139b 100644
--- a/linden/indra/newview/llcompass.h
+++ b/linden/indra/newview/llcompass.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index b4f1a22..422c2a7 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -61,6 +61,8 @@
 #include "lluictrlfactory.h"
 #include "llselectmgr.h"
 
+#include "llselectmgr.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llcompilequeue.h b/linden/indra/newview/llcompilequeue.h
index 6a3a10a..470ba96 100644
--- a/linden/indra/newview/llcompilequeue.h
+++ b/linden/indra/newview/llcompilequeue.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llconfirmationmanager.cpp b/linden/indra/newview/llconfirmationmanager.cpp
index 0e56452..18e73c6 100644
--- a/linden/indra/newview/llconfirmationmanager.cpp
+++ b/linden/indra/newview/llconfirmationmanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llconfirmationmanager.h b/linden/indra/newview/llconfirmationmanager.h
index 0b8dedb..bfbfdc1 100644
--- a/linden/indra/newview/llconfirmationmanager.h
+++ b/linden/indra/newview/llconfirmationmanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 3ee11ff..941c9ca 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llconsole.h b/linden/indra/newview/llconsole.h
index ec5cd31..91fc821 100644
--- a/linden/indra/newview/llconsole.h
+++ b/linden/indra/newview/llconsole.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcontainerview.cpp b/linden/indra/newview/llcontainerview.cpp
index dbec409..c052f99 100644
--- a/linden/indra/newview/llcontainerview.cpp
+++ b/linden/indra/newview/llcontainerview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -88,7 +88,7 @@ BOOL LLContainerView::handleMouseUp(S32 x, S32 y, MASK mask)
 void LLContainerView::draw()
 {
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4(0.f, 0.f, 0.f, 0.25f));
         }
diff --git a/linden/indra/newview/llcontainerview.h b/linden/indra/newview/llcontainerview.h
index a65f7a7..93d2520 100644
--- a/linden/indra/newview/llcontainerview.h
+++ b/linden/indra/newview/llcontainerview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcurrencyuimanager.cpp b/linden/indra/newview/llcurrencyuimanager.cpp
index ddacd3b..e1880e8 100644
--- a/linden/indra/newview/llcurrencyuimanager.cpp
+++ b/linden/indra/newview/llcurrencyuimanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcurrencyuimanager.h b/linden/indra/newview/llcurrencyuimanager.h
index 858cc5c..8dde42e 100644
--- a/linden/indra/newview/llcurrencyuimanager.h
+++ b/linden/indra/newview/llcurrencyuimanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcylinder.cpp b/linden/indra/newview/llcylinder.cpp
index c05a380..f36781f 100644
--- a/linden/indra/newview/llcylinder.cpp
+++ b/linden/indra/newview/llcylinder.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llcylinder.h b/linden/indra/newview/llcylinder.h
index b4ec9c6..7ccd470 100644
--- a/linden/indra/newview/llcylinder.h
+++ b/linden/indra/newview/llcylinder.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldebugmessagebox.cpp b/linden/indra/newview/lldebugmessagebox.cpp
index c8596f0..dfd6955 100644
--- a/linden/indra/newview/lldebugmessagebox.cpp
+++ b/linden/indra/newview/lldebugmessagebox.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldebugmessagebox.h b/linden/indra/newview/lldebugmessagebox.h
index 6e333b5..ec70ff1 100644
--- a/linden/indra/newview/lldebugmessagebox.h
+++ b/linden/indra/newview/lldebugmessagebox.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp
index 69d724e..b3c9c8a 100644
--- a/linden/indra/newview/lldebugview.cpp
+++ b/linden/indra/newview/lldebugview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldebugview.h b/linden/indra/newview/lldebugview.h
index aaa1f57..3a4f02b 100644
--- a/linden/indra/newview/lldebugview.h
+++ b/linden/indra/newview/lldebugview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldelayedgestureerror.cpp b/linden/indra/newview/lldelayedgestureerror.cpp
index 6c7f967..3924640 100644
--- a/linden/indra/newview/lldelayedgestureerror.cpp
+++ b/linden/indra/newview/lldelayedgestureerror.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldelayedgestureerror.h b/linden/indra/newview/lldelayedgestureerror.h
index e7e059f..26775e1 100644
--- a/linden/indra/newview/lldelayedgestureerror.h
+++ b/linden/indra/newview/lldelayedgestureerror.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldirpicker.cpp b/linden/indra/newview/lldirpicker.cpp
index b0868b5..e9044e3 100644
--- a/linden/indra/newview/lldirpicker.cpp
+++ b/linden/indra/newview/lldirpicker.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldirpicker.h b/linden/indra/newview/lldirpicker.h
index e9b2d0e..72e158b 100644
--- a/linden/indra/newview/lldirpicker.h
+++ b/linden/indra/newview/lldirpicker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index e058681..16b282b 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -362,6 +362,7 @@ void LLDrawable::makeActive()
                 if (pcode == LLViewerObject::LL_VO_WATER ||
                         pcode == LLViewerObject::LL_VO_SURFACE_PATCH ||
                         pcode == LLViewerObject::LL_VO_PART_GROUP ||
+                        pcode == LLViewerObject::LL_VO_HUD_PART_GROUP ||
                         pcode == LLViewerObject::LL_VO_CLOUDS ||
                         pcode == LLViewerObject::LL_VO_GROUND ||
                         pcode == LLViewerObject::LL_VO_SKY)
@@ -1392,7 +1393,10 @@ BOOL LLDrawable::isAnimating() const
         {
                 return TRUE;
         }
-
+        if (mVObjp->getPCode() == LLViewerObject::LL_VO_HUD_PART_GROUP)
+        {
+                return TRUE;
+        }
         if (mVObjp->getPCode() == LLViewerObject::LL_VO_CLOUDS)
         {
                 return TRUE;
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h
index 76ba3f5..15ad2e1 100644
--- a/linden/indra/newview/lldrawable.h
+++ b/linden/indra/newview/lldrawable.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpool.cpp b/linden/indra/newview/lldrawpool.cpp
index 9d8bd0a..fe4a405 100644
--- a/linden/indra/newview/lldrawpool.cpp
+++ b/linden/indra/newview/lldrawpool.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -194,7 +194,8 @@ S32 LLFacePool::drawLoopSetTex(face_array_t& face_list, S32 stage)
                          iter != face_list.end(); iter++)
                 {
                         LLFace *facep = *iter;
-                        facep->bindTexture(stage);
+                        gGL.getTexUnit(stage)->bind(facep->getTexture());
+                        gGL.getTexUnit(0)->activate();
                         res += facep->renderIndexed();
                 }
         }
@@ -395,7 +396,7 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
         {
                 if (params.mTexture.notNull())
                 {
-                        params.mTexture->bind();
+                        gGL.getTexUnit(0)->bind(params.mTexture.get());
                         if (params.mTextureMatrix)
                         {
                                 glMatrixMode(GL_TEXTURE);
@@ -406,14 +407,14 @@ void LLRenderPass::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
                 }
                 else
                 {
-                        LLImageGL::unbindTexture(0);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 }
         }
         
         if (params.mVertexBuffer.notNull())
         {
                 params.mVertexBuffer->setBuffer(mask);
-                params.mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+                params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
                 gPipeline.addTrianglesDrawn(params.mCount/3);
         }
 
diff --git a/linden/indra/newview/lldrawpool.h b/linden/indra/newview/lldrawpool.h
index 3c80aef..30049ec 100644
--- a/linden/indra/newview/lldrawpool.h
+++ b/linden/indra/newview/lldrawpool.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolalpha.cpp b/linden/indra/newview/lldrawpoolalpha.cpp
index 28263b2..2452ee8 100644
--- a/linden/indra/newview/lldrawpoolalpha.cpp
+++ b/linden/indra/newview/lldrawpoolalpha.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -129,7 +129,7 @@ void LLDrawPoolAlpha::render(S32 pass)
                 gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
                 glColor4f(1,0,0,1);
                 LLViewerImage::sSmokeImagep->addTextureStats(1024.f*1024.f);
-        LLViewerImage::sSmokeImagep->bind();
+                gGL.getTexUnit(0)->bind(LLViewerImage::sSmokeImagep.get());
                 renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX |
                                                         LLVertexBuffer::MAP_TEXCOORD);
         }
@@ -170,7 +170,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
                                 LLRenderPass::applyModelMatrix(params);
 
                                 params.mVertexBuffer->setBuffer(mask);
-                                params.mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+                                params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
                                 gPipeline.addTrianglesDrawn(params.mCount/3);
                         }
                 }
@@ -231,7 +231,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
                 if (texture && params.mTexture.notNull())
                 {
                         gGL.getTexUnit(0)->activate();
-                        params.mTexture->bind();
+                        gGL.getTexUnit(0)->bind(params.mTexture.get());
                         params.mTexture->addTextureStats(params.mVSize);
                         if (params.mTextureMatrix)
                         {
@@ -288,7 +288,7 @@ void LLDrawPoolAlpha::renderGroupAlpha(LLSpatialGroup* group, U32 type, U32 mask
                 }
 
                 params.mVertexBuffer->setBuffer(mask);
-                params.mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+                params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
                 gPipeline.addTrianglesDrawn(params.mCount/3);
 
                 if (params.mTextureMatrix && texture && params.mTexture.notNull())
diff --git a/linden/indra/newview/lldrawpoolalpha.h b/linden/indra/newview/lldrawpoolalpha.h
index b717398..a7a5730 100644
--- a/linden/indra/newview/lldrawpoolalpha.h
+++ b/linden/indra/newview/lldrawpoolalpha.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index 97ff072..7ab6428 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -396,7 +396,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
         {
                 
                 /* // debug code to draw a cube in place of avatar
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLVector3 pos = avatarp->getPositionAgent();
 
                 gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f);
@@ -495,17 +495,17 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
         {
                 if (LLVOAvatar::sShowCollisionVolumes)
                 {
-                        LLGLSNoTexture no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         avatarp->renderCollisionVolumes();
                 }
 
                 if (avatarp->mIsSelf && LLAgent::sDebugDisplayTarget)
                 {
-                        LLGLSNoTexture gls_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLVector3 pos = avatarp->getPositionAgent();
 
                         gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
                                 gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
@@ -517,7 +517,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
                         pos = avatarp->mDrawable->getPositionAgent();
                         gGL.color4f(1.0f, 0.0f, 0.0f, 0.8f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
                                 gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
@@ -529,7 +529,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
                         pos = avatarp->mRoot.getWorldPosition();
                         gGL.color4f(1.0f, 1.0f, 1.0f, 0.8f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
                                 gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
@@ -541,7 +541,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
                         pos = avatarp->mPelvisp->getWorldPosition();
                         gGL.color4f(0.0f, 0.0f, 1.0f, 0.8f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 gGL.vertex3fv((pos - LLVector3(0.2f, 0.f, 0.f)).mV);
                                 gGL.vertex3fv((pos + LLVector3(0.2f, 0.f, 0.f)).mV);
diff --git a/linden/indra/newview/lldrawpoolavatar.h b/linden/indra/newview/lldrawpoolavatar.h
index 077764a..e14ba86 100644
--- a/linden/indra/newview/lldrawpoolavatar.h
+++ b/linden/indra/newview/lldrawpoolavatar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index 73d88f7..f345282 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -73,7 +73,6 @@ const U32 VERTEX_MASK_SHINY = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_N
 const U32 VERTEX_MASK_BUMP = LLVertexBuffer::MAP_VERTEX |LLVertexBuffer::MAP_TEXCOORD | LLVertexBuffer::MAP_TEXCOORD2;
 
 U32 LLDrawPoolBump::sVertexMask = VERTEX_MASK_SHINY;
-static LLPointer<LLCubeMap> sCubeMap;
 
 static LLGLSLShader* shader = NULL;
 static S32 cube_channel = -1;
@@ -349,27 +348,29 @@ void LLDrawPoolBump::beginShiny(bool invisible)
                                 cube_map->setMatrix(1);
                                 // Make sure that texture coord generation happens for tex unit 1, as that's the one we use for 
                                 // the cube map in the one pass shiny shaders
-                                cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+                                cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
                                 cube_map->enableTexture(cube_channel);
                                 cube_map->enableTextureCoords(1);
                                 diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
                         }
                         else
                         {
-                                cube_channel = 0;
+                                cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
                                 diffuse_channel = -1;
                                 cube_map->setMatrix(0);
-                                cube_map->enable(shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB));
+                                cube_map->enable(cube_channel);
                         }                       
-                        cube_map->bind();
+                        gGL.getTexUnit(cube_channel)->bind(cube_map);
+                        gGL.getTexUnit(0)->activate();
                 }
                 else
                 {
                         cube_channel = 0;
                         diffuse_channel = -1;
+                        gGL.getTexUnit(0)->disable();
                         cube_map->enable(0);
                         cube_map->setMatrix(0);
-                        cube_map->bind();
+                        gGL.getTexUnit(0)->bind(cube_map);
 
                         gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_TEX_COLOR);
                         gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_VERT_ALPHA);
@@ -386,8 +387,6 @@ void LLDrawPoolBump::renderShiny(bool invisible)
                 return;
         }
 
-        sCubeMap = NULL;
-
         if( gSky.mVOSkyp->getCubeMap() )
         {
                 LLGLEnable blend_enable(GL_BLEND);
@@ -423,7 +422,7 @@ void LLDrawPoolBump::endShiny(bool invisible)
 
                 if (!invisible && mVertexShaderLevel > 1)
                 {
-                        shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+                        shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
                                         
                         if (LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0)
                         {
@@ -435,18 +434,20 @@ void LLDrawPoolBump::endShiny(bool invisible)
 
                         shader->unbind();
                         gGL.getTexUnit(0)->activate();
-                        glEnable(GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
                 }
                 if (cube_channel >= 0)
                 {
+                        gGL.getTexUnit(cube_channel)->enable(LLTexUnit::TT_TEXTURE);
                         gGL.getTexUnit(cube_channel)->setTextureBlendType(LLTexUnit::TB_MULT);
                 }
         }
-        
-        gGL.getTexUnit(0)->activate();
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(diffuse_channel)->disable();
+        gGL.getTexUnit(cube_channel)->disable();
+
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
-        
+
         diffuse_channel = -1;
         cube_channel = 0;
         mShiny = FALSE;
@@ -489,12 +490,14 @@ void LLDrawPoolBump::beginFullbrightShiny()
                 cube_map->setMatrix(1);
                 // Make sure that texture coord generation happens for tex unit 1, as that's the one we use for 
                 // the cube map in the one pass shiny shaders
-                cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+                gGL.getTexUnit(1)->disable();
+                cube_channel = shader->enableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
                 cube_map->enableTexture(cube_channel);
                 cube_map->enableTextureCoords(1);
                 diffuse_channel = shader->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
 
-                cube_map->bind();
+                gGL.getTexUnit(cube_channel)->bind(cube_map);
+                gGL.getTexUnit(0)->activate();
         }
         mShiny = TRUE;
 }
@@ -507,8 +510,6 @@ void LLDrawPoolBump::renderFullbrightShiny()
                 return;
         }
 
-        sCubeMap = NULL;
-
         if( gSky.mVOSkyp->getCubeMap() )
         {
                 LLGLEnable blend_enable(GL_BLEND);
@@ -535,14 +536,13 @@ void LLDrawPoolBump::endFullbrightShiny()
                         shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
                 }
                 gGL.getTexUnit(0)->activate();
-                glEnable(GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
                 shader->unbind();
-
                 gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
         }
         
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
 
         diffuse_channel = -1;
@@ -561,7 +561,7 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL
                 applyModelMatrix(params);
 
                 params.mVertexBuffer->setBuffer(mask);
-                params.mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+                params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
                 gPipeline.addTrianglesDrawn(params.mCount/3);
         }
 }
@@ -592,15 +592,15 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params)
                 if( bump_code < LLStandardBumpmap::sStandardBumpmapCount )
                 {
                         bump = gStandardBumpmapList[bump_code].mImage;
-                        gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize, 1, 1);
+                        gBumpImageList.addTextureStats(bump_code, tex->getID(), params.mVSize);
                 }
                 break;
         }
 
         if (bump)
         {
-                bump->bind(1);
-                bump->bind(0);
+                gGL.getTexUnit(1)->bind(bump);
+                gGL.getTexUnit(0)->bind(bump);
                 return TRUE;
         }
         return FALSE;
@@ -629,7 +629,7 @@ void LLDrawPoolBump::beginBump()
         // TEXTURE UNIT 1
         gGL.getTexUnit(1)->activate();
  
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
 
         gGL.getTexUnit(1)->setTextureColorBlend(LLTexUnit::TBO_ADD_SIGNED, LLTexUnit::TBS_PREV_COLOR, LLTexUnit::TBS_ONE_MINUS_TEX_ALPHA);
         gGL.getTexUnit(1)->setTextureAlphaBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_TEX_ALPHA);
@@ -648,7 +648,7 @@ void LLDrawPoolBump::beginBump()
         gGL.getTexUnit(0)->activate();
         stop_glerror();
 
-        LLViewerImage::unbindTexture(1, GL_TEXTURE_2D);
+        gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
 //static
@@ -680,7 +680,7 @@ void LLDrawPoolBump::endBump()
 
         // Disable texture unit 1
         gGL.getTexUnit(1)->activate();
-        glDisable(GL_TEXTURE_2D); // Texture unit 1
+        gGL.getTexUnit(1)->disable();
         gGL.getTexUnit(1)->setTextureBlendType(LLTexUnit::TB_MULT);
 
         // Disable texture unit 0
@@ -734,14 +734,13 @@ LLBumpImageList::~LLBumpImageList()
 
 
 // Note: Does nothing for entries in gStandardBumpmapList that are not actually standard bump images (e.g. none, brightness, and darkness)
-void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id,
-                                                                          F32 pixel_area, F32 texel_area_ratio, F32 cos_center_angle)
+void LLBumpImageList::addTextureStats(U8 bump, const LLUUID& base_image_id, F32 virtual_size)
 {
         bump &= TEM_BUMP_MASK;
         LLViewerImage* bump_image = gStandardBumpmapList[bump].mImage;
         if( bump_image )
         {
-                bump_image->addTextureStats(pixel_area, texel_area_ratio, cos_center_angle);
+                bump_image->addTextureStats(virtual_size);
         }
 }
 
@@ -1083,17 +1082,17 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
         {
                 if (params.mTexture.notNull())
                 {
-                        params.mTexture->bind(diffuse_channel);
+                        gGL.getTexUnit(diffuse_channel)->bind(params.mTexture.get());
                         params.mTexture->addTextureStats(params.mVSize);
                 }
                 else
                 {
-                        LLImageGL::unbindTexture(0);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 }
         }
         
         params.mVertexBuffer->setBuffer(mask);
-        params.mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
+        params.mVertexBuffer->drawRange(LLRender::TRIANGLES, params.mStart, params.mEnd, params.mCount, params.mOffset);
         gPipeline.addTrianglesDrawn(params.mCount/3);
         if (params.mTextureMatrix)
         {
diff --git a/linden/indra/newview/lldrawpoolbump.h b/linden/indra/newview/lldrawpoolbump.h
index fd6e22c..7e82f7f 100644
--- a/linden/indra/newview/lldrawpoolbump.h
+++ b/linden/indra/newview/lldrawpoolbump.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -131,8 +131,7 @@ public:
 
         LLImageGL*      getBrightnessDarknessImage(LLViewerImage* src_image, U8 bump_code);
 //      LLImageGL*      getTestImage();
-        void            addTextureStats(U8 bump, const LLUUID& base_image_id,
-                                                                F32 pixel_area, F32 texel_area_ratio, F32 cos_center_angle);
+        void            addTextureStats(U8 bump, const LLUUID& base_image_id, F32 virtual_size);
 
         static void onSourceBrightnessLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata );
         static void onSourceDarknessLoaded( BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata );
diff --git a/linden/indra/newview/lldrawpoolclouds.cpp b/linden/indra/newview/lldrawpoolclouds.cpp
index a7d0b8e..fd28ec6 100644
--- a/linden/indra/newview/lldrawpoolclouds.cpp
+++ b/linden/indra/newview/lldrawpoolclouds.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolclouds.h b/linden/indra/newview/lldrawpoolclouds.h
index f7e4dda..6803aba 100644
--- a/linden/indra/newview/lldrawpoolclouds.h
+++ b/linden/indra/newview/lldrawpoolclouds.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolground.cpp b/linden/indra/newview/lldrawpoolground.cpp
index 5698027..4053e1d 100644
--- a/linden/indra/newview/lldrawpoolground.cpp
+++ b/linden/indra/newview/lldrawpoolground.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,13 +63,14 @@ void LLDrawPoolGround::prerender()
 
 void LLDrawPoolGround::render(S32 pass)
 {
-        if (mDrawFace.empty())
+        if (mDrawFace.empty() || !gSavedSettings.getBOOL("RenderGround"))
         {
                 return;
         }       
         
         LLGLSPipelineSkyBox gls_skybox;
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
 
         LLGLClampToFarClip far_clip(glh_get_current_projection());
diff --git a/linden/indra/newview/lldrawpoolground.h b/linden/indra/newview/lldrawpoolground.h
index 3bfdc14..8c8c073 100644
--- a/linden/indra/newview/lldrawpoolground.h
+++ b/linden/indra/newview/lldrawpoolground.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolsimple.cpp b/linden/indra/newview/lldrawpoolsimple.cpp
index 97efb80..a2f8675 100644
--- a/linden/indra/newview/lldrawpoolsimple.cpp
+++ b/linden/indra/newview/lldrawpoolsimple.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolsimple.h b/linden/indra/newview/lldrawpoolsimple.h
index bb14703..6b81022 100644
--- a/linden/indra/newview/lldrawpoolsimple.h
+++ b/linden/indra/newview/lldrawpoolsimple.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolsky.cpp b/linden/indra/newview/lldrawpoolsky.cpp
index e1dbf95..6aa6142 100644
--- a/linden/indra/newview/lldrawpoolsky.cpp
+++ b/linden/indra/newview/lldrawpoolsky.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -186,7 +186,7 @@ void LLDrawPoolSky::renderHeavenlyBody(U8 hb, LLFace* face)
         if (! face->getGeomCount()) return;
 
         LLImageGL* tex = face->getTexture();
-        tex->bind();
+        gGL.getTexUnit(0)->bind(tex);
         LLColor4 color(mHB[hb]->getInterpColor());
         LLOverrideFaceColor override(this, color);
         face->renderIndexed();
@@ -200,7 +200,7 @@ void LLDrawPoolSky::renderSunHalo(LLFace* face)
         if (! face->getGeomCount()) return;
 
         LLImageGL* tex = face->getTexture();
-        tex->bind();
+        gGL.getTexUnit(0)->bind(tex);
         LLColor4 color(mHB[0]->getInterpColor());
         color.mV[3] = llclamp(mHB[0]->getHaloBrighness(), 0.f, 1.f);
 
diff --git a/linden/indra/newview/lldrawpoolsky.h b/linden/indra/newview/lldrawpoolsky.h
index 282ec1d..2b22060 100644
--- a/linden/indra/newview/lldrawpoolsky.h
+++ b/linden/indra/newview/lldrawpoolsky.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolterrain.cpp b/linden/indra/newview/lldrawpoolterrain.cpp
index ccfbd2d..6067ac8 100644
--- a/linden/indra/newview/lldrawpoolterrain.cpp
+++ b/linden/indra/newview/lldrawpoolterrain.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -72,19 +72,19 @@ LLDrawPoolTerrain::LLDrawPoolTerrain(LLViewerImage *texturep) :
                                                                                                         TRUE, TRUE, GL_ALPHA8, GL_ALPHA,
                                                                                                         LLUUID("e97cf410-8e61-7005-ec06-629eba4cd1fb"));
 
-        mAlphaRampImagep->bind(0);
+        gGL.getTexUnit(0)->bind(mAlphaRampImagep.get());
         mAlphaRampImagep->setClamp(TRUE, TRUE);
 
         m2DAlphaRampImagep = gImageList.getImageFromFile("alpha_gradient_2d.j2c",
                                                                                                         TRUE, TRUE, GL_ALPHA8, GL_ALPHA,
                                                                                                         LLUUID("38b86f85-2575-52a9-a531-23108d8da837"));
 
-        m2DAlphaRampImagep->bind(0);
+        gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
         m2DAlphaRampImagep->setClamp(TRUE, TRUE);
         
         mTexturep->setBoostLevel(LLViewerImage::BOOST_TERRAIN);
         
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
 LLDrawPoolTerrain::~LLDrawPoolTerrain()
@@ -240,7 +240,7 @@ void LLDrawPoolTerrain::renderFullShader()
         // detail texture 0
         //
         S32 detail0 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL0);
-        LLViewerImage::bindTexture(detail_texture0p,detail0);
+        gGL.getTexUnit(detail0)->bind(detail_texture0p);
         gGL.getTexUnit(0)->activate();
 
         glEnable(GL_TEXTURE_GEN_S);
@@ -258,7 +258,7 @@ void LLDrawPoolTerrain::renderFullShader()
         // detail texture 1
         //
         S32 detail1 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL1); 
-        LLViewerImage::bindTexture(detail_texture1p,detail1);
+        gGL.getTexUnit(detail1)->bind(detail_texture1p);
         
         /// ALPHA TEXTURE COORDS 0:
         gGL.getTexUnit(1)->activate();
@@ -269,11 +269,11 @@ void LLDrawPoolTerrain::renderFullShader()
         // detail texture 2
         //
         S32 detail2 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL2);
-        LLViewerImage::bindTexture(detail_texture2p,detail2);
-        glEnable(GL_TEXTURE_2D);
+        gGL.getTexUnit(detail2)->bind(detail_texture2p);
+
+        gGL.getTexUnit(2)->activate();
         
         /// ALPHA TEXTURE COORDS 1:
-        gGL.getTexUnit(2)->activate();
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glTranslatef(-2.f, 0.f, 0.f);
@@ -283,7 +283,7 @@ void LLDrawPoolTerrain::renderFullShader()
         // detail texture 3
         //
         S32 detail3 = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_DETAIL3);
-        LLViewerImage::bindTexture(detail_texture3p,detail3);
+        gGL.getTexUnit(detail3)->bind(detail_texture3p);
         
         /// ALPHA TEXTURE COORDS 2:
         gGL.getTexUnit(3)->activate();
@@ -296,7 +296,7 @@ void LLDrawPoolTerrain::renderFullShader()
         // Alpha Ramp 
         //
         S32 alpha_ramp = sShader->enableTexture(LLViewerShaderMgr::TERRAIN_ALPHARAMP);
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,alpha_ramp);
+        gGL.getTexUnit(alpha_ramp)->bind(m2DAlphaRampImagep.get());
                 
         // GL_BLEND disabled by default
         drawLoop();
@@ -308,36 +308,36 @@ void LLDrawPoolTerrain::renderFullShader()
         sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL2);
         sShader->disableTexture(LLViewerShaderMgr::TERRAIN_DETAIL3);
 
-        LLImageGL::unbindTexture(alpha_ramp, GL_TEXTURE_2D);
+        gGL.getTexUnit(alpha_ramp)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(4)->disable();
         gGL.getTexUnit(4)->activate();
-        glDisable(GL_TEXTURE_2D); // Texture unit 4
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
 
-        LLImageGL::unbindTexture(detail3, GL_TEXTURE_2D);
+        gGL.getTexUnit(detail3)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(3)->disable();
         gGL.getTexUnit(3)->activate();
-        glDisable(GL_TEXTURE_2D);       
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
 
-        LLImageGL::unbindTexture(detail2, GL_TEXTURE_2D);
+        gGL.getTexUnit(detail2)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(2)->disable();
         gGL.getTexUnit(2)->activate();
-        glDisable(GL_TEXTURE_2D);               
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
 
-        LLImageGL::unbindTexture(detail1, GL_TEXTURE_2D);
+        gGL.getTexUnit(detail1)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(1)->disable();
         gGL.getTexUnit(1)->activate();
-        glDisable(GL_TEXTURE_2D);               
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
@@ -347,9 +347,9 @@ void LLDrawPoolTerrain::renderFullShader()
         //----------------------------------------------------------------------------
         // Restore Texture Unit 0 defaults
         
-        LLImageGL::unbindTexture(detail0, GL_TEXTURE_2D);
+        gGL.getTexUnit(detail0)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(0)->activate();
-        glEnable(GL_TEXTURE_2D);
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
@@ -388,7 +388,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         // Stage 0: detail texture 0
         //
         gGL.getTexUnit(0)->activate();
-        LLViewerImage::bindTexture(detail_texture0p,0);
+        gGL.getTexUnit(0)->bind(detail_texture0p);
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
         
         glEnable(GL_TEXTURE_GEN_S);
@@ -405,9 +405,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         // Stage 1: Generate alpha ramp for detail0/detail1 transition
         //
 
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,1);
+        gGL.getTexUnit(1)->bind(m2DAlphaRampImagep.get());
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
@@ -418,12 +418,13 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 2: Interpolate detail1 with existing based on ramp
         //
-        LLViewerImage::bindTexture(detail_texture1p,2);
+        gGL.getTexUnit(2)->bind(detail_texture1p);
+        gGL.getTexUnit(2)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(2)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 2
-        glClientActiveTextureARB(GL_TEXTURE2_ARB);
 
+        glClientActiveTextureARB(GL_TEXTURE2_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
         glEnable(GL_TEXTURE_GEN_S);
         glEnable(GL_TEXTURE_GEN_T);
         glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
@@ -436,9 +437,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 3: Modulate with primary (vertex) color for lighting
         //
-        LLViewerImage::bindTexture(detail_texture1p,3); // bind any texture
+        gGL.getTexUnit(3)->bind(detail_texture1p);
+        gGL.getTexUnit(3)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(3)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 3
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
 
         // Set alpha texture and do lighting modulation
@@ -456,7 +457,7 @@ void LLDrawPoolTerrain::renderFull4TU()
         // Stage 0: Write detail3 into base
         //
         gGL.getTexUnit(0)->activate();
-        LLViewerImage::bindTexture(detail_texture3p,0);
+        gGL.getTexUnit(0)->bind(detail_texture3p);
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
 
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -472,9 +473,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 1: Generate alpha ramp for detail2/detail3 transition
         //
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,1);
+        gGL.getTexUnit(1)->bind(m2DAlphaRampImagep.get());
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
 
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -492,9 +493,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 2: Interpolate detail2 with existing based on ramp
         //
-        LLViewerImage::bindTexture(detail_texture2p,2);
+        gGL.getTexUnit(2)->bind(detail_texture2p);
+        gGL.getTexUnit(2)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(2)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 2
 
         glClientActiveTextureARB(GL_TEXTURE2_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -511,9 +512,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         //
         // Stage 3: Generate alpha ramp for detail1/detail2 transition
         //
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,3);
+        gGL.getTexUnit(3)->bind(m2DAlphaRampImagep.get());
+        gGL.getTexUnit(3)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(3)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 3
 
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
         glEnableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -536,21 +537,21 @@ void LLDrawPoolTerrain::renderFull4TU()
 
         LLVertexBuffer::unbind();
         // Disable multitexture
-        LLImageGL::unbindTexture(3, GL_TEXTURE_2D);
+        gGL.getTexUnit(3)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(3)->disable();
         gGL.getTexUnit(3)->activate();
         glClientActiveTextureARB(GL_TEXTURE3_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisable(GL_TEXTURE_2D); // Texture unit 3
 
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
 
-        LLImageGL::unbindTexture(2, GL_TEXTURE_2D);
+        gGL.getTexUnit(2)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(2)->disable();
         gGL.getTexUnit(2)->activate();
         glClientActiveTextureARB(GL_TEXTURE2_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisable(GL_TEXTURE_2D); // Texture unit 2
 
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
@@ -558,11 +559,11 @@ void LLDrawPoolTerrain::renderFull4TU()
         glLoadIdentity();
         glMatrixMode(GL_MODELVIEW);
 
-        LLImageGL::unbindTexture(1, GL_TEXTURE_2D);
+        gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);       
+        gGL.getTexUnit(1)->disable();
         gGL.getTexUnit(1)->activate();
         glClientActiveTextureARB(GL_TEXTURE1_ARB);
         glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-        glDisable(GL_TEXTURE_2D); // Texture unit 1
 
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
@@ -575,9 +576,9 @@ void LLDrawPoolTerrain::renderFull4TU()
         // Restore Texture Unit 0 defaults
         
         gGL.getTexUnit(0)->activate();
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
         glClientActiveTextureARB(GL_TEXTURE0_ARB);
-        gGL.getTexUnit(0)->activate();
         glDisableClientState(GL_NORMAL_ARRAY);
 
         glDisable(GL_TEXTURE_GEN_S);
@@ -616,7 +617,7 @@ void LLDrawPoolTerrain::renderFull2TU()
         //
         // Stage 0: Render detail 0 into base
         //
-        LLViewerImage::bindTexture(detail_texture0p,0);
+        gGL.getTexUnit(0)->bind(detail_texture0p);
         glEnable(GL_TEXTURE_GEN_S);
         glEnable(GL_TEXTURE_GEN_T);
         glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR);
@@ -635,7 +636,7 @@ void LLDrawPoolTerrain::renderFull2TU()
         //
         // Stage 0: Generate alpha ramp for detail0/detail1 transition
         //
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,0);
+        gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
         
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
@@ -648,9 +649,9 @@ void LLDrawPoolTerrain::renderFull2TU()
         //
         // Stage 1: Write detail1
         //
-        LLViewerImage::bindTexture(detail_texture1p,1); // Texture unit 1
+        gGL.getTexUnit(1)->bind(detail_texture1p);
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D);                // Texture unit 1
 
         glEnable(GL_TEXTURE_GEN_S);
         glEnable(GL_TEXTURE_GEN_T);
@@ -673,7 +674,7 @@ void LLDrawPoolTerrain::renderFull2TU()
         //
         // Stage 0: Generate alpha ramp for detail1/detail2 transition
         //
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,0);
+        gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
 
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
@@ -687,9 +688,9 @@ void LLDrawPoolTerrain::renderFull2TU()
         //
         // Stage 1: Write detail2
         //
-        LLViewerImage::bindTexture(detail_texture2p,1);
+        gGL.getTexUnit(1)->bind(detail_texture2p);
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
         
         glEnable(GL_TEXTURE_GEN_S);
         glEnable(GL_TEXTURE_GEN_T);
@@ -713,7 +714,7 @@ void LLDrawPoolTerrain::renderFull2TU()
         // Stage 0: Generate alpha ramp for detail2/detail3 transition
         //
         gGL.getTexUnit(0)->activate();
-        LLViewerImage::bindTexture(m2DAlphaRampImagep,0);       
+        gGL.getTexUnit(0)->bind(m2DAlphaRampImagep.get());
         // Set the texture matrix
         glMatrixMode(GL_TEXTURE);
         glLoadIdentity();
@@ -724,9 +725,9 @@ void LLDrawPoolTerrain::renderFull2TU()
         gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_TEX_ALPHA);
 
         // Stage 1: Write detail3
-        LLViewerImage::bindTexture(detail_texture3p,1);
+        gGL.getTexUnit(1)->bind(detail_texture3p);
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
         gGL.getTexUnit(1)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
 
         glEnable(GL_TEXTURE_GEN_S);
         glEnable(GL_TEXTURE_GEN_T);
@@ -749,9 +750,9 @@ void LLDrawPoolTerrain::renderFull2TU()
         
         // Disable multitexture
         
-        LLImageGL::unbindTexture(1, GL_TEXTURE_2D);
+        gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(1)->disable();
         gGL.getTexUnit(1)->activate();
-        glDisable(GL_TEXTURE_2D); // Texture unit 1
 
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
@@ -763,9 +764,8 @@ void LLDrawPoolTerrain::renderFull2TU()
         // Restore Texture Unit 0 defaults
         
         gGL.getTexUnit(0)->activate();
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-        gGL.getTexUnit(0)->activate();
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
@@ -784,10 +784,10 @@ void LLDrawPoolTerrain::renderSimple()
 
         // Stage 0: Base terrain texture pass
         mTexturep->addTextureStats(1024.f*1024.f);
-        mTexturep->bind(0);
 
         gGL.getTexUnit(0)->activate();
-        glEnable(GL_TEXTURE_2D); // Texture unit 2
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(0)->bind(mTexturep.get());
         
         LLVector3 origin_agent = mDrawFace[0]->getDrawable()->getVObj()->getRegion()->getOriginAgent();
         F32 tscale = 1.f/256.f;
@@ -808,8 +808,8 @@ void LLDrawPoolTerrain::renderSimple()
         //----------------------------------------------------------------------------
         // Restore Texture Unit 0 defaults
         
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
         gGL.getTexUnit(0)->activate();
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         glDisable(GL_TEXTURE_GEN_S);
         glDisable(GL_TEXTURE_GEN_T);
         glMatrixMode(GL_TEXTURE);
@@ -839,7 +839,7 @@ void LLDrawPoolTerrain::renderOwnership()
         LLViewerParcelOverlay   *overlayp                       = regionp->getParcelOverlay();
         LLImageGL                               *texturep                       = overlayp->getTexture();
 
-        LLViewerImage::bindTexture(texturep);
+        gGL.getTexUnit(0)->bind(texturep);
 
         // *NOTE: Because the region is 256 meters wide, but has 257 pixels, the 
         // texture coordinates for pixel 256x256 is not 1,1. This makes the
@@ -872,7 +872,7 @@ void LLDrawPoolTerrain::renderForSelect()
         }
 
         
-        LLImageGL::unbindTexture(0);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         for (std::vector<LLFace*>::iterator iter = mDrawFace.begin();
                  iter != mDrawFace.end(); iter++)
diff --git a/linden/indra/newview/lldrawpoolterrain.h b/linden/indra/newview/lldrawpoolterrain.h
index 53a5cd0..b1185a5 100644
--- a/linden/indra/newview/lldrawpoolterrain.h
+++ b/linden/indra/newview/lldrawpoolterrain.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpooltree.cpp b/linden/indra/newview/lldrawpooltree.cpp
index fd178dc..312c61c 100644
--- a/linden/indra/newview/lldrawpooltree.cpp
+++ b/linden/indra/newview/lldrawpooltree.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -50,7 +50,7 @@ LLDrawPoolTree::LLDrawPoolTree(LLViewerImage *texturep) :
         LLFacePool(POOL_TREE),
         mTexturep(texturep)
 {
-        mTexturep->bind(0);
+        gGL.getTexUnit(0)->bind(mTexturep.get());
         mTexturep->setClamp(FALSE, FALSE);
 }
 
@@ -124,6 +124,7 @@ void LLDrawPoolTree::renderForSelect()
         LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f);
 
         LLGLSObjectSelectAlpha gls_alpha;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.setSceneBlendType(LLRender::BT_REPLACE);
         gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
@@ -144,7 +145,7 @@ void LLDrawPoolTree::renderTree(BOOL selecting)
         LLGLState normalize(GL_NORMALIZE, TRUE);
         
         // Bind the texture for this tree.
-        LLViewerImage::bindTexture(mTexturep,sDiffTex);
+        gGL.getTexUnit(sDiffTex)->bind(mTexturep.get());
                 
         U32 indices_drawn = 0;
 
diff --git a/linden/indra/newview/lldrawpooltree.h b/linden/indra/newview/lldrawpooltree.h
index 151e4ab..2d5bf25 100644
--- a/linden/indra/newview/lldrawpooltree.h
+++ b/linden/indra/newview/lldrawpooltree.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolwater.cpp b/linden/indra/newview/lldrawpoolwater.cpp
index d8303bd..5914ffc 100644
--- a/linden/indra/newview/lldrawpoolwater.cpp
+++ b/linden/indra/newview/lldrawpoolwater.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -68,11 +68,11 @@ LLDrawPoolWater::LLDrawPoolWater() :
         LLFacePool(POOL_WATER)
 {
         mHBTex[0] = gImageList.getImage(gSunTextureID, TRUE, TRUE);
-        mHBTex[0]->bind();
+        gGL.getTexUnit(0)->bind(mHBTex[0].get());
         mHBTex[0]->setClamp(TRUE, TRUE);
 
         mHBTex[1] = gImageList.getImage(gMoonTextureID, TRUE, TRUE);
-        mHBTex[1]->bind();
+        gGL.getTexUnit(0)->bind(mHBTex[1].get());
         mHBTex[1]->setClamp(TRUE, TRUE);
 
         mWaterImagep = gImageList.getImage(WATER_TEST);
@@ -166,10 +166,9 @@ void LLDrawPoolWater::render(S32 pass)
         
         // Set up second pass first
         mWaterImagep->addTextureStats(1024.f*1024.f);
-        mWaterImagep->bind(1);
         gGL.getTexUnit(1)->activate();
-        
-        glEnable(GL_TEXTURE_2D); // Texture unit 1
+        gGL.getTexUnit(1)->enable(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(1)->bind(mWaterImagep.get());
 
         LLVector3 camera_up = LLViewerCamera::getInstance()->getUpAxis();
         F32 up_dot = camera_up * LLVector3::z_axis;
@@ -218,20 +217,20 @@ void LLDrawPoolWater::render(S32 pass)
                 {
                         continue;
                 }
-                face->bindTexture();
+                gGL.getTexUnit(0)->bind(face->getTexture());
                 face->renderIndexed();
         }
 
         // Now, disable texture coord generation on texture state 1
         gGL.getTexUnit(1)->activate();
-        glDisable(GL_TEXTURE_2D); // Texture unit 1
+        gGL.getTexUnit(1)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.getTexUnit(1)->disable();
         glDisable(GL_TEXTURE_GEN_S); //texture unit 1
         glDisable(GL_TEXTURE_GEN_T); //texture unit 1
-        LLImageGL::unbindTexture(1, GL_TEXTURE_2D);
 
         // Disable texture coordinate and color arrays
         gGL.getTexUnit(0)->activate();
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         stop_glerror();
         
@@ -275,8 +274,9 @@ void LLDrawPoolWater::render(S32 pass)
                 {
                         gSky.mVOSkyp->getCubeMap()->disable();
                 }
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-                glEnable(GL_TEXTURE_2D);
+                
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
                 glMatrixMode(GL_TEXTURE);
                 glLoadIdentity();
                 glMatrixMode(GL_MODELVIEW);
@@ -316,7 +316,7 @@ void LLDrawPoolWater::renderReflection(LLFace* face)
 
         LLGLSNoFog noFog;
 
-        LLViewerImage::bindTexture(mHBTex[dr]);
+        gGL.getTexUnit(0)->bind(mHBTex[dr].get());
 
         LLOverrideFaceColor override(this, face->getFaceColor().mV);
         face->renderIndexed();
@@ -390,7 +390,7 @@ void LLDrawPoolWater::shade()
         if (reftex > -1)
         {
                 gGL.getTexUnit(reftex)->activate();
-                gPipeline.mWaterRef.bindTexture();
+                gGL.getTexUnit(reftex)->bind(&gPipeline.mWaterRef);
                 gGL.getTexUnit(0)->activate();
         }       
 
@@ -406,7 +406,7 @@ void LLDrawPoolWater::shade()
         }
 
         mWaterNormp->addTextureStats(1024.f*1024.f);
-        mWaterNormp->bind(bumpTex);
+        gGL.getTexUnit(bumpTex)->bind(mWaterNormp.get());
         mWaterNormp->setMipFilterNearest (mWaterNormp->getMipFilterNearest(),
                                                                           !gSavedSettings.getBOOL("RenderWaterMipNormal"));
         
@@ -421,8 +421,8 @@ void LLDrawPoolWater::shade()
                 shader->uniform1f(LLViewerShaderMgr::WATER_FOGDENSITY, 
                         param_mgr->getFogDensity());
         }
-        
-        gPipeline.mWaterDis.bindTexture();
+
+        gGL.getTexUnit(screentex)->bind(&gPipeline.mWaterDis);  
 
         if (mVertexShaderLevel == 1)
         {
@@ -502,7 +502,7 @@ void LLDrawPoolWater::shade()
                         }
 
                         LLVOWater* water = (LLVOWater*) face->getViewerObject();
-                        face->bindTexture(diffTex);
+                        gGL.getTexUnit(diffTex)->bind(face->getTexture());
 
                         sNeedsReflectionUpdate = TRUE;
                         
@@ -527,7 +527,7 @@ void LLDrawPoolWater::shade()
                 }
         }
         
-        shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, GL_TEXTURE_CUBE_MAP_ARB);
+        shader->disableTexture(LLViewerShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP);
         shader->disableTexture(LLViewerShaderMgr::WATER_SCREENTEX);     
         shader->disableTexture(LLViewerShaderMgr::BUMP_MAP);
         shader->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
@@ -536,7 +536,7 @@ void LLDrawPoolWater::shade()
         shader->unbind();
 
         gGL.getTexUnit(0)->activate();
-        glEnable(GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
         gGL.setColorMask(true, false);
 
 }
diff --git a/linden/indra/newview/lldrawpoolwater.h b/linden/indra/newview/lldrawpoolwater.h
index b0ea542..80cc903 100644
--- a/linden/indra/newview/lldrawpoolwater.h
+++ b/linden/indra/newview/lldrawpoolwater.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldrawpoolwlsky.cpp b/linden/indra/newview/lldrawpoolwlsky.cpp
index 8802c1f..4d0be98 100644
--- a/linden/indra/newview/lldrawpoolwlsky.cpp
+++ b/linden/indra/newview/lldrawpoolwlsky.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -159,7 +159,7 @@ void LLDrawPoolWLSky::renderStars(void) const
         // *NOTE: have to have bound the cloud noise texture already since register
         // combiners blending below requires something to be bound
         // and we might as well only bind once.
-        //LLGLEnable gl_texture_2d(GL_TEXTURE_2D);
+        //gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
         
         gPipeline.disableLights();
 
@@ -202,7 +202,8 @@ void LLDrawPoolWLSky::renderSkyClouds(F32 camHeightLocal) const
                 LLGLSBlendFunc blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                 gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 
-                sCloudNoiseTexture->bind();
+                gGL.getTexUnit(0)->bind(sCloudNoiseTexture);
+
                 shader->bind();
 
                 /// Render the skydome
@@ -223,7 +224,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies()
         if (gSky.mVOSkyp->getSun().getDraw() && face->getGeomCount())
         {
                 LLImageGL * tex  = face->getTexture();
-                tex->bind();
+                gGL.getTexUnit(0)->bind(tex);
                 LLColor4 color(gSky.mVOSkyp->getSun().getInterpColor());
                 LLFacePool::LLOverrideFaceColor color_override(this, color);
                 face->renderIndexed();
@@ -238,7 +239,7 @@ void LLDrawPoolWLSky::renderHeavenlyBodies()
                 // stars register combiners, we bind again here for defensive reasons,
                 // since LLImageGL::bind detects that it's a noop, and optimizes it out.
                 LLImageGL * tex  = face->getTexture();
-                tex->bind();
+                gGL.getTexUnit(0)->bind(tex);
                 LLColor4 color(gSky.mVOSkyp->getMoon().getInterpColor());
                 F32 a = gSky.mVOSkyp->getMoon().getDirection().mV[2];
                 if (a > 0.f)
@@ -280,7 +281,7 @@ void LLDrawPoolWLSky::render(S32 pass)
                 // renderStars() requires something to be bound and we might as well only
                 // bind the moon's texture once.
                 LLImageGL * tex  = gSky.mVOSkyp->mFace[LLVOSky::FACE_MOON]->getTexture();
-                tex->bind();
+                gGL.getTexUnit(0)->bind(tex);
 
                 renderHeavenlyBodies();
 
@@ -291,7 +292,7 @@ void LLDrawPoolWLSky::render(S32 pass)
 
         renderSkyClouds(camHeightLocal);
 
-        LLImageGL::unbindTexture(0);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
 void LLDrawPoolWLSky::prerender()
diff --git a/linden/indra/newview/lldrawpoolwlsky.h b/linden/indra/newview/lldrawpoolwlsky.h
index 0f6bcc3..89453c4 100644
--- a/linden/indra/newview/lldrawpoolwlsky.h
+++ b/linden/indra/newview/lldrawpoolwlsky.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldriverparam.cpp b/linden/indra/newview/lldriverparam.cpp
index 4809182..46fe42a 100644
--- a/linden/indra/newview/lldriverparam.cpp
+++ b/linden/indra/newview/lldriverparam.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldriverparam.h b/linden/indra/newview/lldriverparam.h
index afcda9c..b3d8631 100644
--- a/linden/indra/newview/lldriverparam.h
+++ b/linden/indra/newview/lldriverparam.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lldynamictexture.cpp b/linden/indra/newview/lldynamictexture.cpp
index ad0cdec..8801d72 100644
--- a/linden/indra/newview/lldynamictexture.cpp
+++ b/linden/indra/newview/lldynamictexture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,7 +32,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "lldynamictexture.h"
-#include "llimagegl.h"
 #include "llglheaders.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
@@ -105,7 +104,7 @@ void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum prima
         }
         releaseGLTexture();
         LLPointer<LLImageRaw> raw_image = new LLImageRaw(mWidth, mHeight, mComponents);
-        mTexture = new LLImageGL(mWidth, mHeight, mComponents, FALSE);
+        mTexture = new LLViewerImage(mWidth, mHeight, mComponents, FALSE);
         if (internal_format >= 0)
         {
                 mTexture->setExplicitFormat(internal_format, primary_format, type_format, swap_bytes);
@@ -113,6 +112,7 @@ void LLDynamicTexture::generateGLTexture(LLGLint internal_format, LLGLenum prima
 //      llinfos << "ALLOCATING " << (mWidth*mHeight*mComponents)/1024 << "K" << llendl;
         mTexture->createGLTexture(0, raw_image);
         mTexture->setClamp(mClamp, mClamp);
+        mTexture->setGLTextureCreated(false);
 }
 
 //-----------------------------------------------------------------------------
@@ -144,7 +144,7 @@ void LLDynamicTexture::preRender(BOOL clear_depth)
                         mOrigin.mY = llmax(mOrigin.mY, 0) ;
                 }
 
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
         // Set up camera
         mCamera.setOrigin(*LLViewerCamera::getInstance());
@@ -184,19 +184,6 @@ void LLDynamicTexture::postRender(BOOL success)
 }
 
 //-----------------------------------------------------------------------------
-// bindTexture()
-//-----------------------------------------------------------------------------
-void LLDynamicTexture::bindTexture()
-{
-        LLViewerImage::bindTexture(mTexture,0);
-}
-
-void LLDynamicTexture::unbindTexture()
-{
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
-}
-
-//-----------------------------------------------------------------------------
 // static
 // updateDynamicTextures()
 // Calls update on each dynamic texture.  Calls each group in order: "first," then "middle," then "last."
@@ -210,6 +197,7 @@ BOOL LLDynamicTexture::updateAllInstances()
         }
 
         BOOL result = FALSE;
+        BOOL ret = FALSE ;
         for( S32 order = 0; order < ORDER_COUNT; order++ )
         {
                 for (instance_list_t::iterator iter = LLDynamicTexture::sInstances[order].begin();
@@ -224,9 +212,10 @@ BOOL LLDynamicTexture::updateAllInstances()
                                 
                                 gGL.color4f(1,1,1,1);
                                 dynamicTexture->preRender();    // Must be called outside of startRender()
-
+                                result = FALSE;
                                 if (dynamicTexture->render())
                                 {
+                                        ret = TRUE ;
                                         result = TRUE;
                                         sNumRenders++;
                                 }
@@ -238,7 +227,19 @@ BOOL LLDynamicTexture::updateAllInstances()
                 }
         }
 
-        return result;
+        return ret;
+}
+
+//virtual
+void LLDynamicTexture::restoreGLTexture() 
+{
+        generateGLTexture() ;
+}
+
+//virtual
+void LLDynamicTexture::destroyGLTexture() 
+{
+        releaseGLTexture() ;
 }
 
 //-----------------------------------------------------------------------------
@@ -247,6 +248,15 @@ BOOL LLDynamicTexture::updateAllInstances()
 //-----------------------------------------------------------------------------
 void LLDynamicTexture::destroyGL()
 {
+        for( S32 order = 0; order < ORDER_COUNT; order++ )
+        {
+                for (instance_list_t::iterator iter = LLDynamicTexture::sInstances[order].begin();
+                         iter != LLDynamicTexture::sInstances[order].end(); ++iter)
+                {
+                        LLDynamicTexture *dynamicTexture = *iter;
+                        dynamicTexture->destroyGLTexture() ;
+                }
+        }
 }
 
 //-----------------------------------------------------------------------------
@@ -255,4 +265,18 @@ void LLDynamicTexture::destroyGL()
 //-----------------------------------------------------------------------------
 void LLDynamicTexture::restoreGL()
 {
+        if (gGLManager.mIsDisabled)
+        {
+                return ;
+        }                       
+        
+        for( S32 order = 0; order < ORDER_COUNT; order++ )
+        {
+                for (instance_list_t::iterator iter = LLDynamicTexture::sInstances[order].begin();
+                         iter != LLDynamicTexture::sInstances[order].end(); ++iter)
+                {
+                        LLDynamicTexture *dynamicTexture = *iter;
+                        dynamicTexture->restoreGLTexture() ;
+                }
+        }
 }
diff --git a/linden/indra/newview/lldynamictexture.h b/linden/indra/newview/lldynamictexture.h
index 6069940..bd4d22b 100644
--- a/linden/indra/newview/lldynamictexture.h
+++ b/linden/indra/newview/lldynamictexture.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -60,8 +60,11 @@ public:
         virtual void preRender(BOOL clear_depth = TRUE);
         virtual BOOL render();
         virtual void postRender(BOOL success);
-        virtual void bindTexture();
-        virtual void unbindTexture();
+
+        virtual void restoreGLTexture() ;
+        virtual void destroyGLTexture() ;
+
+        LLImageGL* getTexture(void) const { return mTexture; }
 
         static BOOL     updateAllInstances();
 
diff --git a/linden/indra/newview/llemote.cpp b/linden/indra/newview/llemote.cpp
index 0a65e1e..74dbb42 100644
--- a/linden/indra/newview/llemote.cpp
+++ b/linden/indra/newview/llemote.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llemote.h b/linden/indra/newview/llemote.h
index 553c0c8..2738ec7 100644
--- a/linden/indra/newview/llemote.h
+++ b/linden/indra/newview/llemote.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lleventinfo.cpp b/linden/indra/newview/lleventinfo.cpp
index 5a416ea..b808896 100644
--- a/linden/indra/newview/lleventinfo.cpp
+++ b/linden/indra/newview/lleventinfo.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lleventinfo.h b/linden/indra/newview/lleventinfo.h
index ef2bd33..f5fabcb 100644
--- a/linden/indra/newview/lleventinfo.h
+++ b/linden/indra/newview/lleventinfo.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lleventnotifier.cpp b/linden/indra/newview/lleventnotifier.cpp
index e289a2b..2c378a1 100644
--- a/linden/indra/newview/lleventnotifier.cpp
+++ b/linden/indra/newview/lleventnotifier.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lleventnotifier.h b/linden/indra/newview/lleventnotifier.h
index f9b7309..ed20e6d 100644
--- a/linden/indra/newview/lleventnotifier.h
+++ b/linden/indra/newview/lleventnotifier.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lleventpoll.cpp b/linden/indra/newview/lleventpoll.cpp
index 6b95102..995c4e4 100644
--- a/linden/indra/newview/lleventpoll.cpp
+++ b/linden/indra/newview/lleventpoll.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -31,9 +31,9 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "lleventpoll.h"
 #include "llappviewer.h"
 #include "llagent.h"
-#include "lleventpoll.h"
 
 #include "llhttpclient.h"
 #include "llhttpstatuscodes.h"
@@ -41,6 +41,7 @@
 #include "lltimer.h"
 #include "llviewerregion.h"
 #include "message.h"
+#include "lltrans.h"
 
 namespace
 {
@@ -225,11 +226,15 @@ namespace
                         // They are essentially disconnected from the region even though some things may still work.
                         // Since things won't get better until they relog we force a disconnect now.
 
-                        // *NOTE:Mani - This force disconnect was causing logouts even when disconnected
-                        // from neighboring regions.
-                        // *FIX:Mani We may want to re enable forceDisconnect for the agents main region.  
-                        // *FIX:Mani If reimplemting Translate!!!!
-                        // LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in.");
+                        // *NOTE:Mani - The following condition check to see if this failing event poll
+                        // is attached to the Agent's main region. If so we disconnect the viewer.
+                        // Else... its a child region and we just leave the dead event poll stopped and 
+                        // continue running.
+                        if(gAgent.getRegion() && gAgent.getRegion()->getHost().getIPandPort() == mSender)
+                        {
+                                llwarns << "Forcing disconnect due to stalled main region event poll."  << llendl;
+                                LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection"));
+                        }
                 }
         }
 
diff --git a/linden/indra/newview/lleventpoll.h b/linden/indra/newview/lleventpoll.h
index a726ede..37d07f5 100644
--- a/linden/indra/newview/lleventpoll.h
+++ b/linden/indra/newview/lleventpoll.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 5b43fcd..5095f38 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -362,10 +362,10 @@ void LLFace::renderForSelect(U32 data_mask)
                         switch (getPoolType())
                         {
                         case LLDrawPool::POOL_ALPHA:
-                                getTexture()->bind();
+                                gGL.getTexUnit(0)->bind(getTexture());
                                 break;
                         default:
-                                LLImageGL::unbindTexture(0);
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 break;
                         }
                 }
@@ -390,19 +390,19 @@ void LLFace::renderForSelect(U32 data_mask)
                                 {
                                         glPushMatrix();
                                         glMultMatrixf((float*) mDrawablep->getRegion()->mRenderMatrix.mMatrix);
-                                        mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
+                                        mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
                                         glPopMatrix();
                                 }
                                 else
                                 {
-                                        mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
+                                        mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
                                 }
                         }
                         else
                         {
                                 glPushMatrix();
                                 glMultMatrixf((float*)getRenderMatrix().mMatrix);
-                                mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
+                                mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
                                 glPopMatrix();
                         }
                 }
@@ -419,7 +419,7 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 
         if (mGeomCount > 0 && mIndicesCount > 0)
         {
-                LLViewerImage::bindTexture(imagep);
+                gGL.getTexUnit(0)->bind(imagep);
         
                 gGL.pushMatrix();
                 if (mDrawablep->isActive())
@@ -438,7 +438,7 @@ void LLFace::renderSelected(LLImageGL *imagep, const LLColor4& color)
 #if !LL_RELEASE_FOR_DOWNLOAD
                 LLGLState::checkClientArrays("", LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD);
 #endif
-                mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, mIndicesCount, mIndicesIndex);
+                mVertexBuffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
                                 
                 unsetFaceColor();
                 gGL.popMatrix();
@@ -1203,7 +1203,7 @@ S32 LLFace::pushVertices(const U16* index_array) const
 {
         if (mIndicesCount)
         {
-                mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, mGeomIndex, mGeomIndex+mGeomCount-1, mIndicesCount, mIndicesIndex);
+                mVertexBuffer->drawRange(LLRender::TRIANGLES, mGeomIndex, mGeomIndex+mGeomCount-1, mIndicesCount, mIndicesIndex);
                 gPipeline.addTrianglesDrawn(mIndicesCount/3);
         }
 
diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index 0501dcc..e4ff28f 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -101,7 +101,6 @@ public:
         void                    setPixelArea(F32 area)  { mPixelArea = area; }
         F32                             getVirtualSize() const { return mVSize; }
         F32                             getPixelArea() const { return mPixelArea; }
-        void                    bindTexture(S32 stage = 0)              const   { LLViewerImage::bindTexture(mTexture, stage); }
 
         void                    renderSetColor() const;
         S32                             renderElements(const U16 *index_array) const;
@@ -120,6 +119,7 @@ public:
         LLVertexBuffer* getVertexBuffer()       const   { return mVertexBuffer; }
         void                    setPoolType(U32 type)           { mPoolType = type; }
         S32                             getTEOffset()                           { return mTEOffset; }
+        LLViewerImage*  getTexture()                            { return mTexture; }
 
         void                    setViewerObject(LLViewerObject* object);
         void                    setPool(LLFacePool *pool, LLViewerImage *texturep);
diff --git a/linden/indra/newview/llface.inl b/linden/indra/newview/llface.inl
index 8f8cfaf..1092c8a 100644
--- a/linden/indra/newview/llface.inl
+++ b/linden/indra/newview/llface.inl
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,6 +33,7 @@
 #define LL_LLFACE_INL
 
 #include "llglheaders.h"
+#include "llrender.h"
 
 inline BOOL LLFace::getDirty() const
 { 
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index f1ca99f..16abbe3 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -116,6 +116,7 @@ static struct ft_display_info ft_display_table[] =
         { LLFastTimer::FTM_VFILE_WAIT,                  "  VFile Wait",         &LLColor4::cyan6, 0 },
 //      { LLFastTimer::FTM_IDLE_CB,                             "  Callbacks",          &LLColor4::pink1, 0 },
         { LLFastTimer::FTM_RENDER,                              " Render",                      &green0, 1 },
+        { LLFastTimer::FTM_PICK,                                "  Pick",                       &LLColor4::purple, 1 },
         { LLFastTimer::FTM_HUD_EFFECTS,                 "  HUD Effects",        &LLColor4::orange1, 0 },
         { LLFastTimer::FTM_HUD_UPDATE,                  "  HUD Update", &LLColor4::orange2, 0 },
         { LLFastTimer::FTM_UPDATE_SKY,                  "  Sky Update",         &LLColor4::cyan1, 0 },
@@ -463,7 +464,7 @@ void LLFastTimerView::draw()
         
         // Draw the window background
         {
-                LLGLSNoTexture gls_ui_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4(0.f, 0.f, 0.f, 0.25f));
         }
         
@@ -755,7 +756,7 @@ void LLFastTimerView::draw()
                 LLRect graph_rect;
                 // Draw borders
                 {
-                        LLGLSNoTexture gls_ui_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         gGL.color4f(0.5f,0.5f,0.5f,0.5f);
 
                         S32 by = y + 2;
@@ -792,7 +793,7 @@ void LLFastTimerView::draw()
                 
                 // Draw bars for each history entry
                 // Special: -1 = show running average
-                LLViewerImage::bindTexture(box_imagep->getImage());
+                gGL.getTexUnit(0)->bind(box_imagep->getImage());
                 for (S32 j=-1; j<histmax && y > LINE_GRAPH_HEIGHT; j++)
                 {
                         int sublevel_dx[FTV_DISPLAY_NUM+1];
@@ -936,7 +937,7 @@ void LLFastTimerView::draw()
                 
                 //draw line graph history
                 {
-                        LLGLSNoTexture no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLLocalClipRect clip(graph_rect);
                         
                         //normalize based on last frame's maximum
@@ -980,7 +981,7 @@ void LLFastTimerView::draw()
 
                                         gGL.color4f(0.5f,0.5f,0.5f,1);
                                 
-                                        gGL.begin(LLVertexBuffer::LINES);
+                                        gGL.begin(LLRender::LINES);
                                         gGL.vertex2i((S32)bar, graph_rect.mBottom);
                                         gGL.vertex2i((S32)bar, graph_rect.mTop);
                                         gGL.end();
@@ -1016,7 +1017,7 @@ void LLFastTimerView::draw()
                                 }
 
                                 gGL.color4f(col[0], col[1], col[2], alpha);                             
-                                gGL.begin(LLVertexBuffer::LINE_STRIP);
+                                gGL.begin(LLRender::LINE_STRIP);
                                 for (U32 j = 0; j < LLFastTimer::FTM_HISTORY_NUM; j++)
                                 {
                                         U64 ticks = ticks_sum[j+1][idx];
diff --git a/linden/indra/newview/llfasttimerview.h b/linden/indra/newview/llfasttimerview.h
index 75eb165..c8189be 100644
--- a/linden/indra/newview/llfasttimerview.h
+++ b/linden/indra/newview/llfasttimerview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index a3da4f5..b847a53 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,11 +29,11 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
+
 #include <iostream>
 #include <fstream>
 
-#include "llviewerprecompiledheaders.h"
-
 #include <boost/regex.hpp>
 
 #include "llfeaturemanager.h"
@@ -447,8 +447,6 @@ void LLFeatureManager::applyRecommendedSettings()
         {
                 gSavedSettings.setF32("RenderFarClip", 128.0f);
         }
-
-
 }
 
 void LLFeatureManager::applyFeatures(bool skipFeatures)
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index 1eeddfa..8cfcc7c 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 1edfbe6..caf79eb 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -962,7 +962,7 @@ void LLFilePicker::chooser_responder(GtkWidget *widget, gint response, gpointer
 
 GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::string context)
 {
-        if (ll_try_gtk_init() &&
+        if (LLWindowSDL::ll_try_gtk_init() &&
             ! gViewerWindow->getWindow()->getFullscreen())
         {
                 GtkWidget *win = NULL;
@@ -1003,7 +1003,7 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
                 // Make GTK tell the window manager to associate this
                 // dialog with our non-GTK raw X11 window, which should try
                 // to keep it on top etc.
-                Window XWindowID = get_SDL_XWindowID();
+                Window XWindowID = LLWindowSDL::get_SDL_XWindowID();
                 if (None != XWindowID)
                 {
                         gtk_widget_realize(GTK_WIDGET(win)); // so we can get its gdkwin
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index 1f7239e..aea414a 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index fc469f1..ee7053d 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index cde6b59..eef0537 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 95e6d17..6f28917 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llflexibleobject.h b/linden/indra/newview/llflexibleobject.h
index 843a8f8..078cd42 100644
--- a/linden/indra/newview/llflexibleobject.h
+++ b/linden/indra/newview/llflexibleobject.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index be1c254..37e9c54 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -202,7 +202,9 @@ LLFloaterAbout::LLFloaterAbout()
         support.append("\n");
 
         support.append("Audio Driver Version: ");
-        support.append( gAudiop ? gAudiop->getDriverName(true) : "(none)" );
+        bool want_fullname = true;
+        support.append( gAudiop ? gAudiop->getDriverName(want_fullname) : "(none)" );
+
         support.append("\n");
 
         LLMediaManager *mgr = LLMediaManager::getInstance();
diff --git a/linden/indra/newview/llfloaterabout.h b/linden/indra/newview/llfloaterabout.h
index b58f8cc..b8e8f3e 100644
--- a/linden/indra/newview/llfloaterabout.h
+++ b/linden/indra/newview/llfloaterabout.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 4561110..a8f3f91 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -47,6 +47,7 @@
 #include "llsdutil.h"
 #include "llimview.h"
 #include "llviewerwindow.h"
+#include "llappviewer.h"
 
 const F32 SPEAKER_TIMEOUT = 10.f; // seconds of not being on voice channel before removed from list of active speakers
 const F32 RESORT_TIMEOUT = 5.f; // seconds of mouse inactivity before it's ok to sort regardless of mouse-in-view.
@@ -546,7 +547,8 @@ void LLPanelActiveSpeakers::refreshSpeakers()
                                                                         && gVoiceClient->getVoiceEnabled(selected_id)
                                                                         && selected_id.notNull() 
                                                                         && selected_id != gAgent.getID() 
-                                                                        && (selected_speakerp.notNull() && selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT));
+                                                                        && (selected_speakerp.notNull() && (selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT || selected_speakerp->mType == LLSpeaker::SPEAKER_EXTERNAL)));
+
         }
         if (mMuteTextCtrl)
         {
@@ -554,6 +556,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
                 mMuteTextCtrl->setEnabled(selected_id.notNull() 
                                                                 && selected_id != gAgent.getID() 
                                                                 && selected_speakerp.notNull() 
+                                                                && selected_speakerp->mType != LLSpeaker::SPEAKER_EXTERNAL
                                                                 && !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName));
         }
         childSetValue("speaker_volume", gVoiceClient->getUserVolume(selected_id));
@@ -561,7 +564,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
                                         && gVoiceClient->getVoiceEnabled(selected_id)
                                         && selected_id.notNull() 
                                         && selected_id != gAgent.getID() 
-                                        && (selected_speakerp.notNull() && selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT));
+                                        && (selected_speakerp.notNull() && (selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT || selected_speakerp->mType == LLSpeaker::SPEAKER_EXTERNAL)));
 
         childSetEnabled(
                 "moderator_controls_label",
@@ -579,7 +582,7 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 
         if (mProfileBtn)
         {
-                mProfileBtn->setEnabled(selected_id.notNull());
+                mProfileBtn->setEnabled(selected_id.notNull() && (selected_speakerp.notNull() && selected_speakerp->mType != LLSpeaker::SPEAKER_EXTERNAL) );
         }
 
         // show selected user name in large font
@@ -1033,9 +1036,17 @@ void LLSpeakerMgr::update(BOOL resort_ok)
                 // speaker no longer registered in voice channel, demote to text only
                 else if (speakerp->mStatus != LLSpeaker::STATUS_NOT_IN_CHANNEL)
                 {
-                        speakerp->mStatus = LLSpeaker::STATUS_TEXT_ONLY;
-                        speakerp->mSpeechVolume = 0.f;
-                        speakerp->mDotColor = ACTIVE_COLOR;
+                        if(speakerp->mType == LLSpeaker::SPEAKER_EXTERNAL)
+                        {
+                                // external speakers should be timed out when they leave the voice channel (since they only exist via SLVoice)
+                                speakerp->mStatus = LLSpeaker::STATUS_NOT_IN_CHANNEL;
+                        }
+                        else
+                        {
+                                speakerp->mStatus = LLSpeaker::STATUS_TEXT_ONLY;
+                                speakerp->mSpeechVolume = 0.f;
+                                speakerp->mDotColor = ACTIVE_COLOR;
+                        }
                 }
         }
 
@@ -1087,13 +1098,16 @@ void LLSpeakerMgr::updateSpeakerList()
         if ((!mVoiceChannel && gVoiceClient->inProximalChannel()) || (mVoiceChannel && mVoiceChannel->isActive()))
         {
                 LLVoiceClient::participantMap* participants = gVoiceClient->getParticipantList();
-                LLVoiceClient::participantMap::iterator participant_it;
-
-                // add new participants to our list of known speakers
-                for (participant_it = participants->begin(); participant_it != participants->end(); ++participant_it)
+                if(participants)
                 {
-                        LLVoiceClient::participantState* participantp = participant_it->second;
-                        setSpeaker(participantp->mAvatarID, LLStringUtil::null, LLSpeaker::STATUS_VOICE_ACTIVE);
+                        LLVoiceClient::participantMap::iterator participant_it;
+
+                        // add new participants to our list of known speakers
+                        for (participant_it = participants->begin(); participant_it != participants->end(); ++participant_it)
+                        {
+                                LLVoiceClient::participantState* participantp = participant_it->second;
+                                setSpeaker(participantp->mAvatarID, participantp->mDisplayName, LLSpeaker::STATUS_VOICE_ACTIVE, (participantp->mAvatarIDValid?LLSpeaker::SPEAKER_AGENT:LLSpeaker::SPEAKER_EXTERNAL));
+                        }
                 }
         }
 }
@@ -1166,6 +1180,10 @@ void LLIMSpeakerMgr::updateSpeakerList()
 {
         // don't do normal updates which are pulled from voice channel
         // rely on user list reported by sim
+        
+        // We need to do this to allow PSTN callers into group chats to show in the list.
+        LLSpeakerMgr::updateSpeakerList();
+        
         return;
 }
 
@@ -1358,6 +1376,11 @@ void LLLocalSpeakerMgr::updateSpeakerList()
         // pull speakers from voice channel
         LLSpeakerMgr::updateSpeakerList();
 
+        if (gDisconnected)//the world is cleared.
+        {
+                return ;
+        }
+
         // add non-voice speakers in chat range
         std::vector< LLCharacter* >::iterator avatar_it;
         for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it)
diff --git a/linden/indra/newview/llfloateractivespeakers.h b/linden/indra/newview/llfloateractivespeakers.h
index 550b48c..0fb0267 100644
--- a/linden/indra/newview/llfloateractivespeakers.h
+++ b/linden/indra/newview/llfloateractivespeakers.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -53,7 +53,8 @@ public:
         typedef enum e_speaker_type
         {
                 SPEAKER_AGENT,
-                SPEAKER_OBJECT
+                SPEAKER_OBJECT,
+                SPEAKER_EXTERNAL        // Speaker that doesn't map to an avatar or object (i.e. PSTN caller in a group)
         } ESpeakerType;
 
         typedef enum e_speaker_status
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 66b7a56..c75f9e3 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -384,9 +384,10 @@ void LLFloaterAnimPreview::draw()
         if (mMotionID.notNull() && mAnimPreview)
         {
                 gGL.color3f(1.f, 1.f, 1.f);
-                mAnimPreview->bindTexture();
 
-                gGL.begin( LLVertexBuffer::QUADS );
+                gGL.getTexUnit(0)->bind(mAnimPreview->getTexture());
+
+                gGL.begin( LLRender::QUADS );
                 {
                         gGL.texCoord2f(0.f, 1.f);
                         gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
@@ -399,7 +400,7 @@ void LLFloaterAnimPreview::draw()
                 }
                 gGL.end();
 
-                mAnimPreview->unbindTexture();
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
                 if (!avatarp->areAnimationsPaused())
@@ -1068,7 +1069,7 @@ BOOL	LLPreviewAnimation::render()
         glLoadIdentity();
 
         LLGLSUIDefault def;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.color4f(0.15f, 0.2f, 0.3f, 1.f);
 
         gl_rect_2d_simple( mWidth, mHeight );
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index b7bb521..cc4cca3 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index 80c43ab..0813430 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -148,7 +148,7 @@ void LLFloaterAuction::draw()
                 if (childGetRect("snapshot_icon", rect))
                 {
                         {
-                                LLGLSNoTexture gls_no_texture;
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f));
                                 rect.stretch(-1);
                         }
@@ -205,7 +205,7 @@ void LLFloaterAuction::onClickSnapshot(void* data)
                 LLVFile::writeFile(j2c->getData(), j2c->getDataSize(), gVFS, self->mImageID, LLAssetType::AT_TEXTURE);
 
                 self->mImage = new LLImageGL((LLImageRaw*)raw, FALSE);
-                self->mImage->bind();
+                gGL.getTexUnit(0)->bind(self->mImage);
                 self->mImage->setClamp(TRUE, TRUE);
         }
         else
diff --git a/linden/indra/newview/llfloaterauction.h b/linden/indra/newview/llfloaterauction.h
index cd18158..673f65c 100644
--- a/linden/indra/newview/llfloaterauction.h
+++ b/linden/indra/newview/llfloaterauction.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 4abf493..f543038 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -7,7 +7,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatarinfo.h b/linden/indra/newview/llfloateravatarinfo.h
index 9ee92e9..4b0b681 100644
--- a/linden/indra/newview/llfloateravatarinfo.h
+++ b/linden/indra/newview/llfloateravatarinfo.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 216eea7..97d2de9 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatarpicker.h b/linden/indra/newview/llfloateravatarpicker.h
index 7fcb5c0..005eff0 100644
--- a/linden/indra/newview/llfloateravatarpicker.h
+++ b/linden/indra/newview/llfloateravatarpicker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp
index a5df51b..f6d985e 100644
--- a/linden/indra/newview/llfloateravatartextures.cpp
+++ b/linden/indra/newview/llfloateravatartextures.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateravatartextures.h b/linden/indra/newview/llfloateravatartextures.h
index 3bddf9b..102d24a 100644
--- a/linden/indra/newview/llfloateravatartextures.h
+++ b/linden/indra/newview/llfloateravatartextures.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
new file mode 100644
index 0000000..2dee000
--- /dev/null
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -0,0 +1,150 @@
+/** 
+ * @file llfloaterbeacons.cpp
+ * @brief Front-end to LLPipeline controls for highlighting various kinds of objects.
+ * @author Coco
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterbeacons.h"
+#include "llviewercontrol.h"
+#include "lluictrlfactory.h"
+#include "llcheckboxctrl.h"
+#include "pipeline.h"
+
+
+LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
+
+        // Initialize pipeline states from saved settings.
+        // OK to do at floater constructor time because beacons do not display unless the floater is open
+        // therefore it is OK to not initialize the pipeline state before needed.
+        // Note also that we should replace those pipeline statics with direct lookup of the saved settings
+        // eliminating the need to keep these states in sync.
+        LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon"));
+        LLPipeline::setRenderScriptedBeacons(     gSavedSettings.getBOOL("scriptsbeacon"));
+        LLPipeline::setRenderPhysicalBeacons(     gSavedSettings.getBOOL("physicalbeacon"));
+        LLPipeline::setRenderSoundBeacons(        gSavedSettings.getBOOL("soundsbeacon"));
+        LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));
+        LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));
+        LLPipeline::setRenderBeacons(             gSavedSettings.getBOOL("renderbeacons"));
+}
+
+BOOL LLFloaterBeacons::postBuild()
+{
+        childSetCommitCallback("touch_only",      onClickUICheck, this);
+        childSetCommitCallback("scripted",        onClickUICheck, this);
+        childSetCommitCallback("physical",        onClickUICheck, this);
+        childSetCommitCallback("sounds",          onClickUICheck, this);
+        childSetCommitCallback("particles",       onClickUICheck, this);
+        childSetCommitCallback("highlights",      onClickUICheck, this);
+        childSetCommitCallback("beacons",         onClickUICheck, this);
+        return TRUE;
+}
+
+// Needed to make the floater visibility toggle the beacons.
+// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
+void LLFloaterBeacons::open()
+{
+        LLFloater::open();
+        gSavedSettings.setBOOL( "BeaconAlwaysOn", TRUE);
+}
+void LLFloaterBeacons::close(bool app_quitting)
+{
+        LLFloater::close(app_quitting);
+        if(!app_quitting)
+        {
+                gSavedSettings.setBOOL( "BeaconAlwaysOn", FALSE);
+        }
+}
+
+// Callback attached to each check box control to both affect their main purpose
+// and to implement the couple screwy interdependency rules that some have.
+//static 
+void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
+{
+        LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
+        std::string name = check->getName();
+        LLFloaterBeacons* view = (LLFloaterBeacons*)data;
+        if(     name == "touch_only")
+        {
+                LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
+                // Don't allow both to be ON at the same time. Toggle the other one off if both now on.
+                if (
+                        LLPipeline::getRenderScriptedTouchBeacons(NULL) &&
+                        LLPipeline::getRenderScriptedBeacons(NULL) )
+                {
+                        LLPipeline::setRenderScriptedBeacons(FALSE);
+                        view->getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(FALSE));
+                        view->getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
+                }
+        }
+        else if(name == "scripted")
+        {
+                LLPipeline::toggleRenderScriptedBeacons(NULL);
+                // Don't allow both to be ON at the same time. Toggle the other one off if both now on.
+                if (
+                        LLPipeline::getRenderScriptedTouchBeacons(NULL) &&
+                        LLPipeline::getRenderScriptedBeacons(NULL) )
+                {
+                        LLPipeline::setRenderScriptedTouchBeacons(FALSE);
+                        view->getChild<LLCheckBoxCtrl>("touch_only")->setControlValue(LLSD(FALSE));
+                        view->getChild<LLCheckBoxCtrl>("scripted")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline
+                }
+        }
+        else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());
+        else if(name == "sounds")         LLPipeline::setRenderSoundBeacons(check->get());
+        else if(name == "particles")      LLPipeline::setRenderParticleBeacons(check->get());
+        else if(name == "highlights")
+        {
+                LLPipeline::toggleRenderHighlights(NULL);
+                // Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
+                if (
+                        !LLPipeline::getRenderBeacons(NULL) &&
+                        !LLPipeline::getRenderHighlights(NULL) )
+                {
+                        LLPipeline::setRenderBeacons(TRUE);
+                        view->getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
+                        view->getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
+                }
+        }
+        else if(name == "beacons")
+        {
+                LLPipeline::toggleRenderBeacons(NULL);
+                // Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
+                if (
+                        !LLPipeline::getRenderBeacons(NULL) &&
+                        !LLPipeline::getRenderHighlights(NULL) )
+                {
+                        LLPipeline::setRenderHighlights(TRUE);
+                        view->getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
+                        view->getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
+                }
+        }
+}
diff --git a/linden/indra/newview/llfloaterbeacons.h b/linden/indra/newview/llfloaterbeacons.h
new file mode 100644
index 0000000..29aac17
--- /dev/null
+++ b/linden/indra/newview/llfloaterbeacons.h
@@ -0,0 +1,56 @@
+/** 
+ * @file llfloaterbeacons.h
+ * @brief Front-end to LLPipeline controls for highlighting various kinds of objects.
+ * @author Coco 
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("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_LLFLOATERBEACONS_H
+#define LL_LLFLOATERBEACONS_H
+
+#include "llfloater.h"
+
+class LLFloaterBeacons : public LLFloater, public LLFloaterSingleton<LLFloaterBeacons>
+{
+        friend class LLUISingleton<LLFloaterBeacons, VisibilityPolicy<LLFloater> >;
+        
+public:
+        /*virtual*/ BOOL postBuild();
+        
+        // Needed to make the floater visibility toggle the beacons.
+        // Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
+        /*virtual*/ void open();
+        /*virtual*/ void close(bool app_quitting);
+
+private:
+        LLFloaterBeacons(const LLSD& seed);
+
+        static void onClickUICheck(LLUICtrl *ctrl, void* data);
+};
+
+#endif
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 9080acb..3bef302 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuildoptions.h b/linden/indra/newview/llfloaterbuildoptions.h
index 82386ee..9af33d6 100644
--- a/linden/indra/newview/llfloaterbuildoptions.h
+++ b/linden/indra/newview/llfloaterbuildoptions.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbulkpermission.cpp b/linden/indra/newview/llfloaterbulkpermission.cpp
index 29d94bc..e66d1af 100644
--- a/linden/indra/newview/llfloaterbulkpermission.cpp
+++ b/linden/indra/newview/llfloaterbulkpermission.cpp
@@ -208,8 +208,7 @@ void LLFloaterBulkPermission::doApply()
         q=(LLFloaterBulkPermission*)this;
 
         BulkQueueObjects func(q);
-        const bool firstonly = false;
-        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
         if(fail)
         {
                 if ( !func.modifiable )
diff --git a/linden/indra/newview/llfloaterbump.cpp b/linden/indra/newview/llfloaterbump.cpp
index 58b4ede..c116292 100644
--- a/linden/indra/newview/llfloaterbump.cpp
+++ b/linden/indra/newview/llfloaterbump.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbump.h b/linden/indra/newview/llfloaterbump.h
index ac63bdf..2ca11d2 100644
--- a/linden/indra/newview/llfloaterbump.h
+++ b/linden/indra/newview/llfloaterbump.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 5d815fa..dbb0157 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -289,11 +289,6 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
         removeVOInventoryListener();
 }
 
-void LLFloaterBuy::close(bool app_quitting)
-{
-        LLSelectMgr::getInstance()->deselectAll();
-        LLFloater::close(app_quitting);
-}
 
 // static
 void LLFloaterBuy::onClickBuy(void*)
@@ -325,3 +320,10 @@ void LLFloaterBuy::onClickCancel(void*)
                 sInstance->close();
         }
 }
+
+void LLFloaterBuy::onClose(bool app_quitting)
+{
+        // drop reference to current selection so selection goes away
+        mObjectSelection = NULL;
+        LLFloater::onClose(app_quitting);
+}
diff --git a/linden/indra/newview/llfloaterbuy.h b/linden/indra/newview/llfloaterbuy.h
index 0eef41b..06cf41e 100644
--- a/linden/indra/newview/llfloaterbuy.h
+++ b/linden/indra/newview/llfloaterbuy.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -57,6 +57,7 @@ protected:
         LLFloaterBuy();
         ~LLFloaterBuy();
 
+        /*virtual*/ void onClose(bool app_quitting);
         void reset();
 
         void requestObjectInventories();
@@ -65,8 +66,6 @@ protected:
                                                                  S32 serial_num,
                                                                  void* data);
 
-        /*virtual*/ void close(bool app_quitting = false);
-
         static void onClickBuy(void*);
         static void onClickCancel(void*);
 
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index e3b6b9f..6acb38d 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuycontents.h b/linden/indra/newview/llfloaterbuycontents.h
index bef789c..265809f 100644
--- a/linden/indra/newview/llfloaterbuycontents.h
+++ b/linden/indra/newview/llfloaterbuycontents.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index cbd41f4..1fe6737 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -358,11 +358,6 @@ void LLFloaterBuyCurrencyUI::onClickErrorWeb(void* data)
 // static
 void LLFloaterBuyCurrency::buyCurrency()
 {
-        if (gHideLinks)
-        {
-                return;
-        }
-
         LLFloaterBuyCurrencyUI* ui = LLFloaterBuyCurrencyUI::soleInstance(true);
         ui->noTarget();
         ui->updateUI();
@@ -371,15 +366,6 @@ void LLFloaterBuyCurrency::buyCurrency()
 
 void LLFloaterBuyCurrency::buyCurrency(const std::string& name, S32 price)
 {
-        if (gHideLinks)
-        {
-                LLStringUtil::format_map_t args;
-                args["[NAME]"] = name;
-                args["[PRICE]"] = llformat("%d", price);
-                gViewerWindow->alertXml("NotEnoughCurrency", args);
-                return;
-        }
-        
         LLFloaterBuyCurrencyUI* ui = LLFloaterBuyCurrencyUI::soleInstance(true);
         ui->target(name, price);
         ui->updateUI();
diff --git a/linden/indra/newview/llfloaterbuycurrency.h b/linden/indra/newview/llfloaterbuycurrency.h
index 883e67f..a6c0e01 100644
--- a/linden/indra/newview/llfloaterbuycurrency.h
+++ b/linden/indra/newview/llfloaterbuycurrency.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index de14129..1ad45e1 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterbuyland.h b/linden/indra/newview/llfloaterbuyland.h
index 84ea909..49f92f8 100644
--- a/linden/indra/newview/llfloaterbuyland.h
+++ b/linden/indra/newview/llfloaterbuyland.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatercamera.cpp b/linden/indra/newview/llfloatercamera.cpp
index ca8ab6c..7679f81 100644
--- a/linden/indra/newview/llfloatercamera.cpp
+++ b/linden/indra/newview/llfloatercamera.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatercamera.h b/linden/indra/newview/llfloatercamera.h
index df90e77..338c2a3 100644
--- a/linden/indra/newview/llfloatercamera.h
+++ b/linden/indra/newview/llfloatercamera.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 14f9a10..8e9d489 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index 44c706e..923fd9a 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp
index 1114635..036c7c4 100644
--- a/linden/indra/newview/llfloaterchatterbox.cpp
+++ b/linden/indra/newview/llfloaterchatterbox.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index ac494d1..57f07a0 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterclassified.cpp b/linden/indra/newview/llfloaterclassified.cpp
index b374f43..35be1b2 100644
--- a/linden/indra/newview/llfloaterclassified.cpp
+++ b/linden/indra/newview/llfloaterclassified.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterclassified.h b/linden/indra/newview/llfloaterclassified.h
index ccd29ac..9c53be6 100644
--- a/linden/indra/newview/llfloaterclassified.h
+++ b/linden/indra/newview/llfloaterclassified.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterclothing.cpp b/linden/indra/newview/llfloaterclothing.cpp
index 9d4ac6f..b86acba 100644
--- a/linden/indra/newview/llfloaterclothing.cpp
+++ b/linden/indra/newview/llfloaterclothing.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterclothing.h b/linden/indra/newview/llfloaterclothing.h
index b4b8abe..a4e9648 100644
--- a/linden/indra/newview/llfloaterclothing.h
+++ b/linden/indra/newview/llfloaterclothing.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatercolorpicker.cpp b/linden/indra/newview/llfloatercolorpicker.cpp
index 1ffbeb3..06dc447 100644
--- a/linden/indra/newview/llfloatercolorpicker.cpp
+++ b/linden/indra/newview/llfloatercolorpicker.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -165,7 +165,7 @@ createUI ()
                 }
         }
         mRGBImage = new LLImageGL ( (LLImageRaw*)raw, FALSE );
-        mRGBImage->bind();
+        gGL.getTexUnit(0)->bind(mRGBImage);
         mRGBImage->setClamp(TRUE, TRUE);
         
         // create palette
@@ -543,9 +543,9 @@ void LLFloaterColorPicker::draw()
         LLRect local_rect = getLocalRect();
         if (gFocusMgr.childHasKeyboardFocus(this) && mSwatch->isInVisibleChain() && mContextConeOpacity > 0.001f)
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLGLEnable(GL_CULL_FACE);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity);
                         gGL.vertex2i(swatch_rect.mLeft, swatch_rect.mTop);
diff --git a/linden/indra/newview/llfloatercolorpicker.h b/linden/indra/newview/llfloatercolorpicker.h
index 601bc83..b39b042 100644
--- a/linden/indra/newview/llfloatercolorpicker.h
+++ b/linden/indra/newview/llfloatercolorpicker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index 7db075a..b9deb6c 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index 60fdd4b..15fc8f1 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp
index 6a6a430..07e3738 100644
--- a/linden/indra/newview/llfloaterdaycycle.cpp
+++ b/linden/indra/newview/llfloaterdaycycle.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterdaycycle.h b/linden/indra/newview/llfloaterdaycycle.h
index 4c6abab..f355ff2 100644
--- a/linden/indra/newview/llfloaterdaycycle.h
+++ b/linden/indra/newview/llfloaterdaycycle.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 9a0c2fc..5fc479e 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterdirectory.h b/linden/indra/newview/llfloaterdirectory.h
index 6915aea..7f0202a 100644
--- a/linden/indra/newview/llfloaterdirectory.h
+++ b/linden/indra/newview/llfloaterdirectory.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatereditui.cpp b/linden/indra/newview/llfloatereditui.cpp
index a95126c..35897ec 100644
--- a/linden/indra/newview/llfloatereditui.cpp
+++ b/linden/indra/newview/llfloatereditui.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatereditui.h b/linden/indra/newview/llfloatereditui.h
index 610824d..24d68fc 100644
--- a/linden/indra/newview/llfloatereditui.h
+++ b/linden/indra/newview/llfloatereditui.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index d7f2ed0..4162165 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterenvsettings.h b/linden/indra/newview/llfloaterenvsettings.h
index 8f70993..2e02ce7 100644
--- a/linden/indra/newview/llfloaterenvsettings.h
+++ b/linden/indra/newview/llfloaterenvsettings.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterevent.cpp b/linden/indra/newview/llfloaterevent.cpp
index 778a3d5..0646e86 100644
--- a/linden/indra/newview/llfloaterevent.cpp
+++ b/linden/indra/newview/llfloaterevent.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterevent.h b/linden/indra/newview/llfloaterevent.h
index 1fc2fc6..572a849 100644
--- a/linden/indra/newview/llfloaterevent.h
+++ b/linden/indra/newview/llfloaterevent.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index acdd5ce..bf1f678 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -57,6 +57,7 @@
 #include "llviewermessage.h"
 #include "lltimer.h"
 #include "lltextbox.h"
+#include "llvoiceclient.h"
 
 //Maximum number of people you can select to do an operation on at once.
 #define MAX_FRIEND_SELECT 20
@@ -64,6 +65,8 @@
 #define RIGHTS_CHANGE_TIMEOUT 5.0
 #define OBSERVER_TIMEOUT 0.5
 
+#define ONLINE_SIP_ICON_NAME "slim_icon_16_viewer.tga"
+
 // simple class to observe the calling cards.
 class LLLocalFriendsObserver : public LLFriendObserver, public LLEventTimer
 {
@@ -111,10 +114,14 @@ LLPanelFriends::LLPanelFriends() :
         mEventTimer.stop();
         mObserver = new LLLocalFriendsObserver(this);
         LLAvatarTracker::instance().addObserver(mObserver);
+        // For notification when SIP online status changes.
+        LLVoiceClient::getInstance()->addObserver(mObserver);
 }
 
 LLPanelFriends::~LLPanelFriends()
 {
+        // For notification when SIP online status changes.
+        LLVoiceClient::getInstance()->removeObserver(mObserver);
         LLAvatarTracker::instance().removeObserver(mObserver);
         delete mObserver;
 }
@@ -212,7 +219,9 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
         LLAvatarTracker& at = LLAvatarTracker::instance();
         const LLRelationship* relationInfo = at.getBuddyInfo(agent_id);
         if(!relationInfo) return FALSE;
-        BOOL online = relationInfo->isOnline();
+
+        bool isOnlineSIP = LLVoiceClient::getInstance()->isOnlineSIP(agent_id);
+        bool isOnline = relationInfo->isOnline();
 
         std::string fullname;
         BOOL have_name = gCacheName->getFullName(agent_id, fullname);
@@ -228,12 +237,17 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
         LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
         online_status_column["column"] = "icon_online_status";
         online_status_column["type"] = "icon";
-
-        if (online)
+        
+        if (isOnline)
         {
                 friend_column["font-style"] = "BOLD";   
                 online_status_column["value"] = "icon_avatar_online.tga";
         }
+        else if(isOnlineSIP)
+        {
+                friend_column["font-style"] = "BOLD";   
+                online_status_column["value"] = ONLINE_SIP_ICON_NAME;
+        }
 
         LLSD& online_column = element["columns"][LIST_VISIBLE_ONLINE];
         online_column["column"] = "icon_visible_online";
@@ -271,14 +285,30 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
         if (!info) return FALSE;
         LLScrollListItem* itemp = mFriendsList->getItem(agent_id);
         if (!itemp) return FALSE;
+        
+        bool isOnlineSIP = LLVoiceClient::getInstance()->isOnlineSIP(itemp->getUUID());
+        bool isOnline = info->isOnline();
 
         std::string fullname;
         BOOL have_name = gCacheName->getFullName(agent_id, fullname);
+        
+        // Name of the status icon to use
+        std::string statusIcon;
+        
+        if(isOnline)
+        {
+                statusIcon = "icon_avatar_online.tga";
+        }
+        else if(isOnlineSIP)
+        {
+                statusIcon = ONLINE_SIP_ICON_NAME;
+        }
 
-        itemp->getColumn(LIST_ONLINE_STATUS)->setValue(info->isOnline() ? std::string("icon_avatar_online.tga") : LLStringUtil::null);
+        itemp->getColumn(LIST_ONLINE_STATUS)->setValue(statusIcon);
+        
         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);    
+        ((LLScrollListText*)itemp->getColumn(LIST_FRIEND_NAME))->setFontStyle((isOnline || isOnlineSIP) ? LLFontGL::BOLD : LLFontGL::NORMAL);   
         itemp->getColumn(LIST_VISIBLE_ONLINE)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS));
         itemp->getColumn(LIST_VISIBLE_MAP)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION));
         itemp->getColumn(LIST_EDIT_MINE)->setValue(info->isRightGrantedTo(LLRelationship::GRANT_MODIFY_OBJECTS));
diff --git a/linden/indra/newview/llfloaterfriends.h b/linden/indra/newview/llfloaterfriends.h
index afb206e..64f39bf 100644
--- a/linden/indra/newview/llfloaterfriends.h
+++ b/linden/indra/newview/llfloaterfriends.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergesture.cpp b/linden/indra/newview/llfloatergesture.cpp
index 5383813..5dc0c45 100644
--- a/linden/indra/newview/llfloatergesture.cpp
+++ b/linden/indra/newview/llfloatergesture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergesture.h b/linden/indra/newview/llfloatergesture.h
index 82c8c27..339f54a 100644
--- a/linden/indra/newview/llfloatergesture.h
+++ b/linden/indra/newview/llfloatergesture.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index 9a78fff..7d54ecf 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergodtools.h b/linden/indra/newview/llfloatergodtools.h
index 4fd9fc1..31ba18e 100644
--- a/linden/indra/newview/llfloatergodtools.h
+++ b/linden/indra/newview/llfloatergodtools.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index a095a64..0f54f02 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroupinfo.h b/linden/indra/newview/llfloatergroupinfo.h
index 2ce7102..937d8a2 100644
--- a/linden/indra/newview/llfloatergroupinfo.h
+++ b/linden/indra/newview/llfloatergroupinfo.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroupinvite.cpp b/linden/indra/newview/llfloatergroupinvite.cpp
index 1644050..ba8def0 100644
--- a/linden/indra/newview/llfloatergroupinvite.cpp
+++ b/linden/indra/newview/llfloatergroupinvite.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroupinvite.h b/linden/indra/newview/llfloatergroupinvite.h
index 96b9161..0e6788c 100644
--- a/linden/indra/newview/llfloatergroupinvite.h
+++ b/linden/indra/newview/llfloatergroupinvite.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 39f6b7a..23e2f4d 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index ad3ecac..70ed3e4 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterhardwaresettings.cpp b/linden/indra/newview/llfloaterhardwaresettings.cpp
index ec29469..df23672 100644
--- a/linden/indra/newview/llfloaterhardwaresettings.cpp
+++ b/linden/indra/newview/llfloaterhardwaresettings.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterhardwaresettings.h b/linden/indra/newview/llfloaterhardwaresettings.h
index be78d81..d8a8901 100644
--- a/linden/indra/newview/llfloaterhardwaresettings.h
+++ b/linden/indra/newview/llfloaterhardwaresettings.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
new file mode 100644
index 0000000..21f34de
--- /dev/null
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -0,0 +1,253 @@
+/** 
+ * @file llfloaterhtml.cpp
+ * @brief In-world HTML dialog
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("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 "llfloaterhtml.h"
+
+// viewer includes
+#include "lluictrlfactory.h"
+#include "llviewercontrol.h"
+#include "lllineeditor.h"
+#include "llviewerwindow.h"
+#include "llweb.h"
+
+#include "llwebbrowserctrl.h"
+
+LLFloaterHtml* LLFloaterHtml::sInstance = 0;
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterHtml* LLFloaterHtml::getInstance()
+{
+    if ( ! sInstance )
+        sInstance = new LLFloaterHtml();
+
+        return sInstance;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterHtml::LLFloaterHtml()
+:       LLFloater( std::string("HTML Floater") )
+
+        ,
+        mWebBrowser( 0 )
+{
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html.xml" );
+
+        childSetAction("back_btn", onClickBack, this);
+        childSetAction("home_btn", onClickHome, this);
+        childSetAction("forward_btn", onClickForward, this);
+        childSetAction("close_btn", onClickClose, this);
+        childSetCommitCallback("url_edit", onCommitUrlEdit, this );
+        childSetAction("go_btn", onClickGo, this );
+
+        // reposition floater from saved settings
+        LLRect rect = gSavedSettings.getRect( "FloaterHtmlRect" );
+        reshape( rect.getWidth(), rect.getHeight(), FALSE );
+        setRect( rect );
+
+        mWebBrowser = getChild<LLWebBrowserCtrl>("html_floater_browser" );
+        if ( mWebBrowser )
+        {
+                // open links in internal browser
+                mWebBrowser->setOpenInExternalBrowser( false );
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterHtml::~LLFloaterHtml()
+{
+        // save position of floater
+        gSavedSettings.setRect( "FloaterHtmlRect", getRect() );
+
+        sInstance = 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual 
+void LLFloaterHtml::draw()
+{
+        // enable/disable buttons depending on state
+        if ( mWebBrowser )
+        {
+                bool enable_back = mWebBrowser->canNavigateBack();      
+                childSetEnabled( "back_btn", enable_back );
+
+                bool enable_forward = mWebBrowser->canNavigateForward();        
+                childSetEnabled( "forward_btn", enable_forward );
+        };
+
+        LLFloater::draw();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtml::show( std::string content_id, bool open_link_external, bool open_app_slurls )
+{
+        // calculate the XML labels we'll need (if only XML folders worked)
+        std::string title_str = content_id + "_title";
+        std::string url_str = content_id + "_url";
+
+        std::string title = getString( title_str );
+        std::string url = getString( url_str );
+
+        show( url, title, open_link_external, open_app_slurls );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtml::show( std::string start_url, std::string title, bool open_link_external, bool open_app_slurls )
+{
+        // set the title 
+        setTitle( title );
+
+        // navigate to the URL
+        if ( mWebBrowser )
+        {
+                mWebBrowser->setOpenAppSLURLs( open_app_slurls );
+                mWebBrowser->setOpenInExternalBrowser( open_link_external );
+                mWebBrowser->navigateTo( start_url );
+        }
+
+        // make floater appear
+        setVisibleAndFrontmost();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+std::string LLFloaterHtml::getSupportUrl()
+{
+        return getString("support_page_url");
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtml::onClose( bool app_quitting )
+{
+        setVisible( false );
+        // HACK for fast XML iteration replace with:
+        // destroy();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtml::onClickClose( void* data )
+{
+        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        self->close();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// static
+void LLFloaterHtml::onClickBack( void* data )
+{
+        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        if ( self )
+        {
+                if ( self->mWebBrowser )
+                {
+                        self->mWebBrowser->navigateBack();
+                };
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtml::onClickHome( void* data )
+{
+        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        if ( self )
+        {
+                if ( self->mWebBrowser )
+                {
+                        std::string home_url = self->getString("home_page_url");
+                        if ( home_url.length() > 4 )
+                        {
+                                self->mWebBrowser->navigateTo( home_url );
+                        }
+                        else
+                        {
+                                llwarns << "Invalid home page specified for HTML floater - navigating to default" << llendl;
+                                self->mWebBrowser->navigateTo( "http://secondlife.com" );
+                        }
+                };
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// static
+void LLFloaterHtml::onClickForward( void* data )
+{
+        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        if ( self )
+        {
+                if ( self->mWebBrowser )
+                {
+                        self->mWebBrowser->navigateForward();
+                };
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// static
+void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterHtml* self = (LLFloaterHtml*)user_data;
+
+        LLLineEditor* editor = (LLLineEditor*)ctrl;
+        std::string url = editor->getText();
+
+        if ( self->mWebBrowser )
+        {
+                self->mWebBrowser->navigateTo( url );
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//  static
+void LLFloaterHtml::onClickGo( void* data )
+{
+        LLFloaterHtml* self = ( LLFloaterHtml* )data;
+        if ( self )
+        {
+                std::string url = self->childGetValue( "url_edit" ).asString();
+                if ( url.length() )
+                {
+                        if ( self->mWebBrowser )
+                        {
+                                self->mWebBrowser->navigateTo( url );
+                        }
+                }
+        }
+}
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
new file mode 100644
index 0000000..0151727
--- /dev/null
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -0,0 +1,76 @@
+ /** 
+ * @file llfloaterhtml.h
+ * @author James Cook
+ * @brief In-world HTML dialog
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("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_LLFLOATERHTML_H
+#define LL_LLFLOATERHTML_H
+
+#include "llfloater.h"
+#include "llhtmlhelp.h"
+
+class LLWebBrowserCtrl;
+
+class LLFloaterHtml :
+        public LLFloater
+{
+        public:
+                static LLFloaterHtml* getInstance();
+                virtual ~LLFloaterHtml();
+                
+                virtual void draw();
+                virtual void onClose( bool app_quitting );
+                
+                // Pass string like "in-world_help" or "additional help"
+                void show( std::string 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_link_external, bool open_app_slurls );
+
+                std::string getSupportUrl(); 
+                
+                static void onClickClose( void* data );
+                static void onClickBack( void* data );
+                static void onClickHome( void* data );
+                static void onClickForward( void* data );
+                static void onCommitUrlEdit(LLUICtrl* ctrl, void* user_data);
+                static void onClickGo( void* data );
+                
+        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 85122c7..4a00a48 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index d52d8d3..7722fbd 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterhud.cpp b/linden/indra/newview/llfloaterhud.cpp
index cfdaba5..58e370c 100644
--- a/linden/indra/newview/llfloaterhud.cpp
+++ b/linden/indra/newview/llfloaterhud.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -84,12 +84,7 @@ LLFloaterHUD::LLFloaterHUD()
                 // arrow keys during tutorial).
                 mWebBrowser->setTakeFocusOnClick(false);
 
-                std::string language(gSavedSettings.getString("Language"));
-                if(language == "default")
-                {
-                        language = gSavedSettings.getString("SystemLanguage");
-                }
-        
+                std::string language = LLUI::getLanguage();
                 std::string base_url = gSavedSettings.getString("TutorialURL");
 
                 std::string url = base_url + language + "/";
diff --git a/linden/indra/newview/llfloaterhud.h b/linden/indra/newview/llfloaterhud.h
index 35221ef..e0712cd 100644
--- a/linden/indra/newview/llfloaterhud.h
+++ b/linden/indra/newview/llfloaterhud.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2008&license=viewergpl$
  * 
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 912a4fc..4a8c66e 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -75,7 +75,7 @@ LLFloaterImagePreview::LLFloaterImagePreview(const std::string& filename) :
 {
         mLastMouseX = 0;
         mLastMouseY = 0;
-        mGLName = 0;
+        mImagep = NULL ;
         loadImage(mFilenameAndPath);
 }
 
@@ -138,10 +138,7 @@ LLFloaterImagePreview::~LLFloaterImagePreview()
         delete mAvatarPreview;
         delete mSculptedPreview;
         
-        if (mGLName)
-        {
-                glDeleteTextures(1, &mGLName );
-        }
+        mImagep = NULL ;
 }
 
 //static 
@@ -224,44 +221,31 @@ void LLFloaterImagePreview::draw()
                         gl_rect_2d_checkerboard(mPreviewRect);
                         LLGLDisable gls_alpha(GL_ALPHA_TEST);
 
-                        GLenum format_options[4] = { GL_LUMINANCE, GL_LUMINANCE_ALPHA, GL_RGB, GL_RGBA };
-                        GLenum format = format_options[mRawImagep->getComponents()-1];
-
-                        GLenum internal_format_options[4] = { GL_LUMINANCE8, GL_LUMINANCE8_ALPHA8, GL_RGB8, GL_RGBA8 };
-                        GLenum internal_format = internal_format_options[mRawImagep->getComponents()-1];
-                
-                        if (mGLName)
+                        if(mImagep.notNull())
                         {
-                                LLImageGL::bindExternalTexture( mGLName, 0, GL_TEXTURE_2D ); 
+                                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mImagep->getTexName());
                         }
                         else
                         {
-                                glGenTextures(1, &mGLName );
-                                stop_glerror();
-
-                                LLImageGL::bindExternalTexture( mGLName, 0, GL_TEXTURE_2D ); 
-                                stop_glerror();
-
-                                glTexImage2D(
-                                        GL_TEXTURE_2D, 0, internal_format, 
-                                        mRawImagep->getWidth(), mRawImagep->getHeight(),
-                                        0, format, GL_UNSIGNED_BYTE, mRawImagep->getData());
+                                mImagep = new LLImageGL(mRawImagep, FALSE) ;
+                                
+                                gGL.getTexUnit(0)->unbind(mImagep->getTarget()) ;
+                                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mImagep->getTexName());
                                 stop_glerror();
 
                                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                                 
-                                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                                gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
                                 if (mAvatarPreview)
                                 {
-                                        mAvatarPreview->setTexture(mGLName);
-                                        mSculptedPreview->setTexture(mGLName);
+                                        mAvatarPreview->setTexture(mImagep->getTexName());
+                                        mSculptedPreview->setTexture(mImagep->getTexName());
                                 }
                         }
 
                         gGL.color3f(1.f, 1.f, 1.f);
-                        gGL.begin( LLVertexBuffer::QUADS );
+                        gGL.begin( LLRender::QUADS );
                         {
                                 gGL.texCoord2f(mPreviewImageRect.mLeft, mPreviewImageRect.mTop);
                                 gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
@@ -274,7 +258,7 @@ void LLFloaterImagePreview::draw()
                         }
                         gGL.end();
 
-                        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                         stop_glerror();
                 }
@@ -285,11 +269,15 @@ void LLFloaterImagePreview::draw()
                                 gGL.color3f(1.f, 1.f, 1.f);
 
                                 if (selected == 9)
-                                        mSculptedPreview->bindTexture();
+                                {
+                                        gGL.getTexUnit(0)->bind(mSculptedPreview->getTexture());
+                                }
                                 else
-                                        mAvatarPreview->bindTexture();
+                                {
+                                        gGL.getTexUnit(0)->bind(mAvatarPreview->getTexture());
+                                }
 
-                                gGL.begin( LLVertexBuffer::QUADS );
+                                gGL.begin( LLRender::QUADS );
                                 {
                                         gGL.texCoord2f(0.f, 1.f);
                                         gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT);
@@ -302,10 +290,7 @@ void LLFloaterImagePreview::draw()
                                 }
                                 gGL.end();
 
-                                if (selected == 9)
-                                        mSculptedPreview->unbindTexture();
-                                else
-                                        mAvatarPreview->unbindTexture();
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         }
                 }
         }
@@ -774,7 +759,9 @@ LLImagePreviewSculpted::LLImagePreviewSculpted(S32 width, S32 height) : LLDynami
         LLVolumeParams volume_params;
         volume_params.setType(LL_PCODE_PROFILE_CIRCLE, LL_PCODE_PATH_CIRCLE);
         volume_params.setSculptID(LLUUID::null, LL_SCULPT_TYPE_SPHERE);
-        mVolume = new LLVolume(volume_params, (F32) MAX_LOD);
+        
+        F32 const HIGHEST_LOD = 4.0f;
+        mVolume = new LLVolume(volume_params,  HIGHEST_LOD);
 
         /*
         mDummyAvatar = new LLVOAvatar(LLUUID::null, LL_PCODE_LEGACY_AVATAR, gAgent.getRegion());
@@ -811,7 +798,36 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance)
         {
                 mVolume->sculpt(imagep->getWidth(), imagep->getHeight(), imagep->getComponents(), imagep->getData(), 0);
         }
-        
+
+        const LLVolumeFace &vf = mVolume->getVolumeFace(0);
+        U32 num_indices = vf.mIndices.size();
+        U32 num_vertices = vf.mVertices.size();
+
+        mVertexBuffer = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL, 0);
+        mVertexBuffer->allocateBuffer(num_vertices, num_indices, TRUE);
+
+        LLStrider<LLVector3> vertex_strider;
+        LLStrider<LLVector3> normal_strider;
+        LLStrider<U16> index_strider;
+
+        mVertexBuffer->getVertexStrider(vertex_strider);
+        mVertexBuffer->getNormalStrider(normal_strider);
+        mVertexBuffer->getIndexStrider(index_strider);
+
+        // build vertices and normals
+        for (U32 i = 0; (S32)i < num_vertices; i++)
+        {
+                *(vertex_strider++) = vf.mVertices[i].mPosition;
+                LLVector3 normal = vf.mVertices[i].mNormal;
+                normal.normalize();
+                *(normal_strider++) = normal;
+        }
+
+        // build indices
+        for (U16 i = 0; i < num_indices; i++)
+        {
+                *(index_strider++) = vf.mIndices[i];
+        }
 }
 
 
@@ -846,7 +862,7 @@ BOOL LLImagePreviewSculpted::render()
         glMatrixMode(GL_MODELVIEW);
         gGL.popMatrix();
 
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glClear(GL_DEPTH_BUFFER_BIT);
         
         LLVector3 target_pos(0, 0, 0);
 
@@ -865,55 +881,21 @@ BOOL LLImagePreviewSculpted::render()
         LLViewerCamera::getInstance()->setView(LLViewerCamera::getInstance()->getDefaultFOV() / mCameraZoom);
         LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
 
-        gPipeline.enableLightsAvatar();
-                
-        gGL.pushMatrix();
-        glScalef(0.5, 0.5, 0.5);
-        
         const LLVolumeFace &vf = mVolume->getVolumeFace(0);
         U32 num_indices = vf.mIndices.size();
-        U32 num_vertices = vf.mVertices.size();
-
-        if (num_vertices > 0 && num_indices > 0)
-        {
-                glEnableClientState(GL_NORMAL_ARRAY);
-                // build vertices and normals
-                F32* vertices = new F32[num_vertices * 3];
-                F32* normals = new F32[num_vertices * 3];
-
-                for (U32 i = 0; (S32)i < num_vertices; i++)
-                {
-                        LLVector3 position = vf.mVertices[i].mPosition;
-                        vertices[i*3]   = position.mV[VX];
-                        vertices[i*3+1] = position.mV[VY];
-                        vertices[i*3+2] = position.mV[VZ];
-                        
-                        LLVector3 normal = vf.mVertices[i].mNormal;
-                        normals[i*3]   = normal.mV[VX];
-                        normals[i*3+1] = normal.mV[VY];
-                        normals[i*3+2] = normal.mV[VZ];
-                }
+        
+        mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_NORMAL);
 
-                // build indices
-                U16* indices = new U16[num_indices];
-                for (U16 i = 0; i < num_indices; i++)
-                {
-                        indices[i] = vf.mIndices[i];
-                }
+        gPipeline.enableLightsAvatar();
+        gGL.pushMatrix();
+        const F32 SCALE = 1.25f;
+        gGL.scalef(SCALE, SCALE, SCALE);
+        const F32 BRIGHTNESS = 0.9f;
+        gGL.color3f(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS);
+        mVertexBuffer->draw(LLRender::TRIANGLES, num_indices, 0);
 
-                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_vertices-1, num_indices, GL_UNSIGNED_SHORT, (void *)indices);
+        gGL.popMatrix();
                 
-                gGL.popMatrix();
-                glDisableClientState(GL_NORMAL_ARRAY);
-
-                delete [] indices;
-                delete [] vertices;
-                delete [] normals;
-        }
-
         return TRUE;
 }
 
diff --git a/linden/indra/newview/llfloaterimagepreview.h b/linden/indra/newview/llfloaterimagepreview.h
index 9d80f09..d511caa 100644
--- a/linden/indra/newview/llfloaterimagepreview.h
+++ b/linden/indra/newview/llfloaterimagepreview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -41,6 +41,7 @@ class LLJoint;
 class LLViewerJointMesh;
 class LLVOAvatar;
 class LLTextBox;
+class LLVertexBuffer;
 
 class LLImagePreviewSculpted : public LLDynamicTexture
 {
@@ -67,6 +68,7 @@ class LLImagePreviewSculpted : public LLDynamicTexture
         F32                     mCameraZoom;
         LLVector3       mCameraOffset;
         LLPointer<LLVolume> mVolume;
+        LLPointer<LLVertexBuffer> mVertexBuffer;
 };
 
 
@@ -127,7 +129,7 @@ protected:
         S32                             mLastMouseY;
         LLRect                  mPreviewRect;
         LLRectf                 mPreviewImageRect;
-        GLuint                  mGLName;
+        LLPointer<LLImageGL> mImagep ;
 
         static S32              sUploadAmount;
 };
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 8a665b5..e1d3c4a 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -206,14 +206,19 @@ void LLFloaterInspect::refresh()
         mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
         //List all transient objects, then all linked objects
 
-        //Crash fix for VWR-10823
-        for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); 
-                                iter != mObjectSelection->valid_end(); iter++) 
+        for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin();
+             iter != mObjectSelection->valid_end(); iter++)
         {
                 LLSelectNode* obj = *iter;
                 LLSD row;
                 char time[MAX_STRING];
                 std::string owner_name, creator_name;
+
+                if (obj->mCreationDate == 0)
+                {       // Don't have valid information from the server, so skip this one
+                        continue;
+                }
+
                 time_t timestamp = (time_t) (obj->mCreationDate/1000000);
                 LLStringUtil::copy(time, ctime(&timestamp), MAX_STRING);
                 time[24] = '\0';
diff --git a/linden/indra/newview/llfloaterinspect.h b/linden/indra/newview/llfloaterinspect.h
index 5db1dae..87473b9 100644
--- a/linden/indra/newview/llfloaterinspect.h
+++ b/linden/indra/newview/llfloaterinspect.h
@@ -6,7 +6,7 @@
 *
 * $LicenseInfo:firstyear=2006&license=viewergpl$
 * 
-* Copyright (c) 2006-2008, Linden Research, Inc.
+* Copyright (c) 2006-2009, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 172da1d..f46e46d 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -46,7 +46,7 @@
 #include "llviewerjoystick.h"
 
 LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
-        : LLFloater(std::string("floater_joystick"))
+        : LLFloater("floater_joystick")
 {
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
         center();
diff --git a/linden/indra/newview/llfloaterjoystick.h b/linden/indra/newview/llfloaterjoystick.h
index b35b39f..8d729a2 100644
--- a/linden/indra/newview/llfloaterjoystick.h
+++ b/linden/indra/newview/llfloaterjoystick.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterlagmeter.cpp b/linden/indra/newview/llfloaterlagmeter.cpp
index 35e679d..2367c4d 100644
--- a/linden/indra/newview/llfloaterlagmeter.cpp
+++ b/linden/indra/newview/llfloaterlagmeter.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -183,7 +183,7 @@ void LLFloaterLagMeter::determineClient()
                 {
                         mClientCause->setText( getString("client_texture_loading_cause_msg", mStringArgs) );
                 }
-                else if(LLViewerImage::sBoundTextureMemory > LLViewerImage::sMaxBoundTextureMem)
+                else if((LLViewerImage::sBoundTextureMemory >> 20) > LLViewerImage::sMaxBoundTextureMem)
                 {
                         mClientCause->setText( getString("client_texture_memory_cause_msg", mStringArgs) );
                 }
diff --git a/linden/indra/newview/llfloaterlagmeter.h b/linden/indra/newview/llfloaterlagmeter.h
index ae6c19f..21967ec 100644
--- a/linden/indra/newview/llfloaterlagmeter.h
+++ b/linden/indra/newview/llfloaterlagmeter.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 891cde7..e1d08da 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -1448,7 +1448,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
                 msg->getBOOLFast(_PREHASH_Data, _PREHASH_IsGroupOwned,  is_group_owned, i);
                 msg->getS32Fast (_PREHASH_Data, _PREHASH_Count,                 object_count,   i);
                 msg->getBOOLFast(_PREHASH_Data, _PREHASH_OnlineStatus,  is_online,              i);
-                if(msg->getNumberOfBlocks("DataExtended"))
+                if(msg->has("DataExtended"))
                 {
                         msg->getU32("DataExtended", "TimeStamp", most_recent_time, i);
                 }
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 79f2f2c..5f2b970 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterlandholdings.cpp b/linden/indra/newview/llfloaterlandholdings.cpp
index 3694671..149accb 100644
--- a/linden/indra/newview/llfloaterlandholdings.cpp
+++ b/linden/indra/newview/llfloaterlandholdings.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterlandholdings.h b/linden/indra/newview/llfloaterlandholdings.h
index 6922739..3d5e9a4 100644
--- a/linden/indra/newview/llfloaterlandholdings.h
+++ b/linden/indra/newview/llfloaterlandholdings.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterlandmark.cpp b/linden/indra/newview/llfloaterlandmark.cpp
index 71e35e8..e9979de 100644
--- a/linden/indra/newview/llfloaterlandmark.cpp
+++ b/linden/indra/newview/llfloaterlandmark.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,73 +34,28 @@
 #include "llfloaterlandmark.h"
 
 #include "llagent.h"
-#include "llviewerimagelist.h"
 #include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llbutton.h"
-#include "lldraghandle.h"
-#include "llfocusmgr.h"
-#include "llviewerimage.h"
 #include "llviewerparcelmgr.h"
 #include "llfolderview.h"
 #include "llinventory.h"
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
-#include "lllineeditor.h"
-#include "llui.h"
 #include "llviewerinventory.h"
 #include "llpermissions.h"
 #include "llsaleinfo.h"
-#include "llassetstorage.h"
-#include "lltextbox.h"
 #include "llparcel.h"
-#include "llresizehandle.h"
-#include "llscrollcontainer.h"
-#include "lltoolmgr.h"
-#include "lltoolpipette.h"
-
-#include "lltool.h"
-#include "llviewerwindow.h"
-#include "llviewerobject.h"
+
+#include "llviewerwindow.h"             // alertXml
 #include "llviewercontrol.h"
-#include "llglheaders.h"
 #include "lluictrlfactory.h"
 
-#include "roles_constants.h"
-
-
-
-static const S32 CLOSE_BTN_WIDTH = 100;
-const S32 PIPETTE_BTN_WIDTH = 32;
-static const S32 HPAD = 4;
-static const S32 VPAD = 4;
-static const S32 LINE = 16;
-static const S32 SMALL_BTN_WIDTH = 64;
-static const S32 TEX_PICKER_MIN_WIDTH = 
-        (HPAD +
-        CLOSE_BTN_WIDTH +
-        HPAD +
-        CLOSE_BTN_WIDTH +
-        HPAD + 
-        SMALL_BTN_WIDTH +
-        HPAD +
-        SMALL_BTN_WIDTH +
-        HPAD + 
-        30 +
-        RESIZE_HANDLE_WIDTH * 2);
-static const S32 CLEAR_BTN_WIDTH = 50;
-static const S32 TEX_PICKER_MIN_HEIGHT = 290;
-static const S32 FOOTER_HEIGHT = 100;
-static const S32 BORDER_PAD = HPAD;
-static const S32 TEXTURE_INVENTORY_PADDING = 30;
+#include "roles_constants.h"    // GP_LAND_ALLOW_LANDMARK
+
+
 static const F32 CONTEXT_CONE_IN_ALPHA = 0.0f;
 static const F32 CONTEXT_CONE_OUT_ALPHA = 1.f;
 static const F32 CONTEXT_FADE_TIME = 0.08f;
 
-//static const char CURRENT_IMAGE_NAME[] = "Current Landmark";
-//static const char WHITE_IMAGE_NAME[] = "Blank Landmark";
-//static const char NO_IMAGE_NAME[] = "None";
-
 
 LLFloaterLandmark::LLFloaterLandmark(const LLSD& data)
         :
@@ -167,6 +122,7 @@ LLFloaterLandmark::LLFloaterLandmark(const LLSD& data)
 LLFloaterLandmark::~LLFloaterLandmark()
 {
         delete mSavedFolderState;
+        mSavedFolderState = NULL;
 }
 
 void LLFloaterLandmark::setActive( BOOL active )                                        
diff --git a/linden/indra/newview/llfloaterlandmark.h b/linden/indra/newview/llfloaterlandmark.h
index cf71138..3e7d994 100644
--- a/linden/indra/newview/llfloaterlandmark.h
+++ b/linden/indra/newview/llfloaterlandmark.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,9 +32,7 @@
 #ifndef LL_LLFLOATERLANDMARK_H
 #define LL_LLFLOATERLANDMARK_H
 
-#include "llcoord.h"
 #include "llfloater.h"
-#include "llstring.h"
 #include "lluictrl.h"
 #include "llpermissionsflags.h"
 
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index b333ff2..b1aa6c7 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index 525ce0e..91226dd 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatermemleak.cpp b/linden/indra/newview/llfloatermemleak.cpp
index 16be9df..80775e7 100644
--- a/linden/indra/newview/llfloatermemleak.cpp
+++ b/linden/indra/newview/llfloatermemleak.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatermemleak.h b/linden/indra/newview/llfloatermemleak.h
index 6a7b157..906afa1 100644
--- a/linden/indra/newview/llfloatermemleak.h
+++ b/linden/indra/newview/llfloatermemleak.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatermute.cpp b/linden/indra/newview/llfloatermute.cpp
index f77b8c2..0bcb102 100644
--- a/linden/indra/newview/llfloatermute.cpp
+++ b/linden/indra/newview/llfloatermute.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatermute.h b/linden/indra/newview/llfloatermute.h
index 0228251..7e0c8d0 100644
--- a/linden/indra/newview/llfloatermute.h
+++ b/linden/indra/newview/llfloatermute.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index 3cafdd1..ec0fc6e 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaternamedesc.h b/linden/indra/newview/llfloaternamedesc.h
index 9cb0488..0467491 100644
--- a/linden/indra/newview/llfloaternamedesc.h
+++ b/linden/indra/newview/llfloaternamedesc.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index eda9660..202f53c 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaternewim.h b/linden/indra/newview/llfloaternewim.h
index e4a7717..39c3525 100644
--- a/linden/indra/newview/llfloaternewim.h
+++ b/linden/indra/newview/llfloaternewim.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index 753c254..a83b0c9 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloateropenobject.h b/linden/indra/newview/llfloateropenobject.h
index b431f2c..5989460 100644
--- a/linden/indra/newview/llfloateropenobject.h
+++ b/linden/indra/newview/llfloateropenobject.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterparcel.cpp b/linden/indra/newview/llfloaterparcel.cpp
index 6288782..f12467a 100644
--- a/linden/indra/newview/llfloaterparcel.cpp
+++ b/linden/indra/newview/llfloaterparcel.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterparcel.h b/linden/indra/newview/llfloaterparcel.h
index 24a7ee8..8dfaf7b 100644
--- a/linden/indra/newview/llfloaterparcel.h
+++ b/linden/indra/newview/llfloaterparcel.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.cpp b/linden/indra/newview/llfloaterpermissionsmgr.cpp
index 14ec7cd..cb576f1 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.cpp
+++ b/linden/indra/newview/llfloaterpermissionsmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpermissionsmgr.h b/linden/indra/newview/llfloaterpermissionsmgr.h
index cc89f97..50306b4 100644
--- a/linden/indra/newview/llfloaterpermissionsmgr.h
+++ b/linden/indra/newview/llfloaterpermissionsmgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index b4bcdb7..0eb150b 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,6 +63,8 @@
 
 #include "llassetuploadresponders.h"
 
+#include <boost/regex.hpp>  //boost.regex lib
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -180,7 +182,7 @@ void LLFloaterPostcard::draw()
                         rect.mBottom = (S32)((F32)rect.mTop - ((F32)rect.getWidth() / ratio));
                 }
                 {
-                        LLGLSNoTexture gls_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f));
                         rect.stretch(-1);
                 }
@@ -242,14 +244,16 @@ void LLFloaterPostcard::onClickSend(void* data)
 
                 std::string from(self->childGetValue("from_form").asString());
                 std::string to(self->childGetValue("to_form").asString());
-
-                if (to.empty() || to.find('@') == std::string::npos)
+                
+                boost::regex emailFormat("[A-Za-z0-9.%+-_]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}(,[ \t]*[A-Za-z0-9.%+-_]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,})*");
+                
+                if (to.empty() || !boost::regex_match(to, emailFormat))
                 {
                         gViewerWindow->alertXml("PromptRecipientEmail");
                         return;
                 }
 
-                if (from.empty() || from.find('@') == std::string::npos)
+                if (from.empty() || !boost::regex_match(from, emailFormat))
                 {
                         gViewerWindow->alertXml("PromptSelfEmail");
                         return;
diff --git a/linden/indra/newview/llfloaterpostcard.h b/linden/indra/newview/llfloaterpostcard.h
index 94e40aa..094b9be 100644
--- a/linden/indra/newview/llfloaterpostcard.h
+++ b/linden/indra/newview/llfloaterpostcard.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpostprocess.cpp b/linden/indra/newview/llfloaterpostprocess.cpp
index a804a84..569a74c 100644
--- a/linden/indra/newview/llfloaterpostprocess.cpp
+++ b/linden/indra/newview/llfloaterpostprocess.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpostprocess.h b/linden/indra/newview/llfloaterpostprocess.h
index 03de20f..da55ccc 100644
--- a/linden/indra/newview/llfloaterpostprocess.h
+++ b/linden/indra/newview/llfloaterpostprocess.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 82d8cc9..5451ca0 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -424,8 +424,6 @@ void LLFloaterPreference::onClickAbout(void*)
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
-        LLPanelLogin::refreshLocation( false );
-
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         // commit any outstanding text entry
         if (fp->hasFocus())
@@ -453,6 +451,8 @@ void LLFloaterPreference::onBtnOK( void* userdata )
                 // Show beep, pop up dialog, etc.
                 llinfos << "Can't close preferences!" << llendl;
         }
+
+        LLPanelLogin::refreshLocation( false );
 }
 
 
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 2a19f26..bfa2499 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index e15d4db..eddd56a 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterproperties.h b/linden/indra/newview/llfloaterproperties.h
index a459616..ca6ba24 100644
--- a/linden/indra/newview/llfloaterproperties.h
+++ b/linden/indra/newview/llfloaterproperties.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 8a4f621..6e0dba1 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index 7002b2c..41a94ce 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index e8643c0..7e9632d 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterreporter.h b/linden/indra/newview/llfloaterreporter.h
index 921f9a1..ff7f112 100644
--- a/linden/indra/newview/llfloaterreporter.h
+++ b/linden/indra/newview/llfloaterreporter.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp
index b83463c..efb1da6 100644
--- a/linden/indra/newview/llfloaterscriptdebug.cpp
+++ b/linden/indra/newview/llfloaterscriptdebug.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterscriptdebug.h b/linden/indra/newview/llfloaterscriptdebug.h
index c9951c9..6ae6a7d 100644
--- a/linden/indra/newview/llfloaterscriptdebug.h
+++ b/linden/indra/newview/llfloaterscriptdebug.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index c24818e..4d91770 100644
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatersellland.h b/linden/indra/newview/llfloatersellland.h
index 0b5a480..c238f20 100644
--- a/linden/indra/newview/llfloatersellland.h
+++ b/linden/indra/newview/llfloatersellland.h
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index cb22875..e440c4a 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatersettingsdebug.h b/linden/indra/newview/llfloatersettingsdebug.h
index 7aba482..eb0b89f 100644
--- a/linden/indra/newview/llfloatersettingsdebug.h
+++ b/linden/indra/newview/llfloatersettingsdebug.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index accbcb4..e07f436 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -152,7 +152,8 @@ public:
         void resetThumbnailImage() { mThumbnailImage = NULL ; }
         void drawPreviewRect(S32 offset_x, S32 offset_y) ;
 
-        static void onIdle( void* snapshot_preview );
+        // Returns TRUE when snapshot generated, FALSE otherwise.
+        static BOOL onIdle( void* snapshot_preview );
 
 private:
         LLColor4                                        mColor;
@@ -204,6 +205,8 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
         mCurImageIndex(0),
         mPreviewImage(NULL),
         mThumbnailImage(NULL) ,
+        mThumbnailWidth(0),
+        mThumbnailHeight(0),
         mPreviewImageEncoded(NULL),
         mFormattedImage(NULL),
         mShineCountdown(0),
@@ -343,14 +346,11 @@ void LLSnapshotLivePreview::updateSnapshot(BOOL new_snapshot, BOOL new_thumbnail
                 mSnapshotDelayTimer.start();
                 mSnapshotDelayTimer.setTimerExpirySec(delay);
         }
-        else if(new_thumbnail)
+        if(new_thumbnail)
         {
                 mThumbnailUpToDate = FALSE ;
         }
-        else
-        {
-                setThumbnailImageSize() ;
-        }
+        setThumbnailImageSize();
 }
 
 void LLSnapshotLivePreview::setSnapshotQuality(S32 quality)
@@ -418,14 +418,14 @@ void LLSnapshotLivePreview::draw()
 
                 LLColor4 image_color(1.f, 1.f, 1.f, 1.f);
                 gGL.color4fv(image_color.mV);
-                LLViewerImage::bindTexture(mViewerImage[mCurImageIndex]);
+                gGL.getTexUnit(0)->bind(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.begin(LLVertexBuffer::QUADS);
+                        gGL.begin(LLRender::QUADS);
                         {
                                 gGL.texCoord2f(uv_width, uv_height);
                                 gGL.vertex2i(rect.getWidth(), rect.getHeight() );
@@ -487,8 +487,8 @@ void LLSnapshotLivePreview::draw()
                                 S32 y1 = 0;
                                 S32 y2 = gViewerWindow->getWindowHeight();
 
-                                LLGLSNoTexture no_texture;
-                                gGL.begin(LLVertexBuffer::QUADS);
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+                                gGL.begin(LLRender::QUADS);
                                 {
                                         gGL.color4f(1.f, 1.f, 1.f, 0.f);
                                         gGL.vertex2i(x1, y1);
@@ -516,10 +516,10 @@ void LLSnapshotLivePreview::draw()
 
         // draw framing rectangle
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4f(1.f, 1.f, 1.f, 1.f);
                 LLRect outline_rect = mImageRect[mCurImageIndex];
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.vertex2i(outline_rect.mLeft - BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
                         gGL.vertex2i(outline_rect.mRight + BORDER_WIDTH, outline_rect.mTop + BORDER_WIDTH);
@@ -554,7 +554,7 @@ void LLSnapshotLivePreview::draw()
                         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]);
+                        gGL.getTexUnit(0)->bind(mViewerImage[old_image_index]);
                         // calculate UV scale
                         // *FIX get this to work with old image
                         BOOL rescale = !mImageScaled[old_image_index] && mViewerImage[mCurImageIndex].notNull();
@@ -565,7 +565,7 @@ void LLSnapshotLivePreview::draw()
                                 LLRect& rect = mImageRect[old_image_index];
                                 glTranslatef((F32)rect.mLeft, (F32)rect.mBottom - llround(getRect().getHeight() * 2.f * (fall_interp * fall_interp)), 0.f);
                                 glRotatef(-45.f * fall_interp, 0.f, 0.f, 1.f);
-                                gGL.begin(LLVertexBuffer::QUADS);
+                                gGL.begin(LLRender::QUADS);
                                 {
                                         gGL.texCoord2f(uv_width, uv_height);
                                         gGL.vertex2i(rect.getWidth(), rect.getHeight() );
@@ -720,8 +720,11 @@ void LLSnapshotLivePreview::generateThumbnailImage(BOOL force_update)
         mThumbnailUpdateLock = FALSE ;          
 }
 
+
+// Called often. Checks whether it's time to grab a new snapshot and if so, does it.
+// Returns TRUE if new snapshot generated, FALSE otherwise.
 //static 
-void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
+BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 {
         LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)snapshot_preview;     
 
@@ -734,7 +737,10 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                 previewp->mCameraRot = new_camera_rot;
                 // request a new snapshot whenever the camera moves, with a time delay
                 BOOL autosnap = gSavedSettings.getBOOL("AutoSnapshot");
-                previewp->updateSnapshot(autosnap, FALSE, autosnap ? AUTO_SNAPSHOT_TIME_DELAY : 0.f);
+                previewp->updateSnapshot(
+                        autosnap, // whether a new snapshot is needed or merely invalidate the existing one
+                        FALSE, // or if 1st arg is false, whether to produce a new thumbnail image.
+                        autosnap ? AUTO_SNAPSHOT_TIME_DELAY : 0.f); // shutter delay if 1st arg is true.
         }
 
         // see if it's time yet to snap the shot and bomb out otherwise.
@@ -743,7 +749,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                 && !LLToolCamera::getInstance()->hasMouseCapture(); // don't take snapshots while ALT-zoom active
         if ( ! previewp->mSnapshotActive)
         {
-                return;
+                return FALSE;
         }
 
         // time to produce a snapshot
@@ -835,6 +841,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                         }
                         if (previewp->mFormattedImage->encode(previewp->mPreviewImage, 0))
                         {
+                                previewp->mDataSize = previewp->mFormattedImage->getDataSize();
                                 // special case BMP to copy instead of decode otherwise decode will crash.
                                 if(format == LLFloaterSnapshot::SNAPSHOT_FORMAT_BMP)
                                 {
@@ -842,7 +849,6 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                                 }
                                 else
                                 {
-                                        previewp->mDataSize = previewp->mFormattedImage->getDataSize();
                                         previewp->mFormattedImage->decode(previewp->mPreviewImageEncoded, 0);
                                 }
                         }
@@ -871,7 +877,7 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
 
                         previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
                         previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
-                        LLViewerImage::bindTexture(previewp->mViewerImage[previewp->mCurImageIndex]);
+                        gGL.getTexUnit(0)->bind(previewp->mViewerImage[previewp->mCurImageIndex]);
                         previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
 
                         previewp->mSnapshotUpToDate = TRUE;
@@ -891,6 +897,8 @@ void LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                         previewp->generateThumbnailImage() ;
                 }
         }
+
+        return TRUE;
 }
 
 void LLSnapshotLivePreview::setSize(S32 w, S32 h)
@@ -907,6 +915,13 @@ void LLSnapshotLivePreview::getSize(S32& w, S32& h) const
 
 LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
 {
+        if(mViewerImage[mCurImageIndex].isNull())
+        {
+                //this should never happen!!
+                llwarns << "The snapshot image has not been generated!" << llendl ;
+                return NULL ;
+        }
+
         // calculate and pass in image scale in case image data only use portion
         // of viewerimage buffer
         LLVector2 image_scale(1.f, 1.f);
@@ -922,9 +937,10 @@ LLFloaterPostcard* LLSnapshotLivePreview::savePostcard()
                 return NULL;
         }
         LLFloaterPostcard* floater = LLFloaterPostcard::showFromSnapshot(jpg, mViewerImage[mCurImageIndex], image_scale, mPosTakenGlobal);
-        // relinquish lifetime of viewerimage and jpeg image to postcard floater
-        mViewerImage[mCurImageIndex] = NULL;
+        // relinquish lifetime of jpeg image to postcard floater
         mFormattedImage = NULL;
+        mDataSize = 0;
+        updateSnapshot(FALSE, FALSE);
 
         return floater;
 }
@@ -968,12 +984,20 @@ void LLSnapshotLivePreview::saveTexture()
                 llwarns << "Error encoding snapshot" << llendl;
         }
 
-        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );       
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_SNAPSHOT_COUNT );
+        
+        mDataSize = 0;
 }
 
 BOOL LLSnapshotLivePreview::saveLocal()
 {
         BOOL success = gViewerWindow->saveImageNumbered(mFormattedImage);
+
+        // Relinquish image memory. Save button will be disabled as a side-effect.
+        mFormattedImage = NULL;
+        mDataSize = 0;
+        updateSnapshot(FALSE, FALSE);
+
         if(success)
         {
                 gViewerWindow->playSnapshotAnimAndSound();
@@ -1013,7 +1037,8 @@ public:
         static void onClickKeepOpenCheck(LLUICtrl *ctrl, void* data);
         static void onClickKeepAspectCheck(LLUICtrl *ctrl, void* data);
         static void onCommitQuality(LLUICtrl* ctrl, void* data);
-        static void onCommitResolution(LLUICtrl* ctrl, void* data);
+        static void onCommitResolution(LLUICtrl* ctrl, void* data) { updateResolution(ctrl, data); }
+        static void updateResolution(LLUICtrl* ctrl, void* data, BOOL do_update = TRUE);
         static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data);
         static void onCommitLayerTypes(LLUICtrl* ctrl, void*data);
         static void onCommitSnapshotType(LLUICtrl* ctrl, void* data);
@@ -1112,11 +1137,8 @@ LLViewerWindow::ESnapshotType LLFloaterSnapshot::Impl::getLayerType(LLFloaterSna
 void LLFloaterSnapshot::Impl::setResolution(LLFloaterSnapshot* floater, const std::string& comboname)
 {
         LLComboBox* combo = floater->getChild<LLComboBox>(comboname);
-        if (combo)
-        {
                 combo->setVisible(TRUE);
-                onCommitResolution(combo, floater);
-        }
+        updateResolution(combo, floater, FALSE); // to sync spinners with combo
 }
 
 //static 
@@ -1126,22 +1148,18 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
 
         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 ;
+                previewp->mKeepAspectRatio = TRUE;
 
-                combo = floaterp->getChild<LLComboBox>("postcard_size_combo");
-                combo->setCurrentByIndex(0) ;
-                gSavedSettings.setS32("SnapshotPostcardLastResolution", 0) ;
+                floaterp->getChild<LLComboBox>("postcard_size_combo")->setCurrentByIndex(0);
+                gSavedSettings.setS32("SnapshotPostcardLastResolution", 0);
 
-                combo = floaterp->getChild<LLComboBox>("texture_size_combo");
-                combo->setCurrentByIndex(0) ;
-                gSavedSettings.setS32("SnapshotTextureLastResolution", 0) ;
+                floaterp->getChild<LLComboBox>("texture_size_combo")->setCurrentByIndex(0);
+                gSavedSettings.setS32("SnapshotTextureLastResolution", 0);
 
-                combo = floaterp->getChild<LLComboBox>("local_size_combo");
-                combo->setCurrentByIndex(0) ;
-                gSavedSettings.setS32("SnapshotLocalLastResolution", 0) ;
+                floaterp->getChild<LLComboBox>("local_size_combo")->setCurrentByIndex(0);
+                gSavedSettings.setS32("SnapshotLocalLastResolution", 0);
 
                 LLSnapshotLivePreview* previewp = getPreviewView(floaterp);
                 previewp->setSize(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
@@ -1206,7 +1224,11 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
         }
 }
 
-
+// This is the main function that keeps all the GUI controls in sync with the saved settings.
+// It should be called anytime a setting is changed that could affect the controls.
+// No other methods should be changing any of the controls directly except for helpers called by this method.
+// The basic pattern for programmatically changing the GUI settings is to first set the
+// appropriate saved settings and then call this method to sync the GUI with them.
 // static
 void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 {
@@ -1220,15 +1242,10 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         floater->childSetVisible("texture_size_combo", FALSE);
         floater->childSetVisible("local_size_combo", FALSE);
 
-        LLComboBox* combo;
-        combo = floater->getChild<LLComboBox>("postcard_size_combo");
-        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotPostcardLastResolution"));
-        combo = floater->getChild<LLComboBox>("texture_size_combo");
-        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotTextureLastResolution"));
-        combo = floater->getChild<LLComboBox>("local_size_combo");
-        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
-        combo = floater->getChild<LLComboBox>("local_format_combo");
-        if (combo) combo->selectNthItem(gSavedSettings.getS32("SnapshotFormat"));
+        floater->getChild<LLComboBox>("postcard_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotPostcardLastResolution"));
+        floater->getChild<LLComboBox>("texture_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotTextureLastResolution"));
+        floater->getChild<LLComboBox>("local_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
+        floater->getChild<LLComboBox>("local_format_combo")->selectNthItem(gSavedSettings.getS32("SnapshotFormat"));
 
         floater->childSetVisible("upload_btn",                  shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE);
         floater->childSetVisible("send_btn",                    shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
@@ -1260,6 +1277,23 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         floater->childSetVisible("auto_snapshot_check",         is_advance);
         floater->childSetVisible("image_quality_slider",        is_advance && show_slider);
 
+        LLSnapshotLivePreview* previewp = getPreviewView(floater);
+        BOOL got_bytes = previewp && previewp->getDataSize() > 0;
+        BOOL got_snap = previewp->getSnapshotUpToDate();
+
+        floater->childSetEnabled("send_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
+        floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE  && got_snap);
+        floater->childSetEnabled("save_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL    && got_snap);
+
+        LLLocale locale(LLLocale::USER_LOCALE);
+        std::string bytes_string;
+        LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
+        floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
+        floater->childSetColor("file_size_label", 
+                shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 
+                && got_bytes
+                && previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLColor4::red : gColors.getColor( "LabelTextColor" ));
+
         switch(shot_type)
         {
           case LLSnapshotLivePreview::SNAPSHOT_POSTCARD:
@@ -1290,7 +1324,6 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 
         updateResolutionTextEntry(floater);
 
-        LLSnapshotLivePreview* previewp = getPreviewView(floater);
         if (previewp)
         {
                 previewp->setSnapshotType(shot_type);
@@ -1385,6 +1418,8 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
                 {
                         checkAutoSnapshot(previewp);
                 }
+
+                updateControls(view);
         }
 }
 
@@ -1409,6 +1444,7 @@ void LLFloaterSnapshot::Impl::onClickAutoSnap(LLUICtrl *ctrl, void* data)
         if (view)
         {
                 checkAutoSnapshot(getPreviewView(view));
+                updateControls(view);
         }
 }
 
@@ -1421,9 +1457,12 @@ void LLFloaterSnapshot::Impl::onClickMore(void* data)
         {
                 view->translate( 0, view->getUIWinHeightShort() - view->getUIWinHeightLong() );
                 view->reshape(view->getRect().getWidth(), view->getUIWinHeightLong());
-
                 updateControls(view) ;
                 updateLayout(view) ;
+                if(getPreviewView(view))
+                {
+                        getPreviewView(view)->setThumbnailImageSize() ;
+        }
         }
 }
 void LLFloaterSnapshot::Impl::onClickLess(void* data)
@@ -1435,10 +1474,8 @@ void LLFloaterSnapshot::Impl::onClickLess(void* data)
         {
                 view->translate( 0, view->getUIWinHeightLong() - view->getUIWinHeightShort() );
                 view->reshape(view->getRect().getWidth(), view->getUIWinHeightShort());
-
                 updateControls(view) ;
                 updateLayout(view) ;
-
                 if(getPreviewView(view))
                 {
                         getPreviewView(view)->setThumbnailImageSize() ;
@@ -1478,6 +1515,7 @@ void LLFloaterSnapshot::Impl::onClickHighResCheck(LLUICtrl *ctrl, void* data)
                 }
                 view->childSetEnabled("ui_check", !check->get());
                 checkAutoSnapshot(getPreviewView(view), TRUE);
+                updateControls(view);
         }
 }
 
@@ -1491,6 +1529,7 @@ void LLFloaterSnapshot::Impl::onClickHUDCheck(LLUICtrl *ctrl, void* data)
         if (view)
         {
                 checkAutoSnapshot(getPreviewView(view), TRUE);
+                updateControls(view);
         }
 }
 
@@ -1524,6 +1563,7 @@ void LLFloaterSnapshot::Impl::onClickKeepAspectCheck(LLUICtrl* ctrl, void* data)
                         }
 
                         previewp->setSize(w, h) ;
+                        previewp->updateSnapshot(FALSE, TRUE);
                         checkAutoSnapshot(previewp, TRUE);
                 }
         }
@@ -1573,7 +1613,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
         }
 #endif
         
-        if(!index) //current window size
+        if(0 == index) //current window size
         {
                 sAspectRatioCheckOff = TRUE ;
                 view->childSetEnabled("keep_aspect_check", FALSE) ;
@@ -1610,8 +1650,27 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
         return ;
 }
 
+static std::string lastSnapshotWidthName()
+{
+        switch(gSavedSettings.getS32("LastSnapshotType"))
+        {
+        case LLSnapshotLivePreview::SNAPSHOT_POSTCARD: return "LastSnapshotToEmailWidth";
+        case LLSnapshotLivePreview::SNAPSHOT_TEXTURE:  return "LastSnapshotToInventoryWidth";
+        default:                                       return "LastSnapshotToDiskWidth";
+        }
+}
+static std::string lastSnapshotHeightName()
+{
+        switch(gSavedSettings.getS32("LastSnapshotType"))
+        {
+        case LLSnapshotLivePreview::SNAPSHOT_POSTCARD: return "LastSnapshotToEmailHeight";
+        case LLSnapshotLivePreview::SNAPSHOT_TEXTURE:  return "LastSnapshotToInventoryHeight";
+        default:                                       return "LastSnapshotToDiskHeight";
+        }
+}
+
 // static
-void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
+void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL do_update)
 {
         LLComboBox* combobox = (LLComboBox*)ctrl;
         LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
@@ -1622,13 +1681,9 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
         }
 
         // save off all selected resolution values
-        LLComboBox* combo;
-        combo = view->getChild<LLComboBox>("postcard_size_combo");
-        gSavedSettings.setS32("SnapshotPostcardLastResolution", combo->getCurrentIndex());
-        combo = view->getChild<LLComboBox>("texture_size_combo");
-        gSavedSettings.setS32("SnapshotTextureLastResolution", combo->getCurrentIndex());
-        combo = view->getChild<LLComboBox>("local_size_combo");
-        gSavedSettings.setS32("SnapshotLocalLastResolution", combo->getCurrentIndex());
+        gSavedSettings.setS32("SnapshotPostcardLastResolution", view->getChild<LLComboBox>("postcard_size_combo")->getCurrentIndex());
+        gSavedSettings.setS32("SnapshotTextureLastResolution",  view->getChild<LLComboBox>("texture_size_combo")->getCurrentIndex());
+        gSavedSettings.setS32("SnapshotLocalLastResolution",    view->getChild<LLComboBox>("local_size_combo")->getCurrentIndex());
 
         std::string sdstring = combobox->getSelectedValue();
         LLSD sdres;
@@ -1641,17 +1696,22 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
         LLSnapshotLivePreview* previewp = getPreviewView(view);
         if (previewp && combobox->getCurrentIndex() >= 0)
         {
+                S32 original_width = 0 , original_height = 0 ;
+                previewp->getSize(original_width, original_height) ;
+                
                 if (width == 0 || height == 0)
                 {
+                        // take resolution from current window size
                         previewp->setSize(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
                 }
                 else if (width == -1 || height == -1)
                 {
                         // load last custom value
-                        previewp->setSize(gSavedSettings.getS32("LastSnapshotWidth"), gSavedSettings.getS32("LastSnapshotHeight"));
+                        previewp->setSize(gSavedSettings.getS32(lastSnapshotWidthName()), gSavedSettings.getS32(lastSnapshotHeightName()));
                 }
                 else
                 {
+                        // use the resolution from the selected pre-canned drop-down choice
                         previewp->setSize(width, height);
                 }
 
@@ -1663,12 +1723,25 @@ void LLFloaterSnapshot::Impl::onCommitResolution(LLUICtrl* ctrl, void* data)
                 {
                         resetSnapshotSizeOnUI(view, width, height) ;
                 }
-                previewp->setSize(width, height);
+                
+                if(view->childGetValue("snapshot_width").asInteger() != width || view->childGetValue("snapshot_height").asInteger() != height)
+                {
+                        view->childSetValue("snapshot_width", width);
+                        view->childSetValue("snapshot_height", height);
+                }
+
+                if(original_width != width || original_height != 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, FALSE);
+                        // hide old preview as the aspect ratio could be wrong
+                        checkAutoSnapshot(previewp, FALSE);
+                        getPreviewView(view)->updateSnapshot(FALSE, TRUE);
+                        if(do_update)
+                        {
+                                updateControls(view);
+                        }
+                }
         }
 }
 
@@ -1717,17 +1790,28 @@ void LLFloaterSnapshot::Impl::onCommitSnapshotFormat(LLUICtrl* ctrl, void* data)
 
 
 
-
+// Sets the named size combo to "custom" mode.
 // static
 void LLFloaterSnapshot::Impl::comboSetCustom(LLFloaterSnapshot* floater, const std::string& comboname)
 {
         LLComboBox* combo = floater->getChild<LLComboBox>(comboname);
-        if (combo)
-        {
-                combo->setCurrentByIndex(combo->getItemCount() - 1);
 
-                checkAspectRatio(floater, -1);//combo->getCurrentIndex()) ;
+        combo->setCurrentByIndex(combo->getItemCount() - 1); // "custom" is always the last index
+
+        if(comboname == "postcard_size_combo") 
+        {
+                gSavedSettings.setS32("SnapshotPostcardLastResolution", combo->getCurrentIndex());
         }
+        else if(comboname == "texture_size_combo") 
+        {
+                gSavedSettings.setS32("SnapshotTextureLastResolution", combo->getCurrentIndex());
+        }
+        else if(comboname == "local_size_combo") 
+        {
+                gSavedSettings.setS32("SnapshotLocalLastResolution", combo->getCurrentIndex());
+        }
+
+        checkAspectRatio(floater, -1); // -1 means custom
 }
 
 
@@ -1753,8 +1837,8 @@ BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
 
                 //round to nearest power of 2 based on the direction of movement
                 // i.e. higher power of two if increasing texture resolution
-                if(gSavedSettings.getS32("LastSnapshotWidth") < width ||
-                        gSavedSettings.getS32("LastSnapshotHeight") < height)
+                if(gSavedSettings.getS32("LastSnapshotToInventoryWidth") < width ||
+                        gSavedSettings.getS32("LastSnapshotToInventoryHeight") < height)
                 {
                         // Up arrow pressed
                         width = get_next_power_two(width, MAX_TEXTURE_SIZE) ;
@@ -1814,20 +1898,10 @@ BOOL LLFloaterSnapshot::Impl::checkImageSize(LLSnapshotLivePreview* previewp, S3
 //static
 void LLFloaterSnapshot::Impl::resetSnapshotSizeOnUI(LLFloaterSnapshot *view, S32 width, S32 height)
 {
-        LLSpinCtrl *sctrl = view->getChild<LLSpinCtrl>("snapshot_width") ;
-        if(sctrl)
-        {
-                sctrl->forceSetValue(width) ;
-        }
-
-        sctrl = view->getChild<LLSpinCtrl>("snapshot_height") ;
-        if(sctrl)
-        {
-                sctrl->forceSetValue(height) ;
-        }
-
-        gSavedSettings.setS32("LastSnapshotWidth", width);
-        gSavedSettings.setS32("LastSnapshotHeight", height);
+        view->getChild<LLSpinCtrl>("snapshot_width")->forceSetValue(width);
+        view->getChild<LLSpinCtrl>("snapshot_height")->forceSetValue(height);
+        gSavedSettings.setS32(lastSnapshotWidthName(), width);
+        gSavedSettings.setS32(lastSnapshotHeightName(), height);
 }
 
 //static
@@ -1881,15 +1955,17 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
 
                                 previewp->setSize(w,h);
                                 checkAutoSnapshot(previewp, FALSE);
+                                previewp->updateSnapshot(FALSE, TRUE);
                                 comboSetCustom(view, "postcard_size_combo");
                                 comboSetCustom(view, "texture_size_combo");
                                 comboSetCustom(view, "local_size_combo");
                         }
                 }
 
-                gSavedSettings.setS32("LastSnapshotWidth", w);
-                gSavedSettings.setS32("LastSnapshotHeight", h);
+                gSavedSettings.setS32(lastSnapshotWidthName(), w);
+                gSavedSettings.setS32(lastSnapshotHeightName(), h);
 
+                updateControls(view);
         }
 }
 
@@ -1925,6 +2001,7 @@ LLFloaterSnapshot::~LLFloaterSnapshot()
         delete &impl;
 }
 
+
 BOOL LLFloaterSnapshot::postBuild()
 {
         childSetCommitCallback("snapshot_type_radio", Impl::onCommitSnapshotType, this);
@@ -1932,11 +2009,6 @@ BOOL LLFloaterSnapshot::postBuild()
         
         childSetAction("new_snapshot_btn", Impl::onClickNewSnapshot, this);
 
-        childSetValue("auto_snapshot_check", gSavedSettings.getBOOL("AutoSnapshot"));
-        childSetCommitCallback("auto_snapshot_check", Impl::onClickAutoSnap, this);
-
-        //childSetValue("advance_snapshot_check", gSavedSettings.getBOOL("AdvanceSnapshot"));
-        //childSetCommitCallback("advance_snapshot_check", Impl::onClickAdvanceSnap, this);
         childSetAction("more_btn", Impl::onClickMore, this);
         childSetAction("less_btn", Impl::onClickLess, this);
 
@@ -1949,10 +2021,10 @@ BOOL LLFloaterSnapshot::postBuild()
         childSetValue("image_quality_slider", gSavedSettings.getS32("SnapshotQuality"));
 
         childSetCommitCallback("snapshot_width", Impl::onCommitCustomResolution, this);
-
         childSetCommitCallback("snapshot_height", Impl::onCommitCustomResolution, this);
 
         childSetCommitCallback("ui_check", Impl::onClickUICheck, this);
+        childSetValue("ui_check", gSavedSettings.getBOOL("RenderUIInSnapshot"));
 
         childSetCommitCallback("high_res_check", Impl::onClickHighResCheck, this);
         childSetValue("high_res_check", gSavedSettings.getBOOL("HighResSnapshot"));
@@ -1970,12 +2042,15 @@ BOOL LLFloaterSnapshot::postBuild()
         childSetValue("layer_types", "colors");
         childSetEnabled("layer_types", FALSE);
 
-        childSetValue("snapshot_width", gSavedSettings.getS32("LastSnapshotWidth"));
-        childSetValue("snapshot_height", gSavedSettings.getS32("LastSnapshotHeight"));
+        childSetValue("snapshot_width", gSavedSettings.getS32(lastSnapshotWidthName()));
+        childSetValue("snapshot_height", gSavedSettings.getS32(lastSnapshotHeightName()));
 
         childSetValue("freeze_frame_check", gSavedSettings.getBOOL("UseFreezeFrame"));
         childSetCommitCallback("freeze_frame_check", Impl::onCommitFreezeFrame, this);
 
+        childSetValue("auto_snapshot_check", gSavedSettings.getBOOL("AutoSnapshot"));
+        childSetCommitCallback("auto_snapshot_check", Impl::onClickAutoSnap, this);
+
         childSetCommitCallback("postcard_size_combo", Impl::onCommitResolution, this);
         childSetCommitCallback("texture_size_combo", Impl::onCommitResolution, this);
         childSetCommitCallback("local_size_combo", Impl::onCommitResolution, this);
@@ -2005,6 +2080,7 @@ void LLFloaterSnapshot::draw()
                 return;
         }
 
+        // TODO*: Do we need all this? - Jacek
         if(!isMinimized())
         {
                 if (previewp && previewp->getDataSize() > 0)
@@ -2162,10 +2238,15 @@ void LLFloaterSnapshot::hide(void*)
 //static 
 void LLFloaterSnapshot::update()
 {
+        BOOL changed = FALSE;
         for (std::set<LLSnapshotLivePreview*>::iterator iter = LLSnapshotLivePreview::sList.begin();
                  iter != LLSnapshotLivePreview::sList.end(); ++iter)
         {
-                LLSnapshotLivePreview::onIdle(*iter);
+                changed |= LLSnapshotLivePreview::onIdle(*iter);
+        }
+        if(changed)
+        {
+                sInstance->impl.updateControls(sInstance);
         }
 }
 
diff --git a/linden/indra/newview/llfloatersnapshot.h b/linden/indra/newview/llfloatersnapshot.h
index f894c27..c87879c 100644
--- a/linden/indra/newview/llfloatersnapshot.h
+++ b/linden/indra/newview/llfloatersnapshot.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp
index 745cb27..22cc596 100644
--- a/linden/indra/newview/llfloaterstats.cpp
+++ b/linden/indra/newview/llfloaterstats.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterstats.h b/linden/indra/newview/llfloaterstats.h
index 15a8362..ef2a1eb 100644
--- a/linden/indra/newview/llfloaterstats.h
+++ b/linden/indra/newview/llfloaterstats.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index 3d84135..943bc36 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertelehub.h b/linden/indra/newview/llfloatertelehub.h
index 05080ee..c0092e2 100644
--- a/linden/indra/newview/llfloatertelehub.h
+++ b/linden/indra/newview/llfloatertelehub.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index ceba079..9789d10 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertest.h b/linden/indra/newview/llfloatertest.h
index 96af960..2747a06 100644
--- a/linden/indra/newview/llfloatertest.h
+++ b/linden/indra/newview/llfloatertest.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 1498d4a..e723ba1 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index c4d6337..9d555d1 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index e4c90f0..9da968e 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertopobjects.h b/linden/indra/newview/llfloatertopobjects.h
index fcc91f2..ebec0d3 100644
--- a/linden/indra/newview/llfloatertopobjects.h
+++ b/linden/indra/newview/llfloatertopobjects.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index f37388a..ee5beb8 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatertos.h b/linden/indra/newview/llfloatertos.h
index 3832877..726bd2e 100644
--- a/linden/indra/newview/llfloatertos.h
+++ b/linden/indra/newview/llfloatertos.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterurldisplay.cpp b/linden/indra/newview/llfloaterurldisplay.cpp
index 563eaf6..376ebb1 100644
--- a/linden/indra/newview/llfloaterurldisplay.cpp
+++ b/linden/indra/newview/llfloaterurldisplay.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterurldisplay.h b/linden/indra/newview/llfloaterurldisplay.h
index dce9c75..0bf06af 100644
--- a/linden/indra/newview/llfloaterurldisplay.h
+++ b/linden/indra/newview/llfloaterurldisplay.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterurlentry.cpp b/linden/indra/newview/llfloaterurlentry.cpp
index bddef85..50dc51c 100644
--- a/linden/indra/newview/llfloaterurlentry.cpp
+++ b/linden/indra/newview/llfloaterurlentry.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterurlentry.h b/linden/indra/newview/llfloaterurlentry.h
index 069b69f..fb5c35a 100644
--- a/linden/indra/newview/llfloaterurlentry.h
+++ b/linden/indra/newview/llfloaterurlentry.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloatervoicedevicesettings.cpp b/linden/indra/newview/llfloatervoicedevicesettings.cpp
index 7ffaa73..ad9d776 100644
--- a/linden/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/linden/indra/newview/llfloatervoicedevicesettings.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -85,14 +85,15 @@ BOOL LLPanelVoiceDeviceSettings::postBuild()
 void LLPanelVoiceDeviceSettings::draw()
 {
         // let user know that volume indicator is not yet available
-        childSetVisible("wait_text", !gVoiceClient->inTuningMode());
+        bool is_in_tuning_mode = gVoiceClient->inTuningMode();
+        childSetVisible("wait_text", !is_in_tuning_mode);
 
         LLPanel::draw();
 
         F32 voice_power = gVoiceClient->tuningGetEnergy();
         S32 discrete_power = 0;
 
-        if (!gVoiceClient->inTuningMode())
+        if (!is_in_tuning_mode)
         {
                 discrete_power = 0;
         }
@@ -101,7 +102,7 @@ void LLPanelVoiceDeviceSettings::draw()
                 discrete_power = llmin(4, llfloor((voice_power / LLVoiceClient::OVERDRIVEN_POWER_LEVEL) * 4.f));
         }
         
-        if (gVoiceClient->inTuningMode())
+        if (is_in_tuning_mode)
         {
                 for(S32 power_bar_idx = 0; power_bar_idx < 5; power_bar_idx++)
                 {
@@ -136,7 +137,11 @@ void LLPanelVoiceDeviceSettings::apply()
         }
 
         // assume we are being destroyed by closing our embedding window
-        gSavedSettings.setF32("AudioLevelMic", mMicVolume);
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        if(volume_slider)
+        {
+                gSavedSettings.setF32("AudioLevelMic", (F32)volume_slider->getValue().asReal());
+        }
 }
 
 void LLPanelVoiceDeviceSettings::cancel()
@@ -149,6 +154,13 @@ void LLPanelVoiceDeviceSettings::cancel()
 
         if(mCtrlOutputDevices)
                 mCtrlOutputDevices->setSimple(mOutputDevice);
+
+        gSavedSettings.setF32("AudioLevelMic", mMicVolume);
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        if(volume_slider)
+        {
+                volume_slider->setValue(mMicVolume);
+        }
 }
 
 void LLPanelVoiceDeviceSettings::refresh()
@@ -156,8 +168,8 @@ void LLPanelVoiceDeviceSettings::refresh()
         //grab current volume
         LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
         // set mic volume tuning slider based on last mic volume setting
-        mMicVolume = (F32)volume_slider->getValue().asReal();
-        gVoiceClient->tuningSetMicVolume(mMicVolume);
+        F32 current_volume = (F32)volume_slider->getValue().asReal();
+        gVoiceClient->tuningSetMicVolume(current_volume);
 
         // Fill in popup menus
         mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
@@ -247,13 +259,19 @@ void LLPanelVoiceDeviceSettings::onClose(bool app_quitting)
 // static
 void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
 {
-        gSavedSettings.setString("VoiceInputAudioDevice", ctrl->getValue().asString());
+        if(gVoiceClient)
+        {
+                gVoiceClient->setCaptureDevice(ctrl->getValue().asString());
+        }
 }
 
 // static
 void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
 {
-        gSavedSettings.setString("VoiceOutputAudioDevice", ctrl->getValue().asString());
+        if(gVoiceClient)
+        {
+                gVoiceClient->setRenderDevice(ctrl->getValue().asString());
+        }
 }
 
 //
diff --git a/linden/indra/newview/llfloatervoicedevicesettings.h b/linden/indra/newview/llfloatervoicedevicesettings.h
index eba5c3c..8e316f0 100644
--- a/linden/indra/newview/llfloatervoicedevicesettings.h
+++ b/linden/indra/newview/llfloatervoicedevicesettings.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 025562a..c42b12b 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 3fa4c09..5c1fced 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index f0d5480..37cd4ef 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 94373ca..3e5556b 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 8396454..3e35151 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index e2f2479..568d3cc 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 4ef52f0..70c4ead 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -821,7 +821,7 @@ void LLFolderViewItem::draw()
         // mShowSingleSelection is FALSE
         if( mIsSelected )
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLColor4 bg_color = sHighlightBgColor;
                 //const S32 TRAILING_PAD = 5;  // It just looks better with this.
                 if (!mIsCurSelection)
@@ -876,7 +876,7 @@ void LLFolderViewItem::draw()
         }
         if (mDragAndDropTarget)
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gl_rect_2d(
                         0, 
                         getRect().getHeight(), 
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index b668015..3c350d4 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfollowcam.cpp b/linden/indra/newview/llfollowcam.cpp
index 4943e08..40094dc 100644
--- a/linden/indra/newview/llfollowcam.cpp
+++ b/linden/indra/newview/llfollowcam.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llfollowcam.h b/linden/indra/newview/llfollowcam.h
index fe68cd9..92f56f6 100644
--- a/linden/indra/newview/llfollowcam.h
+++ b/linden/indra/newview/llfollowcam.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llframestats.cpp b/linden/indra/newview/llframestats.cpp
index 537753e..9735a17 100644
--- a/linden/indra/newview/llframestats.cpp
+++ b/linden/indra/newview/llframestats.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llframestats.h b/linden/indra/newview/llframestats.h
index dde443f..5c982d3 100644
--- a/linden/indra/newview/llframestats.h
+++ b/linden/indra/newview/llframestats.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llframestatview.cpp b/linden/indra/newview/llframestatview.cpp
index 752c6c4..7271faf 100644
--- a/linden/indra/newview/llframestatview.cpp
+++ b/linden/indra/newview/llframestatview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -98,7 +98,7 @@ void LLFrameStatView::draw()
         S32 j;
         LLStat *statp;
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         statp = mStats[0];
         if (!statp)
@@ -159,7 +159,7 @@ void LLFrameStatView::draw()
         for (i = 0; i < mNumStats; i++)
         {
                 // Draw the color key.
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gl_rect_2d(left, top - 2, left + 10, top - 12, mColors[i]);
 
                 left = left + 15;
@@ -203,7 +203,7 @@ void LLFrameStatView::draw()
         bottom = bottom - 4;
         for (tick_value = 0; tick_value <= 100; tick_value += 20)
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 left = 10 + llfloor(tick_value*(total_width/100.f));
                 right = left + 1;
                 gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.2f));
@@ -253,7 +253,7 @@ void LLFrameStatView::draw()
                 bottom = top - graph_height - 4;
                 for (tick_value = 0; tick_value <= 100; tick_value += 20)
                 {
-                        LLGLSNoTexture gls_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         left = 10 + llfloor(tick_value*(total_width/100.f));
                         right = left + 1;
                         gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
@@ -278,7 +278,7 @@ void LLFrameStatView::draw()
                 bottom = top - graph_height - 4;
                 for (tick_value = 0; tick_value <= mTotalTime; tick_value += mLabelSpacing)
                 {
-                        LLGLSNoTexture gls_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         left = 10 + llfloor(tick_value*time_scale);
                         right = left + 1;
                         gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
diff --git a/linden/indra/newview/llframestatview.h b/linden/indra/newview/llframestatview.h
index 2491a83..95cf4cc 100644
--- a/linden/indra/newview/llframestatview.h
+++ b/linden/indra/newview/llframestatview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgenepool.cpp b/linden/indra/newview/llgenepool.cpp
index a427af6..588a383 100644
--- a/linden/indra/newview/llgenepool.cpp
+++ b/linden/indra/newview/llgenepool.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgenepool.h b/linden/indra/newview/llgenepool.h
index 53d969e..e4200eb 100644
--- a/linden/indra/newview/llgenepool.h
+++ b/linden/indra/newview/llgenepool.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 06c8a66..a8e152c 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgesturemgr.h b/linden/indra/newview/llgesturemgr.h
index b1e6555..05ed4f1 100644
--- a/linden/indra/newview/llgesturemgr.h
+++ b/linden/indra/newview/llgesturemgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 82fead1..85ff295 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgivemoney.h b/linden/indra/newview/llgivemoney.h
index b3cf556..ad06075 100644
--- a/linden/indra/newview/llgivemoney.h
+++ b/linden/indra/newview/llgivemoney.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 45f674d..7506004 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -142,7 +142,7 @@ void LLAgent::renderAutoPilotTarget()
                 gGL.pushMatrix();
 
                 // not textured
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 // lovely green
                 glColor4f(0.f, 1.f, 1.f, 1.f);
@@ -355,10 +355,11 @@ void LLCompass::draw()
 
         if (mBkgndTexture)
         {
-                mBkgndTexture->bind();
+                gGL.getTexUnit(0)->bind(mBkgndTexture.get());
+
                 gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 
                 gGL.texCoord2f(1.f, 1.f);
                 gGL.vertex2i(width, height);
@@ -381,10 +382,10 @@ void LLCompass::draw()
         
         if (mTexture)
         {
-                mTexture->bind();
+                gGL.getTexUnit(0)->bind(mTexture.get());
                 gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
                 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 
                 gGL.texCoord2f(1.f, 1.f);
                 gGL.vertex2i(width, height);
@@ -426,9 +427,9 @@ void LLHorizontalCompass::draw()
                 F32 left = center - COMPASS_RANGE;
                 F32 right = center + COMPASS_RANGE;
 
-                mTexture->bind();
+                gGL.getTexUnit(0)->bind(mTexture.get());
                 gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f );
-                gGL.begin( LLVertexBuffer::QUADS );
+                gGL.begin( LLRender::QUADS );
 
                 gGL.texCoord2f(right, 1.f);
                 gGL.vertex2i(width, height);
@@ -447,7 +448,7 @@ void LLHorizontalCompass::draw()
 
         // Draw the focus line
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( mFocusColor.mV );
                 gl_line_2d( half_width, 0, half_width, height );
         }
@@ -465,7 +466,7 @@ void LLWind::renderVectors()
 
         F32 region_width_meters = LLWorld::getInstance()->getRegionWidthInMeters();
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.pushMatrix();
         LLVector3 origin_agent;
         origin_agent = gAgent.getPosAgentFromGlobal(mOriginGlobal);
@@ -479,11 +480,11 @@ void LLWind::renderVectors()
                         gGL.pushMatrix();
                         gGL.translatef((F32)i * region_width_meters/mSize, (F32)j * region_width_meters/mSize, 0.0);
                         gGL.color3f(0,1,0);
-                        gGL.begin(LLVertexBuffer::POINTS);
+                        gGL.begin(LLRender::POINTS);
                                 gGL.vertex3f(0,0,0);
                         gGL.end();
                         gGL.color3f(1,0,0);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                                 gGL.vertex3f(x * 0.1f, y * 0.1f ,0.f);
                                 gGL.vertex3f(x, y, 0.f);
                         gGL.end();
@@ -501,7 +502,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
                                                                    const LLVector3d &east_north_top_global )
 {
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE);
 
         LLVector3 west_south_bottom_agent = gAgent.getPosAgentFromGlobal(west_south_bottom_global);
@@ -532,7 +533,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
         gGL.color4f(1.f, 1.f, 0.f, 1.f);
 
         // Cheat and give this the same pick-name as land
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
 
         gGL.vertex3f(west, north, nw_bottom);
         gGL.vertex3f(west, north, nw_top);
@@ -549,7 +550,7 @@ void LLViewerParcelMgr::renderRect(const LLVector3d &west_south_bottom_global,
         gGL.end();
 
         gGL.color4f(1.f, 1.f, 0.f, 0.2f);
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
 
         gGL.vertex3f(west, north, nw_bottom);
         gGL.vertex3f(west, north, nw_top);
@@ -609,14 +610,14 @@ void LLViewerParcelMgr::renderParcel(LLParcel* parcel )
                 F32 ne_top = ne_bottom + POST_HEIGHT;
                 F32 nw_top = nw_bottom + POST_HEIGHT;
 
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLGLDepthTest gls_depth(GL_TRUE);
 
                 LLUI::setLineWidth(2.f);
                 gGL.color4f(0.f, 1.f, 1.f, 1.f);
 
                 // Cheat and give this the same pick-name as land
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
 
                 gGL.vertex3f(west, north, nw_bottom);
                 gGL.vertex3f(west, north, nw_top);
@@ -633,7 +634,7 @@ void LLViewerParcelMgr::renderParcel(LLParcel* parcel )
                 gGL.end();
 
                 gGL.color4f(0.f, 1.f, 1.f, 0.2f);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
 
                 gGL.vertex3f(west, north, nw_bottom);
                 gGL.vertex3f(west, north, nw_top);
@@ -759,7 +760,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
         bool has_segments = false;
 
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE);
 
         gGL.color4f(1.f, 1.f, 0.f, 0.2f);
@@ -786,7 +787,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
                                 if (!has_segments)
                                 {
                                         has_segments = true;
-                                        gGL.begin(LLVertexBuffer::QUADS);
+                                        gGL.begin(LLRender::QUADS);
                                 }
                                 renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, SOUTH_MASK, regionp);
                         }
@@ -802,7 +803,7 @@ void LLViewerParcelMgr::renderHighlightSegments(const U8* segments, LLViewerRegi
                                 if (!has_segments)
                                 {
                                         has_segments = true;
-                                        gGL.begin(LLVertexBuffer::QUADS);
+                                        gGL.begin(LLRender::QUADS);
                                 }
                                 renderOneSegment(x1, y1, x2, y2, PARCEL_POST_HEIGHT, WEST_MASK, regionp);
                         }
@@ -850,14 +851,14 @@ void LLViewerParcelMgr::renderCollisionSegments(U8* segments, BOOL use_pass, LLV
         
         if (use_pass && (mCollisionBanned == BA_NOT_ON_LIST))
         {
-                LLViewerImage::bindTexture(mPassImage);
+                gGL.getTexUnit(0)->bind(mPassImage);
         }
         else
         {
-                LLViewerImage::bindTexture(mBlockedImage);
+                gGL.getTexUnit(0)->bind(mBlockedImage);
         }
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
 
         for (y = 0; y < STRIDE; y++)
         {
@@ -1011,10 +1012,10 @@ void LLViewerObjectList::renderObjectBeacons()
         LLGLSUIDefault gls_ui;
 
         {
-                LLGLSNoTexture gls_ui_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 S32 last_line_width = -1;
-                // gGL.begin(LLVertexBuffer::LINES); // Always happens in (line_width != last_line_width)
+                // gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width)
                 
                 for (S32 i = 0; i < mDebugBeacons.count(); i++)
                 {
@@ -1031,7 +1032,7 @@ void LLViewerObjectList::renderObjectBeacons()
                                 }
                                 glLineWidth( (F32)line_width );
                                 last_line_width = line_width;
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                         }
 
                         const LLVector3 &thisline = debug_beacon.mPositionAgent;
@@ -1049,11 +1050,11 @@ void LLViewerObjectList::renderObjectBeacons()
         }
 
         {
-                LLGLSNoTexture gls_ui_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLGLDepthTest gls_depth(GL_TRUE);
                 
                 S32 last_line_width = -1;
-                // gGL.begin(LLVertexBuffer::LINES); // Always happens in (line_width != last_line_width)
+                // gGL.begin(LLRender::LINES); // Always happens in (line_width != last_line_width)
                 
                 for (S32 i = 0; i < mDebugBeacons.count(); i++)
                 {
@@ -1069,7 +1070,7 @@ void LLViewerObjectList::renderObjectBeacons()
                                 }
                                 glLineWidth( (F32)line_width );
                                 last_line_width = line_width;
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                         }
 
                         const LLVector3 &thisline = debug_beacon.mPositionAgent;
diff --git a/linden/indra/newview/llgroupmgr.cpp b/linden/indra/newview/llgroupmgr.cpp
index 30b7cbd..1a04ae5 100644
--- a/linden/indra/newview/llgroupmgr.cpp
+++ b/linden/indra/newview/llgroupmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -52,6 +52,7 @@
 #include "llfloaterdirectory.h"
 #include "llfloatergroupinfo.h"
 #include "lluictrlfactory.h"
+#include <boost/regex.hpp>
 
 
 const U32 MAX_CACHED_GROUPS = 10;
@@ -791,6 +792,20 @@ LLGroupMgrGroupData* LLGroupMgr::getGroupData(const LLUUID& id)
         return NULL;
 }
 
+// Helper function for LLGroupMgr::processGroupMembersReply
+// This reformats date strings from MM/DD/YYYY to YYYY/MM/DD ( e.g. 1/27/2008 -> 2008/1/27 )
+// so that the sorter can sort by year before month before day.
+static void formatDateString(std::string &date_string)
+{
+        using namespace boost;
+        cmatch result;
+        const regex expression("([0-9]{1,2})/([0-9]{1,2})/([0-9]{4})");
+        if (regex_match(date_string.c_str(), result, expression))
+        {
+                date_string = result[3]+"/"+result[1]+"/"+result[2];
+        }
+}
+
 // static
 void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 {
@@ -840,6 +855,8 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
 
                         if (member_id.notNull())
                         {
+                                formatDateString(online_status); // reformat for sorting, e.g. 12/25/2008 -> 2008/12/25
+                                
                                 //llinfos << "Member " << member_id << " has powers " << std::hex << agent_powers << std::dec << llendl;
                                 LLGroupMemberData* newdata = new LLGroupMemberData(member_id, 
                                                                                                                                         contribution, 
diff --git a/linden/indra/newview/llgroupmgr.h b/linden/indra/newview/llgroupmgr.h
index 4950b66..4eb4033 100644
--- a/linden/indra/newview/llgroupmgr.h
+++ b/linden/indra/newview/llgroupmgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index eafa06c..37897eb 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llgroupnotify.h b/linden/indra/newview/llgroupnotify.h
index 7befdf4..82f8a07 100644
--- a/linden/indra/newview/llgroupnotify.h
+++ b/linden/indra/newview/llgroupnotify.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhomelocationresponder.cpp b/linden/indra/newview/llhomelocationresponder.cpp
new file mode 100644
index 0000000..58ea684
--- /dev/null
+++ b/linden/indra/newview/llhomelocationresponder.cpp
@@ -0,0 +1,108 @@
+/** 
+ * @file llhomelocationresponder.cpp
+ * @author Meadhbh Hamrick
+ * @brief Processes responses to the HomeLocation CapReq
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* File Inclusions */
+#include "llviewerprecompiledheaders.h"
+
+#include "llhomelocationresponder.h"
+#include "llsdutil.h"
+#include "llagent.h"
+#include "llviewerregion.h"
+
+void LLHomeLocationResponder::result( const LLSD& content )
+{
+  LLVector3 agent_pos;
+  bool      error = true;
+                
+  do {
+        
+    // was the call to /agent/<agent-id>/home-location successful?
+    // If not, we keep error set to true
+    if( ! content.has("success") )
+    {
+      break;
+    }
+                
+    if( 0 != strncmp("true", content["success"].asString().c_str(), 4 ) )
+    {
+      break;
+    }
+                
+    // did the simulator return a "justified" home location?
+    // If no, we keep error set to true
+    if( ! content.has( "HomeLocation" ) )
+    {
+      break;
+    }
+                
+    if( ! content["HomeLocation"].has("LocationPos") )
+    {
+      break;
+    }
+                
+    if( ! content["HomeLocation"]["LocationPos"].has("X") )
+    {
+      break;
+    }
+
+    agent_pos.mV[VX] = content["HomeLocation"]["LocationPos"]["X"].asInteger();
+                
+    if( ! content["HomeLocation"]["LocationPos"].has("Y") )
+    {
+      break;
+    }
+
+    agent_pos.mV[VY] = content["HomeLocation"]["LocationPos"]["Y"].asInteger();
+                
+    if( ! content["HomeLocation"]["LocationPos"].has("Z") )
+    {
+      break;
+    }
+
+    agent_pos.mV[VZ] = content["HomeLocation"]["LocationPos"]["Z"].asInteger();
+                
+    error = false;
+  } while( 0 );
+        
+  if( ! error )
+  {
+    llinfos << "setting home position" << llendl;
+                
+    LLViewerRegion *viewer_region = gAgent.getRegion();
+    gAgent.setHomePosRegion( viewer_region->getHandle(), agent_pos );
+  }
+}
+
+void LLHomeLocationResponder::error( const LLSD& content )
+{
+  llinfos << "received error(" << ll_pretty_print_sd( content ) << ")" << llendl;
+}
diff --git a/linden/indra/newview/llhomelocationresponder.h b/linden/indra/newview/llhomelocationresponder.h
new file mode 100644
index 0000000..3990730
--- /dev/null
+++ b/linden/indra/newview/llhomelocationresponder.h
@@ -0,0 +1,47 @@
+/** 
+ * @file llhomelocationresponder.h
+ * @author Meadhbh Hamrick
+ * @brief Processes responses to the HomeLocation CapReq
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+ 
+ /* Macro Definitions */
+#ifndef LL_LLHOMELOCATIONRESPONDER_H
+#define LL_LLHOMELOCATIONRESPONDER_H
+
+/* File Inclusions */
+#include "llhttpclient.h"
+
+/* Typedef, Enum, Class, Struct, etc. */
+class LLHomeLocationResponder : public LLHTTPClient::Responder
+{
+        virtual void result( const LLSD& content );
+        virtual void error( const LLSD& content );
+};
+
+#endif
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 6d0dd72..8d033b2 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhoverview.h b/linden/indra/newview/llhoverview.h
index ff39790..c4a1857 100644
--- a/linden/indra/newview/llhoverview.h
+++ b/linden/indra/newview/llhoverview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffect.cpp b/linden/indra/newview/llhudeffect.cpp
index 5cc35af..340c22a 100644
--- a/linden/indra/newview/llhudeffect.cpp
+++ b/linden/indra/newview/llhudeffect.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffect.h b/linden/indra/newview/llhudeffect.h
index ff857cc..0bf349f 100644
--- a/linden/indra/newview/llhudeffect.h
+++ b/linden/indra/newview/llhudeffect.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index d6c38d3..4df656b 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -251,7 +251,7 @@ void LLHUDEffectBeam::render()
         }
 
         LLGLSPipelineAlpha gls_pipeline_alpha;
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
 
         // Interpolate the global fade alpha
diff --git a/linden/indra/newview/llhudeffectbeam.h b/linden/indra/newview/llhudeffectbeam.h
index 8595439..f89d178 100644
--- a/linden/indra/newview/llhudeffectbeam.h
+++ b/linden/indra/newview/llhudeffectbeam.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index b5f6ec7..3a12dad 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -499,14 +499,14 @@ void LLHUDEffectLookAt::render()
 {
         if (sDebugLookAt && mSourceObject.notNull())
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLVector3 target = mTargetPos + ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->mHeadp->getWorldPosition();
                 glMatrixMode(GL_MODELVIEW);
                 gGL.pushMatrix();
                 gGL.translatef(target.mV[VX], target.mV[VY], target.mV[VZ]);
                 glScalef(0.3f, 0.3f, 0.3f);
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
                 {
                         LLColor3 color = (*mAttentions)[mTargetType].mColor;
                         gGL.color3f(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE]);
diff --git a/linden/indra/newview/llhudeffectlookat.h b/linden/indra/newview/llhudeffectlookat.h
index 918805d..231e44f 100644
--- a/linden/indra/newview/llhudeffectlookat.h
+++ b/linden/indra/newview/llhudeffectlookat.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffectpointat.cpp b/linden/indra/newview/llhudeffectpointat.cpp
index 7ab03f2..35131cc 100644
--- a/linden/indra/newview/llhudeffectpointat.cpp
+++ b/linden/indra/newview/llhudeffectpointat.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -328,13 +328,13 @@ void LLHUDEffectPointAt::render()
         update();
         if (sDebugPointAt && mTargetType != POINTAT_TARGET_NONE)
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLVector3 target = mTargetPos + mSourceObject->getRenderPosition();
                 gGL.pushMatrix();
                 gGL.translatef(target.mV[VX], target.mV[VY], target.mV[VZ]);
                 glScalef(0.3f, 0.3f, 0.3f);
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
                 {
                         gGL.color3f(1.f, 0.f, 0.f);
                         gGL.vertex3f(-1.f, 0.f, 0.f);
@@ -441,8 +441,10 @@ bool LLHUDEffectPointAt::calcTargetPosition()
 
         mTargetPos -= mSourceObject->getRenderPosition();
 
-        if (!mTargetPos.isFinite())
+        if (!llfinite(mTargetPos.lengthSquared()))
+        {
                 return false;
+        }
 
         if (mSourceObject->isAvatar())
         {
diff --git a/linden/indra/newview/llhudeffectpointat.h b/linden/indra/newview/llhudeffectpointat.h
index 8df796c..c3b72fa 100644
--- a/linden/indra/newview/llhudeffectpointat.h
+++ b/linden/indra/newview/llhudeffectpointat.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index c0ed148..3b91ee9 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudeffecttrail.h b/linden/indra/newview/llhudeffecttrail.h
index 3bb0f92..28707a2 100644
--- a/linden/indra/newview/llhudeffecttrail.h
+++ b/linden/indra/newview/llhudeffecttrail.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudicon.cpp b/linden/indra/newview/llhudicon.cpp
index 85cc996..bfc88de 100644
--- a/linden/indra/newview/llhudicon.cpp
+++ b/linden/indra/newview/llhudicon.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -86,7 +86,7 @@ void LLHUDIcon::renderIcon(BOOL for_select)
         LLGLDepthTest gls_depth(GL_TRUE);
         if (for_select)
         {
-                LLViewerImage::unbindTexture(0);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
         
         if (mHidden)
@@ -163,10 +163,10 @@ void LLHUDIcon::renderIcon(BOOL for_select)
                 LLColor4 icon_color = LLColor4::white;
                 icon_color.mV[VALPHA] = alpha_factor;
                 gGL.color4fv(icon_color.mV);
-                LLViewerImage::bindTexture(mImagep);
+                gGL.getTexUnit(0)->bind(mImagep.get());
         }
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 gGL.texCoord2f(0.f, 1.f);
                 gGL.vertex3fv(upper_left.mV);
@@ -210,6 +210,80 @@ void LLHUDIcon::renderForSelect()
         renderIcon(TRUE);
 }
 
+BOOL LLHUDIcon::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3* intersection)
+{
+        if (mHidden)
+                return FALSE;
+
+        if (mSourceObject.isNull() || mImagep.isNull())
+        {
+                markDead();
+                return FALSE;
+        }
+
+        LLVector3 obj_position = mSourceObject->getRenderPosition();
+
+        // put icon above object, and in front
+        // RN: don't use drawable radius, it's fricking HUGE
+        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 * LLViewerCamera::getInstance()->getUpAxis()) * 1.2f;
+
+        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, LLViewerCamera::getInstance()->getOrigin());
+
+        LLVector3 x_pixel_vec;
+        LLVector3 y_pixel_vec;
+        
+        LLViewerCamera::getInstance()->getPixelVectors(icon_position, y_pixel_vec, x_pixel_vec);
+
+        F32 scale_factor = 1.f;
+        if (mAnimTimer.getElapsedTimeF32() < ANIM_TIME)
+        {
+                scale_factor = llmax(0.f, calc_bouncy_animation(mAnimTimer.getElapsedTimeF32() / ANIM_TIME));
+        }
+
+        F32 time_elapsed = mLifeTimer.getElapsedTimeF32();
+        if (time_elapsed > MAX_VISIBLE_TIME)
+        {
+                markDead();
+                return FALSE;
+        }
+        
+        F32 image_aspect = (F32)mImagep->mFullWidth / (F32)mImagep->mFullHeight;
+        LLVector3 x_scale = image_aspect * (F32)gViewerWindow->getWindowHeight() * mScale * scale_factor * x_pixel_vec;
+        LLVector3 y_scale = (F32)gViewerWindow->getWindowHeight() * mScale * scale_factor * y_pixel_vec;
+
+        LLVector3 lower_left = icon_position - (x_scale * 0.5f);
+        LLVector3 lower_right = icon_position + (x_scale * 0.5f);
+        LLVector3 upper_left = icon_position - (x_scale * 0.5f) + y_scale;
+        LLVector3 upper_right = icon_position + (x_scale * 0.5f) + y_scale;
+
+        
+        F32 t = 0.f;
+        LLVector3 dir = end-start;
+
+        if (LLTriangleRayIntersect(upper_right, upper_left, lower_right, start, dir, NULL, NULL, &t, FALSE) ||
+                LLTriangleRayIntersect(upper_left, lower_left, lower_right, start, dir, NULL, NULL, &t, FALSE))
+        {
+                if (intersection)
+                {
+                        *intersection = start + dir*t;
+                }
+                return TRUE;
+        }
+
+        return FALSE;
+}
 
 //static
 S32 LLHUDIcon::generatePickIDs(S32 start_id, S32 step_size)
@@ -242,6 +316,33 @@ LLHUDIcon* LLHUDIcon::handlePick(S32 pick_id)
         return NULL;
 }
 
+//static
+LLHUDIcon* LLHUDIcon::lineSegmentIntersectAll(const LLVector3& start, const LLVector3& end, LLVector3* intersection)
+{
+        icon_instance_t::iterator icon_it;
+
+        LLVector3 local_end = end;
+        LLVector3 position;
+
+        LLHUDIcon* ret = NULL;
+        for(icon_it = sIconInstances.begin(); icon_it != sIconInstances.end(); ++icon_it)
+        {
+                LLHUDIcon* icon = *icon_it;
+                if (icon->lineSegmentIntersect(start, local_end, &position))
+                {
+                        ret = icon;
+                        if (intersection)
+                        {
+                                *intersection = position;
+                        }
+                        local_end = position;
+                }
+        }
+
+        return ret;
+}
+
+
  //static
 void LLHUDIcon::updateAll()
 {
diff --git a/linden/indra/newview/llhudicon.h b/linden/indra/newview/llhudicon.h
index b879776..8cd7937 100644
--- a/linden/indra/newview/llhudicon.h
+++ b/linden/indra/newview/llhudicon.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -67,6 +67,7 @@ public:
 
         static S32 generatePickIDs(S32 start_id, S32 step_size);
         static LLHUDIcon* handlePick(S32 pick_id);
+        static LLHUDIcon* lineSegmentIntersectAll(const LLVector3& start, const LLVector3& end, LLVector3* intersection);
 
         static void updateAll();
         static void cleanupDeadIcons();
@@ -77,6 +78,8 @@ public:
         BOOL getHidden() const { return mHidden; }
         void setHidden( BOOL hide ) { mHidden = hide; }
 
+        BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3* intersection);
+
 protected:
         LLHUDIcon(const U8 type);
         ~LLHUDIcon();
diff --git a/linden/indra/newview/llhudmanager.cpp b/linden/indra/newview/llhudmanager.cpp
index 5217893..4625802 100644
--- a/linden/indra/newview/llhudmanager.cpp
+++ b/linden/indra/newview/llhudmanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudmanager.h b/linden/indra/newview/llhudmanager.h
index cfe9cad..1a8d5fd 100644
--- a/linden/indra/newview/llhudmanager.h
+++ b/linden/indra/newview/llhudmanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index f66501c..01bfa77 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 5521451..c6292fb 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudrender.cpp b/linden/indra/newview/llhudrender.cpp
index e0d47f8..299ffa4 100644
--- a/linden/indra/newview/llhudrender.cpp
+++ b/linden/indra/newview/llhudrender.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudrender.h b/linden/indra/newview/llhudrender.h
index 6e6fae2..eb52447 100644
--- a/linden/indra/newview/llhudrender.h
+++ b/linden/indra/newview/llhudrender.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index c45c284..32323dc 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -120,6 +120,111 @@ LLHUDText::~LLHUDText()
 }
 
 
+BOOL LLHUDText::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3& intersection, BOOL debug_render)
+{
+        if (!mVisible || mHidden)
+        {
+                return FALSE;
+        }
+
+        // don't pick text that isn't bound to a viewerobject or isn't in a bubble
+        if (!mSourceObject || mSourceObject->mDrawable.isNull() || !mUseBubble)
+        {
+                return FALSE;
+        }
+        
+        F32 alpha_factor = 1.f;
+        LLColor4 text_color = mColor;
+        if (mDoFade)
+        {
+                if (mLastDistance > mFadeDistance)
+                {
+                        alpha_factor = llmax(0.f, 1.f - (mLastDistance - mFadeDistance)/mFadeRange);
+                        text_color.mV[3] = text_color.mV[3]*alpha_factor;
+                }
+        }
+        if (text_color.mV[3] < 0.01f)
+        {
+                return FALSE;
+        }
+
+        mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f));
+
+        // scale screen size of borders down
+        //RN: for now, text on hud objects is never occluded
+
+        LLVector3 x_pixel_vec;
+        LLVector3 y_pixel_vec;
+        
+        if (mOnHUDAttachment)
+        {
+                x_pixel_vec = LLVector3::y_axis / (F32)gViewerWindow->getWindowWidth();
+                y_pixel_vec = LLVector3::z_axis / (F32)gViewerWindow->getWindowHeight();
+        }
+        else
+        {
+                LLViewerCamera::getInstance()->getPixelVectors(mPositionAgent, y_pixel_vec, x_pixel_vec);
+        }
+
+        LLVector3 width_vec = mWidth * x_pixel_vec;
+        LLVector3 height_vec = mHeight * y_pixel_vec;
+        
+        LLCoordGL screen_pos;
+        LLViewerCamera::getInstance()->projectPosAgentToScreen(mPositionAgent, screen_pos, FALSE);
+
+        LLVector2 screen_offset;
+        screen_offset = updateScreenPos(mPositionOffset);
+        
+        LLVector3 render_position = mPositionAgent  
+                        + (x_pixel_vec * screen_offset.mV[VX])
+                        + (y_pixel_vec * screen_offset.mV[VY]);
+
+
+        if (mUseBubble)
+        {
+                LLVector3 bg_pos = render_position
+                        + (F32)mOffsetY * y_pixel_vec
+                        - (width_vec / 2.f)
+                        - (height_vec);
+                //LLUI::translate(bg_pos.mV[VX], bg_pos.mV[VY], bg_pos.mV[VZ]);
+
+                LLVector3 v[] = 
+                {
+                        bg_pos,
+                        bg_pos + width_vec,
+                        bg_pos + width_vec + height_vec,
+                        bg_pos + height_vec,
+                };
+
+                if (debug_render)
+                {
+                        gGL.begin(LLRender::LINE_STRIP);
+                        gGL.vertex3fv(v[0].mV);
+                        gGL.vertex3fv(v[1].mV);
+                        gGL.vertex3fv(v[2].mV);
+                        gGL.vertex3fv(v[3].mV);
+                        gGL.vertex3fv(v[0].mV);
+                        gGL.vertex3fv(v[2].mV);
+                        gGL.end();
+                }
+
+                LLVector3 dir = end-start;
+                F32 t = 0.f;
+
+                if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, NULL, NULL, &t, FALSE) ||
+                        LLTriangleRayIntersect(v[2], v[3], v[0], start, dir, NULL, NULL, &t, FALSE) )
+                {
+                        if (t <= 1.f)
+                        {
+                                intersection = start + dir*t;
+                                return TRUE;
+                        }
+                }
+        }
+
+        return FALSE;
+}
+
 void LLHUDText::render()
 {
         if (!mOnHUDAttachment && sDisplayText)
@@ -152,7 +257,15 @@ void LLHUDText::renderText(BOOL for_select)
                 return;
         }
         
-        LLGLState gls_tex(GL_TEXTURE_2D, for_select ? FALSE : TRUE);
+        if (for_select)
+        {
+                gGL.getTexUnit(0)->disable();
+        }
+        else
+        {
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+        }
+
         LLGLState gls_blend(GL_BLEND, for_select ? FALSE : TRUE);
         LLGLState gls_alpha(GL_ALPHA_TEST, for_select ? FALSE : TRUE);
         
@@ -261,7 +374,7 @@ void LLHUDText::renderText(BOOL for_select)
 
                         if (for_select)
                         {
-                                LLGLSNoTexture no_texture_state;
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 S32 name = mSourceObject->mGLName;
                                 LLColor4U coloru((U8)(name >> 16), (U8)(name >> 8), (U8)name);
                                 gGL.color4ubv(coloru.mV);
@@ -271,7 +384,7 @@ void LLHUDText::renderText(BOOL for_select)
                         }
                         else
                         {
-                                LLViewerImage::bindTexture(imagep->getImage());
+                                gGL.getTexUnit(0)->bind(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);
@@ -309,7 +422,7 @@ void LLHUDText::renderText(BOOL for_select)
                                 }
                                 LLUI::popMatrix();
 
-                                LLImageGL::unbindTexture(0);
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 LLGLDepthTest gls_depth(mZCompare ? GL_TRUE : GL_FALSE, GL_FALSE);
                                 
                                 LLVector3 box_center_offset;
@@ -317,7 +430,7 @@ void LLHUDText::renderText(BOOL for_select)
                                 LLUI::translate(box_center_offset.mV[VX], box_center_offset.mV[VY], box_center_offset.mV[VZ]);
                                 gGL.color4fv(bg_color.mV);
                                 LLUI::setLineWidth(2.0);
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         if (outside_width)
                                         {
@@ -444,6 +557,10 @@ void LLHUDText::renderText(BOOL for_select)
         }
         /// Reset the default color to white.  The renderer expects this to be the default. 
         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+        if (for_select)
+        {
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
+        }
 }
 
 void LLHUDText::setStringUTF8(const std::string &wtext)
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h
index 5719a19..6e29d9d 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -123,6 +123,8 @@ public:
         void setOnHUDAttachment(BOOL on_hud) { mOnHUDAttachment = on_hud; }
         void shift(const LLVector3& offset);
 
+        BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, LLVector3& intersection, BOOL debug_render = FALSE);
+
         static void shiftAll(const LLVector3& offset);
         static void renderAllHUD();
         static void addPickable(std::set<LLViewerObject*> &pick_list);
diff --git a/linden/indra/newview/llhudview.cpp b/linden/indra/newview/llhudview.cpp
index 5867285..9584a2a 100644
--- a/linden/indra/newview/llhudview.cpp
+++ b/linden/indra/newview/llhudview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llhudview.h b/linden/indra/newview/llhudview.h
index ae32ddd..277eb49 100644
--- a/linden/indra/newview/llhudview.h
+++ b/linden/indra/newview/llhudview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index dede746..16d64ac 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -356,7 +356,7 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess
                 llwarns << "Duplicate voice channels registered for session_id " << session_id << llendl;
         }
 
-        LLVoiceClient::getInstance()->addStatusObserver(this);
+        LLVoiceClient::getInstance()->addObserver(this);
 }
 
 LLVoiceChannel::~LLVoiceChannel()
@@ -364,7 +364,7 @@ LLVoiceChannel::~LLVoiceChannel()
         // Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed.
         if(gVoiceClient)
         {
-                gVoiceClient->removeStatusObserver(this);
+                gVoiceClient->removeObserver(this);
         }
         
         sVoiceChannelMap.erase(mSessionID);
@@ -982,7 +982,8 @@ void LLVoiceChannelP2P::activate()
                 // otherwise answering the call
                 else
                 {
-                        LLVoiceClient::getInstance()->answerInvite(mSessionHandle, mOtherUserID);
+                        LLVoiceClient::getInstance()->answerInvite(mSessionHandle);
+                        
                         // using the session handle invalidates it.  Clear it out here so we can't reuse it by accident.
                         mSessionHandle.clear();
                 }
@@ -999,7 +1000,7 @@ void LLVoiceChannelP2P::getChannelInfo()
 }
 
 // receiving session from other user who initiated call
-void LLVoiceChannelP2P::setSessionHandle(const std::string& handle)
+void LLVoiceChannelP2P::setSessionHandle(const std::string& handle, const std::string &inURI)
 { 
         BOOL needs_activate = FALSE;
         if (callStarted())
@@ -1022,8 +1023,17 @@ void LLVoiceChannelP2P::setSessionHandle(const std::string& handle)
         }
 
         mSessionHandle = handle;
+
         // The URI of a p2p session should always be the other end's SIP URI.
-        setURI(LLVoiceClient::getInstance()->sipURIFromID(mOtherUserID));
+        if(!inURI.empty())
+        {
+                setURI(inURI);
+        }
+        else
+        {
+                setURI(LLVoiceClient::getInstance()->sipURIFromID(mOtherUserID));
+        }
+        
         mReceivedCall = TRUE;
 
         if (needs_activate)
@@ -1206,7 +1216,23 @@ LLFloaterIMPanel::~LLFloaterIMPanel()
 {
         delete mSpeakers;
         mSpeakers = NULL;
-
+        
+        // End the text IM session if necessary
+        if(gVoiceClient && mOtherParticipantUUID.notNull())
+        {
+                switch(mDialog)
+                {
+                        case IM_NOTHING_SPECIAL:
+                        case IM_SESSION_P2P_INVITE:
+                                gVoiceClient->endUserIMSession(mOtherParticipantUUID);
+                        break;
+                        
+                        default:
+                                // Appease the compiler
+                        break;
+                }
+        }
+        
         //kicks you out of the voice channel if it is currently active
 
         // HAVE to do this here -- if it happens in the LLVoiceChannel destructor it will call the wrong version (since the object's partially deconstructed at that point).
@@ -1880,33 +1906,45 @@ void deliver_message(const std::string& utf8_text,
                                          EInstantMessage dialog)
 {
         std::string name;
+        bool sent = false;
         gAgent.buildFullname(name);
 
         const LLRelationship* info = NULL;
         info = LLAvatarTracker::instance().getBuddyInfo(other_participant_id);
+        
         U8 offline = (!info || info->isOnline()) ? IM_ONLINE : IM_OFFLINE;
-
-        // default to IM_SESSION_SEND unless it's nothing special - in
-        // which case it's probably an IM to everyone.
-        U8 new_dialog = dialog;
-
-        if ( dialog != IM_NOTHING_SPECIAL )
+        
+        if((offline == IM_OFFLINE) && (LLVoiceClient::getInstance()->isOnlineSIP(other_participant_id)))
         {
-                new_dialog = IM_SESSION_SEND;
+                // User is online through the OOW connector, but not with a regular viewer.  Try to send the message via SLVoice.
+                sent = gVoiceClient->sendTextMessage(other_participant_id, utf8_text);
         }
+        
+        if(!sent)
+        {
+                // Send message normally.
 
-        pack_instant_message(
-                gMessageSystem,
-                gAgent.getID(),
-                FALSE,
-                gAgent.getSessionID(),
-                other_participant_id,
-                name,
-                utf8_text,
-                offline,
-                (EInstantMessage)new_dialog,
-                im_session_id);
-        gAgent.sendReliableMessage();
+                // default to IM_SESSION_SEND unless it's nothing special - in
+                // which case it's probably an IM to everyone.
+                U8 new_dialog = dialog;
+
+                if ( dialog != IM_NOTHING_SPECIAL )
+                {
+                        new_dialog = IM_SESSION_SEND;
+                }
+                pack_instant_message(
+                        gMessageSystem,
+                        gAgent.getID(),
+                        FALSE,
+                        gAgent.getSessionID(),
+                        other_participant_id,
+                        name.c_str(),
+                        utf8_text.c_str(),
+                        offline,
+                        (EInstantMessage)new_dialog,
+                        im_session_id);
+                gAgent.sendReliableMessage();
+        }
 
         // If there is a mute list and this is not a group chat...
         if ( LLMuteList::getInstance() )
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 5bac0bd..0f9c0f3 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -161,7 +161,7 @@ public:
     /*virtual*/ void activate();
         /*virtual*/ void getChannelInfo();
 
-        void setSessionHandle(const std::string& handle);
+        void setSessionHandle(const std::string& handle, const std::string &inURI);
 
 protected:
         virtual void setState(EState state);
@@ -295,8 +295,6 @@ private:
 
         void sendTypingState(BOOL typing);
         
-        static LLFloaterIMPanel* sInstance;
-
 private:
         LLLineEditor* mInputEditor;
         LLViewerTextEditor* mHistoryEditor;
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 21d8e1f..10e8ff8 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -267,7 +267,8 @@ public:
                 EInstantMessage type,
                 EInvitationType inv_type,
                 const std::string& session_handle,
-                const std::string& notify_box) : 
+                const std::string& notify_box,
+                const std::string& session_uri) : 
                 mSessionID(session_id),
                 mSessionName(session_name),
                 mCallerID(caller_id),
@@ -275,7 +276,8 @@ public:
                 mType(type),
                 mInvType(inv_type),
                 mSessionHandle(session_handle),
-                mNotifyBox(notify_box)
+                mNotifyBox(notify_box),
+                mSessionURI(session_uri)
         {};
 
         LLUUID          mSessionID;
@@ -286,6 +288,7 @@ public:
         EInvitationType mInvType;
         std::string     mSessionHandle;
         std::string     mNotifyBox;
+        std::string     mSessionURI;
 };
 
 
@@ -568,7 +571,8 @@ BOOL LLIMMgr::isIMSessionOpen(const LLUUID& uuid)
 
 LLUUID LLIMMgr::addP2PSession(const std::string& name,
                                                         const LLUUID& other_participant_id,
-                                                        const std::string& voice_session_handle)
+                                                        const std::string& voice_session_handle,
+                                                        const std::string& caller_uri)
 {
         LLUUID session_id = addSession(name, IM_NOTHING_SPECIAL, other_participant_id);
 
@@ -576,7 +580,7 @@ LLUUID LLIMMgr::addP2PSession(const std::string& name,
         if(floater)
         {
                 LLVoiceChannelP2P* voice_channelp = (LLVoiceChannelP2P*)floater->getVoiceChannel();
-                voice_channelp->setSessionHandle(voice_session_handle);
+                voice_channelp->setSessionHandle(voice_session_handle, caller_uri);             
         }
 
         return session_id;
@@ -699,7 +703,8 @@ void LLIMMgr::inviteToSession(
         const std::string& caller_name,
         EInstantMessage type,
         EInvitationType inv_type,
-        const std::string& session_handle)
+        const std::string& session_handle,
+        const std::string& session_uri)
 {
         //ignore invites from muted residents
         if (LLMuteList::getInstance()->isMuted(caller_id))
@@ -741,7 +746,8 @@ void LLIMMgr::inviteToSession(
                 type,
                 inv_type,
                 session_handle,
-                notify_box_type);
+                notify_box_type,
+                session_uri);
         
         LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(session_id);
         if (channelp && channelp->callStarted())
@@ -916,7 +922,8 @@ void LLIMMgr::inviteUserResponse(S32 option, void* user_data)
                                 invitep->mSessionID = gIMMgr->addP2PSession(
                                         invitep->mSessionName,
                                         invitep->mCallerID,
-                                        invitep->mSessionHandle);
+                                        invitep->mSessionHandle, 
+                                        invitep->mSessionURI );
 
                                 LLFloaterIMPanel* im_floater =
                                         gIMMgr->findFloaterBySession(
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 9046a2e..6b82c2e 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -97,7 +97,8 @@ public:
         // Creates a P2P session with the requisite handle for responding to voice calls
         LLUUID addP2PSession(const std::string& name,
                                           const LLUUID& other_participant_id,
-                                          const std::string& voice_session_handle);
+                                          const std::string& voice_session_handle,
+                                          const std::string& caller_uri = LLStringUtil::null);
 
         // This removes the panel referenced by the uuid, and then
         // restores internal consistency. The internal pointer is not
@@ -111,7 +112,8 @@ public:
                 const std::string& caller_name,
                 EInstantMessage type,
                 EInvitationType inv_type, 
-                const std::string& session_handle = LLStringUtil::null);
+                const std::string& session_handle = LLStringUtil::null,
+                const std::string& session_uri = LLStringUtil::null);
 
         //Updates a given session's session IDs.  Does not open,
         //create or do anything new.  If the old session doesn't
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index cf95eef..0bf3ab2 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 34277f7..7118d46 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index eb17432..b076f77 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventoryclipboard.cpp b/linden/indra/newview/llinventoryclipboard.cpp
index ea84fa5..5b9a24e 100644
--- a/linden/indra/newview/llinventoryclipboard.cpp
+++ b/linden/indra/newview/llinventoryclipboard.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventoryclipboard.h b/linden/indra/newview/llinventoryclipboard.h
index 233c84e..6518bd2 100644
--- a/linden/indra/newview/llinventoryclipboard.h
+++ b/linden/indra/newview/llinventoryclipboard.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 73f0fb3..1029a3c 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -1348,9 +1348,6 @@ void LLInventoryModel::bulkFetch(std::string url)
                 return; // just bail if we are disconnected.
         }       
 
-        //HACK.  This is inelegant.  We're shuffling a dequeue to a map to get rid of 
-        //redundant requests.  When we get rid of the old code entirely, we can change
-        //the dequeue to a map.  In the new model, there is no benefit to queue order.
         U32 folder_count=0;
         U32 max_batch_size=5;
 
@@ -1502,7 +1499,7 @@ void LLInventoryModel::stopBackgroundFetch()
 //static 
 void LLInventoryModel::backgroundFetch(void*)
 {
-        if (sBackgroundFetchActive)
+        if (sBackgroundFetchActive && gAgent.getRegion())
         {
                 //If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
                 std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");   
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index d2be761..7c7d231 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index a318f5d..0f1eb2b 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -1657,6 +1657,16 @@ LLView* LLInventoryPanel::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         return panel;
 }
 
+void LLInventoryPanel::draw()
+{
+        // select the desired item (in case it wasn't loaded when the selection was requested)
+        if (mSelectThisID.notNull())
+        {
+                setSelection(mSelectThisID, false);
+        }
+        LLPanel::draw();
+}
+
 void LLInventoryPanel::setFilterTypes(U32 filter_types)
 {
         mFolders->getFilter()->setFilterTypes(filter_types);
@@ -2034,15 +2044,21 @@ void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_foc
         LLFolderViewItem* itemp = mFolders->getItemByID(obj_id);
         if(itemp && itemp->getListener())
         {
-                itemp->getListener()->arrangeAndSet(itemp,
-                                                                                          TRUE,
-                                                                                          take_keyboard_focus);
+                itemp->getListener()->arrangeAndSet(itemp, TRUE, take_keyboard_focus);
+                mSelectThisID.setNull();
+                return;
+        }
+        else
+        {
+                // save the desired item to be selected later (if/when ready)
+                mSelectThisID = obj_id;
         }
 }
 
 void LLInventoryPanel::clearSelection()
 {
         mFolders->clearSelection();
+        mSelectThisID.setNull();
 }
 
 void LLInventoryPanel::createNewItem(const std::string& name,
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index dd6756a..bdc24e0 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,6 +87,7 @@ public:
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
         // LLView methods
+        void draw();
         BOOL handleHover(S32 x, S32 y, MASK mask);
         BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                    EDragAndDropType cargo_type,
@@ -154,7 +155,8 @@ protected:
         LLFolderView*                           mFolders;
         LLScrollableContainerView*      mScroller;
         BOOL                                            mAllowMultiSelect;
-        const std::string                               mSortOrderSetting;
+        const std::string                       mSortOrderSetting;
+        LLUUID                                          mSelectThisID; // if non null, select this item
 };
 
 class LLInventoryView;
diff --git a/linden/indra/newview/lljoystickbutton.cpp b/linden/indra/newview/lljoystickbutton.cpp
index 773c57e..0d40a4e 100644
--- a/linden/indra/newview/lljoystickbutton.cpp
+++ b/linden/indra/newview/lljoystickbutton.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -651,11 +651,11 @@ void LLJoystickCameraRotate::drawRotatedImage( const LLImageGL* image, S32 rotat
                 { 1.f, 0.f }
         };
 
-        image->bind();
+        gGL.getTexUnit(0)->bind(image);
 
         gGL.color4fv(UI_VERTEX_COLOR.mV);
         
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 gGL.texCoord2fv( uv[ (rotations + 0) % 4]);
                 gGL.vertex2i(width, height );
diff --git a/linden/indra/newview/lljoystickbutton.h b/linden/indra/newview/lljoystickbutton.h
index 806f8fb..a8e3ab6 100644
--- a/linden/indra/newview/lljoystickbutton.h
+++ b/linden/indra/newview/lljoystickbutton.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lllandmarklist.cpp b/linden/indra/newview/lllandmarklist.cpp
index ee5819b..9a3d529 100644
--- a/linden/indra/newview/lllandmarklist.cpp
+++ b/linden/indra/newview/lllandmarklist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lllandmarklist.h b/linden/indra/newview/lllandmarklist.h
index 879ffec..3a2eb63 100644
--- a/linden/indra/newview/lllandmarklist.h
+++ b/linden/indra/newview/lllandmarklist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lllightconstants.h b/linden/indra/newview/lllightconstants.h
index cce014a..ce3e404 100644
--- a/linden/indra/newview/lllightconstants.h
+++ b/linden/indra/newview/lllightconstants.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp
index ea686af..95b626b 100644
--- a/linden/indra/newview/lllogchat.cpp
+++ b/linden/indra/newview/lllogchat.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -106,7 +106,8 @@ void LLLogChat::loadHistory(std::string filename , void (*callback)(ELogLineType
 {
         if(!filename.size())
         {
-                llerrs << "Filename is Empty!" << llendl;
+                llwarns << "Filename is Empty!" << llendl;
+                return ;
         }
 
         LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r");           /*Flawfinder: ignore*/
diff --git a/linden/indra/newview/lllogchat.h b/linden/indra/newview/lllogchat.h
index 694cec6..6d92c17 100644
--- a/linden/indra/newview/lllogchat.h
+++ b/linden/indra/newview/lllogchat.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 89f13fe..d70a4b4 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -388,13 +388,13 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
 
                 const F32 LINE_ALPHA = 0.33f;
 
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLUI::setLineWidth(1.5f);
 
                 if (draw_x)
                 {
                         gGL.color4f(1.f, 0.f, 0.f, LINE_ALPHA);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         gGL.vertex3f( -region_size, 0.f, 0.f );
                         gGL.vertex3f(  region_size, 0.f, 0.f );
                         gGL.end();
@@ -403,7 +403,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
                 if (draw_y)
                 {
                         gGL.color4f(0.f, 1.f, 0.f, LINE_ALPHA);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         gGL.vertex3f( 0.f, -region_size, 0.f );
                         gGL.vertex3f( 0.f,  region_size, 0.f );
                         gGL.end();
@@ -412,7 +412,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
                 if (draw_z)
                 {
                         gGL.color4f(0.f, 0.f, 1.f, LINE_ALPHA);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         gGL.vertex3f( 0.f, 0.f, -region_size );
                         gGL.vertex3f( 0.f, 0.f,  region_size );
                         gGL.end();
diff --git a/linden/indra/newview/llmanip.h b/linden/indra/newview/llmanip.h
index 24cd35a..391a8d9 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 11b5e8c..3ed4685 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -115,7 +115,7 @@ void LLManipRotate::handleSelect()
 void LLManipRotate::render()
 {
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
@@ -838,7 +838,7 @@ void LLManipRotate::renderSnapGuides()
                                 LLVector3 outer_point;
                                 LLVector3 text_point;
                                 LLQuaternion rot(deg * DEG_TO_RAD, constraint_axis);
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         inner_point = (projected_snap_axis * mRadiusMeters * SNAP_GUIDE_INNER_RADIUS * rot) + center;
                                         F32 tick_length = 0.f;
@@ -1017,7 +1017,7 @@ void LLManipRotate::renderSnapGuides()
                                 object_axis = object_axis * SNAP_GUIDE_INNER_RADIUS * mRadiusMeters + center;
                                 LLVector3 line_start = center;
 
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         gGL.vertex3fv(line_start.mV);
                                         gGL.vertex3fv(object_axis.mV);
@@ -1025,7 +1025,7 @@ void LLManipRotate::renderSnapGuides()
                                 gGL.end();
 
                                 // draw snap guide arrow
-                                gGL.begin(LLVertexBuffer::TRIANGLES);
+                                gGL.begin(LLRender::TRIANGLES);
                                 {
                                         LLVector3 arrow_dir;
                                         LLVector3 arrow_span = (object_axis - line_start) % getConstraintAxis();
@@ -1045,7 +1045,7 @@ void LLManipRotate::renderSnapGuides()
 
                                 {
                                         LLGLDepthTest gls_depth(GL_TRUE);
-                                        gGL.begin(LLVertexBuffer::LINES);
+                                        gGL.begin(LLRender::LINES);
                                         {
                                                 gGL.vertex3fv(line_start.mV);
                                                 gGL.vertex3fv(object_axis.mV);
@@ -1053,7 +1053,7 @@ void LLManipRotate::renderSnapGuides()
                                         gGL.end();
 
                                         // draw snap guide arrow
-                                        gGL.begin(LLVertexBuffer::TRIANGLES);
+                                        gGL.begin(LLRender::TRIANGLES);
                                         {
                                                 LLVector3 arrow_dir;
                                                 LLVector3 arrow_span = (object_axis - line_start) % getConstraintAxis();
diff --git a/linden/indra/newview/llmaniprotate.h b/linden/indra/newview/llmaniprotate.h
index b17e030..8929e9d 100644
--- a/linden/indra/newview/llmaniprotate.h
+++ b/linden/indra/newview/llmaniprotate.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 0fa5fa5..10cb0c3 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -197,7 +197,7 @@ LLManipScale::~LLManipScale()
 void LLManipScale::render()
 {
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
@@ -590,7 +590,7 @@ void LLManipScale::renderFaces( const LLBBox& bbox )
         {
                 gGL.color4fv( default_normal_color.mV );
                 LLGLDepthTest gls_depth(GL_FALSE);
-                gGL.begin(LLVertexBuffer::QUADS); 
+                gGL.begin(LLRender::QUADS); 
                 {
                         // Face 0
                         gGL.vertex3f(min.mV[VX], max.mV[VY], max.mV[VZ]);
@@ -751,7 +751,7 @@ void LLManipScale::renderCorners( const LLBBox& bbox )
 
 void LLManipScale::renderBoxHandle( F32 x, F32 y, F32 z )
 {
-        LLImageGL::unbindTexture(0);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_FALSE);
 
         glPushMatrix();
@@ -1528,7 +1528,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
         {
                 LLColor4 tick_color = setupSnapGuideRenderPass(pass);
 
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
                 LLVector3 line_mid = mScaleCenter + (mScaleSnapValue * mScaleDir) + (mSnapGuideDir1 * mSnapRegimeOffset);
                 LLVector3 line_start = line_mid - (mScaleDir * (llmin(mScaleSnapValue, mSnapGuideLength * 0.5f)));
                 LLVector3 line_end = line_mid + (mScaleDir * llmin(max_point_on_scale_line - mScaleSnapValue, mSnapGuideLength * 0.5f));
@@ -1579,7 +1579,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                 if (mInSnapRegime)
                 {
                         // draw snap guide line
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         LLVector3 snap_line_center = mScaleCenter + (mScaleSnapValue * mScaleDir);
 
                         LLVector3 snap_line_start = snap_line_center + (mSnapGuideDir1 * mSnapRegimeOffset);
@@ -1593,7 +1593,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                         gGL.end();
 
                         // draw snap guide arrow
-                        gGL.begin(LLVertexBuffer::TRIANGLES);
+                        gGL.begin(LLRender::TRIANGLES);
                         {
                                 //gGLSNoCullFaces.set();
                                 gGL.color4f(1.f, 1.f, 1.f, grid_alpha);
@@ -1628,7 +1628,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
                         start_tick = -(llmin(ticks_from_scale_center_1, num_ticks_per_side1));
                         stop_tick = llmin(max_ticks1, num_ticks_per_side1);
 
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         // draw first row of ticks
                         for (S32 i = start_tick; i <= stop_tick; i++)
                         {
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 333cbd2..98d8c63 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 2278453..fd02be6 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -77,7 +77,7 @@ const F32 PLANE_TICK_SIZE = 0.4f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 const F32 SNAP_ARROW_SCALE = 0.7f;
 
-static GLuint sGridTex = 0;
+static LLPointer<LLImageGL> sGridTex = NULL ;
 
 const LLManip::EManipPart MANIPULATOR_IDS[9] = 
 {
@@ -119,22 +119,50 @@ LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
         mPlaneScales(1.f, 1.f, 1.f),
         mPlaneManipPositions(1.f, 1.f, 1.f, 1.f)
 { 
-        if (sGridTex == 0)
+        if (sGridTex.isNull())
         { 
                 restoreGL();
         }
 }
 
 //static
+U32 LLManipTranslate::getGridTexName()
+{
+        if(sGridTex.isNull())
+        {
+                restoreGL() ;
+        }
+
+        return sGridTex.isNull() ? 0 : sGridTex->getTexName() ;
+}
+
+//static
+void LLManipTranslate::destroyGL()
+{
+        if (sGridTex)
+        {
+                sGridTex = NULL ;
+        }
+}
+
+//static
 void LLManipTranslate::restoreGL()
 {
         //generate grid texture
         U32 rez = 512;
         U32 mip = 0;
 
-        GLuint* d = new GLuint[rez*rez];
-        glGenTextures(1, &sGridTex);
-        glBindTexture(GL_TEXTURE_2D, sGridTex);
+        destroyGL() ;
+        sGridTex = new LLImageGL() ;
+        if(!sGridTex->createGLTexture())
+        {
+                sGridTex = NULL ;
+                return ;
+        }
+
+        GLuint* d = new GLuint[rez*rez];        
+
+        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, sGridTex->getTexName());
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
@@ -1052,7 +1080,7 @@ void LLManipTranslate::renderSnapGuides()
         F32 max_subdivisions = sGridMaxSubdivisionLevel;//(F32)gSavedSettings.getS32("GridSubdivision");
         F32 line_alpha = gSavedSettings.getF32("GridOpacity");
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLDisable gls_cull(GL_CULL_FACE);
         LLVector3 translate_axis;
@@ -1223,7 +1251,7 @@ void LLManipTranslate::renderSnapGuides()
                 {
                         LLColor4 line_color = setupSnapGuideRenderPass(pass);
 
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 LLVector3 line_start = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) + (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit));
                                 LLVector3 line_end = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) - (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit));
@@ -1299,7 +1327,7 @@ void LLManipTranslate::renderSnapGuides()
                                 LLVector3 line_start = selection_center - mSnapOffsetAxis * mSnapOffsetMeters;
                                 LLVector3 line_end = selection_center + mSnapOffsetAxis * mSnapOffsetMeters;
 
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         gGL.color4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
 
@@ -1309,7 +1337,7 @@ void LLManipTranslate::renderSnapGuides()
                                 gGL.end();
 
                                 // draw snap guide arrow
-                                gGL.begin(LLVertexBuffer::TRIANGLES);
+                                gGL.begin(LLRender::TRIANGLES);
                                 {
                                         gGL.color4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
 
@@ -1463,7 +1491,7 @@ void LLManipTranslate::renderSnapGuides()
                         break;
                 }
 
-                LLImageGL::unbindTexture(0);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 highlightIntersection(normal, selection_center, grid_rotation, inner_color);
 
                 gGL.pushMatrix();
@@ -1503,7 +1531,7 @@ void LLManipTranslate::renderSnapGuides()
                                 LLGLDisable stencil(GL_STENCIL_TEST);
                                 {
                                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER);
-                                        glBindTexture(GL_TEXTURE_2D, sGridTex);
+                                        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, getGridTexName());
                                         gGL.flush();
                                         gGL.blendFunc(LLRender::BF_ZERO, LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
                                         renderGrid(u,v,tiles,0.9f, 0.9f, 0.9f,a*0.15f);
@@ -1514,11 +1542,11 @@ void LLManipTranslate::renderSnapGuides()
                                 {
                                         LLGLDisable alpha_test(GL_ALPHA_TEST);
                                         //draw black overlay
-                                        LLImageGL::unbindTexture(0);
+                                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                         renderGrid(u,v,tiles,0.0f, 0.0f, 0.0f,a*0.16f);
 
                                         //draw grid top
-                                        glBindTexture(GL_TEXTURE_2D, sGridTex);
+                                        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, getGridTexName());
                                         renderGrid(u,v,tiles,1,1,1,a);
 
                                         gGL.popMatrix();
@@ -1564,7 +1592,7 @@ void LLManipTranslate::renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F
 
         for (F32 xx = -size-d; xx < size+d; xx += d)
         {
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
                 for (F32 yy = -size-d; yy < size+d; yy += d)
                 {
                         float dx, dy, da;
@@ -1620,7 +1648,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal,
                 LLGLDepthTest depth (GL_TRUE, GL_FALSE, GL_ALWAYS);
                 glStencilFunc(GL_ALWAYS, 0, stencil_mask);
                 gGL.setColorMask(false, false);
-                LLImageGL::unbindTexture(0);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 glColor4f(1,1,1,1);
 
                 //setup clip plane
@@ -1686,7 +1714,7 @@ void LLManipTranslate::highlightIntersection(LLVector3 normal,
 
         //draw volume/plane intersections
         {
-                LLImageGL::unbindTexture(0);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 LLGLDepthTest depth(GL_FALSE);
                 LLGLEnable stencil(GL_STENCIL_TEST);
                 glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
@@ -1834,7 +1862,7 @@ void LLManipTranslate::renderTranslationHandles()
                 relative_camera_dir.normVec();
 
                 {
-                        LLGLSNoTexture gls_ui_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLGLDisable cull_face(GL_CULL_FACE);
 
                         LLColor4 color1;
@@ -1877,7 +1905,7 @@ void LLManipTranslate::renderTranslationHandles()
                                         color1.setVec(0.f, 1.f, 0.f, 0.6f);
                                         color2.setVec(0.f, 0.f, 1.f, 0.6f);
                                 }
-                                gGL.begin(LLVertexBuffer::TRIANGLES);
+                                gGL.begin(LLRender::TRIANGLES);
                                 {
                                         gGL.color4fv(color1.mV);
                                         gGL.vertex3f(0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f));
@@ -1892,7 +1920,7 @@ void LLManipTranslate::renderTranslationHandles()
                                 gGL.end();
 
                                 LLUI::setLineWidth(3.0f);
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         gGL.color4f(0.f, 0.f, 0.f, 0.3f);
                                         gGL.vertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
@@ -1932,7 +1960,7 @@ void LLManipTranslate::renderTranslationHandles()
                                         color2.setVec(1.f, 0.f, 0.f, 0.6f);
                                 }
 
-                                gGL.begin(LLVertexBuffer::TRIANGLES);
+                                gGL.begin(LLRender::TRIANGLES);
                                 {
                                         gGL.color4fv(color1.mV);
                                         gGL.vertex3f(mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), 0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
@@ -1947,7 +1975,7 @@ void LLManipTranslate::renderTranslationHandles()
                                 gGL.end();
 
                                 LLUI::setLineWidth(3.0f);
-                                gGL.begin(LLVertexBuffer::LINES);
+                                gGL.begin(LLRender::LINES);
                                 {
                                         gGL.color4f(0.f, 0.f, 0.f, 0.3f);
                                         gGL.vertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
@@ -2011,7 +2039,7 @@ void LLManipTranslate::renderTranslationHandles()
                                                 color2.setVec(0.f, 0.8f, 0.f, 0.6f);
                                         }
                                 
-                                        gGL.begin(LLVertexBuffer::TRIANGLES);
+                                        gGL.begin(LLRender::TRIANGLES);
                                         {
                                                 gGL.color4fv(color1.mV);
                                                 gGL.vertex3fv(v0.mV);
@@ -2026,7 +2054,7 @@ void LLManipTranslate::renderTranslationHandles()
                                         gGL.end();
 
                                         LLUI::setLineWidth(3.0f);
-                                        gGL.begin(LLVertexBuffer::LINES);
+                                        gGL.begin(LLRender::LINES);
                                         {
                                                 gGL.color4f(0.f, 0.f, 0.f, 0.3f);
                                                 LLVector3 v12 = (v1 + v2) * .5f;
@@ -2052,7 +2080,7 @@ void LLManipTranslate::renderTranslationHandles()
                         }
                 }
                 {
-                        LLGLSNoTexture gls_ui_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                         // Since we draw handles with depth testing off, we need to draw them in the 
                         // proper depth order.
@@ -2126,7 +2154,7 @@ void LLManipTranslate::renderTranslationHandles()
 
 void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, BOOL reverse_direction)
 {
-        LLGLSNoTexture gls_ui_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLEnable gls_blend(GL_BLEND);
         LLGLEnable gls_color_material(GL_COLOR_MATERIAL);
 
@@ -2160,7 +2188,7 @@ void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_
 
                 {
                         LLUI::setLineWidth(2.0f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                                 vec.mV[index] = box_size;
                                 gGL.vertex3f(vec.mV[0], vec.mV[1], vec.mV[2]);
 
diff --git a/linden/indra/newview/llmaniptranslate.h b/linden/indra/newview/llmaniptranslate.h
index 383f4da..5b1c048 100644
--- a/linden/indra/newview/llmaniptranslate.h
+++ b/linden/indra/newview/llmaniptranslate.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -55,6 +55,8 @@ public:
         LLManipTranslate( LLToolComposite* composite );
         virtual ~LLManipTranslate();
 
+        static  U32     getGridTexName() ;
+        static  void    destroyGL();
         static  void    restoreGL();
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index d16bc78..7654e9b 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -66,7 +66,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                 new_layer.LayerDefined = TRUE;
                 new_layer.LayerImageID = layer_data["ImageID"];
                 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
-                new_layer.LayerImage->bindTexture(0);
+                gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
                 new_layer.LayerImage->setClamp(TRUE, TRUE);
                 
                 new_layer.LayerExtents.mLeft = layer_data["Left"];
@@ -163,7 +163,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                                 siminfo->mWaterHeight = (F32) water_height;
                                 siminfo->mMapImageID[agent_flags] = image_id;
                                 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
-                                siminfo->mCurrentImage->bindTexture(0);
+                                gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
                                 siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                         
                                 if (siminfo->mMapImageID[2].notNull())
diff --git a/linden/indra/newview/llmapresponders.h b/linden/indra/newview/llmapresponders.h
index a9d8dcd..b72d8e4 100644
--- a/linden/indra/newview/llmapresponders.h
+++ b/linden/indra/newview/llmapresponders.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 06978d7..eae5a24 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmediaremotectrl.h b/linden/indra/newview/llmediaremotectrl.h
index cb1cbbe..2537585 100644
--- a/linden/indra/newview/llmediaremotectrl.h
+++ b/linden/indra/newview/llmediaremotectrl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmemoryview.cpp b/linden/indra/newview/llmemoryview.cpp
index c814e2b..0c5df1f 100644
--- a/linden/indra/newview/llmemoryview.cpp
+++ b/linden/indra/newview/llmemoryview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -146,7 +146,7 @@ void LLMemoryView::draw()
         S32 height = getRect().getHeight();
         
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_tex;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gl_rect_2d(0, height, width, 0, LLColor4(0.f, 0.f, 0.f, 0.25f));
         
 #if MEM_TRACK_TYPE
diff --git a/linden/indra/newview/llmemoryview.h b/linden/indra/newview/llmemoryview.h
index 3fd61a1..fe07be1 100644
--- a/linden/indra/newview/llmemoryview.h
+++ b/linden/indra/newview/llmemoryview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmenucommands.cpp b/linden/indra/newview/llmenucommands.cpp
index 14db323..2275047 100644
--- a/linden/indra/newview/llmenucommands.cpp
+++ b/linden/indra/newview/llmenucommands.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmenucommands.h b/linden/indra/newview/llmenucommands.h
index c08167d..5b17b2e 100644
--- a/linden/indra/newview/llmenucommands.h
+++ b/linden/indra/newview/llmenucommands.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmimetypes.cpp b/linden/indra/newview/llmimetypes.cpp
index 355dc33..acb8809 100644
--- a/linden/indra/newview/llmimetypes.cpp
+++ b/linden/indra/newview/llmimetypes.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmimetypes.h b/linden/indra/newview/llmimetypes.h
index 56aba9b..0b03570 100644
--- a/linden/indra/newview/llmimetypes.h
+++ b/linden/indra/newview/llmimetypes.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmorphview.cpp b/linden/indra/newview/llmorphview.cpp
index 6a592e6..4de4e75 100644
--- a/linden/indra/newview/llmorphview.cpp
+++ b/linden/indra/newview/llmorphview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmorphview.h b/linden/indra/newview/llmorphview.h
index 1ea09ac..a417c6a 100644
--- a/linden/indra/newview/llmorphview.h
+++ b/linden/indra/newview/llmorphview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmoveview.cpp b/linden/indra/newview/llmoveview.cpp
index 0427072..9f11afb 100644
--- a/linden/indra/newview/llmoveview.cpp
+++ b/linden/indra/newview/llmoveview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmoveview.h b/linden/indra/newview/llmoveview.h
index a3a4ad1..760253e 100644
--- a/linden/indra/newview/llmoveview.h
+++ b/linden/indra/newview/llmoveview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 0cdfe83..a9bf4b3 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -71,6 +71,24 @@
 #include "llviewerobject.h" 
 #include "llviewerobjectlist.h"
 
+namespace 
+{
+        // This method is used to return an object to mute given an object id.
+        // Its used by the LLMute constructor and LLMuteList::isMuted.
+        LLViewerObject* get_object_to_mute_from_id(LLUUID object_id)
+        {
+                LLViewerObject *objectp = gObjectList.findObject(object_id);
+                if ((objectp) && (!objectp->isAvatar()))
+                {
+                        LLViewerObject *parentp = (LLViewerObject *)objectp->getParent();
+                        if (parentp && parentp->getID() != gAgent.getID())
+                        {
+                                objectp = parentp;
+                        }
+                }
+                return objectp;
+        }
+}
 
 // "emptymutelist"
 class LLDispatchEmptyMuteList : public LLDispatchHandler
@@ -97,6 +115,32 @@ const char AGENT_SUFFIX[] = " (resident)";
 const char OBJECT_SUFFIX[] = " (object)";
 const char GROUP_SUFFIX[] = " (group)";
 
+
+LLMute::LLMute(const LLUUID& id, const std::string& name, EType type, U32 flags)
+  : mID(id),
+        mName(name),
+        mType(type),
+        mFlags(flags)
+{
+        // muting is done by root objects only - try to find this objects root
+        LLViewerObject* mute_object = get_object_to_mute_from_id(id);
+        if(mute_object && mute_object->getID() != id)
+        {
+                mID = mute_object->getID();
+                LLNameValue* firstname = mute_object->getNVPair("FirstName");
+                LLNameValue* lastname = mute_object->getNVPair("LastName");
+                if (firstname && lastname)
+                {
+                        mName.assign( firstname->getString() );
+                        mName.append(" ");
+                        mName.append( lastname->getString() );
+                }
+                mType = mute_object->isAvatar() ? AGENT : OBJECT;
+        }
+
+}
+
+
 std::string LLMute::getDisplayName() const
 {
         std::string name_with_suffix = mName;
@@ -216,17 +260,24 @@ void LLMuteList::loadUserVolumes()
 //-----------------------------------------------------------------------------
 LLMuteList::~LLMuteList()
 {
-        std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
-        LLSD settings_llsd;
-
-        for(user_volume_map_t::iterator iter = mUserVolumeSettings.begin(); iter != mUserVolumeSettings.end(); ++iter)
+        // If we quit from the login screen we will not have an SL account
+        // name.  Don't try to save, otherwise we'll dump a file in
+        // C:\Program Files\SecondLife\  JC
+        std::string user_dir = gDirUtilp->getLindenUserDir();
+        if (!user_dir.empty())
         {
-                settings_llsd[iter->first.asString()] = iter->second;
-        }
+                std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
+                LLSD settings_llsd;
 
-        llofstream file;
-        file.open(filename);
-        LLSDSerialize::toPrettyXML(settings_llsd, file);
+                for(user_volume_map_t::iterator iter = mUserVolumeSettings.begin(); iter != mUserVolumeSettings.end(); ++iter)
+                {
+                        settings_llsd[iter->first.asString()] = iter->second;
+                }
+
+                llofstream file;
+                file.open(filename);
+                LLSDSerialize::toPrettyXML(settings_llsd, file);
+        }
 }
 
 BOOL LLMuteList::isLinden(const std::string& name) const
@@ -635,19 +686,10 @@ BOOL LLMuteList::saveToFile(const std::string& filename)
 
 BOOL LLMuteList::isMuted(const LLUUID& id, const std::string& name, U32 flags) const
 {
-        LLUUID id_to_check = id;
-        
         // for objects, check for muting on their parent prim
-        LLViewerObject *objectp = gObjectList.findObject(id);
-        if ((objectp) && (!objectp->isAvatar()))
-        {
-                LLViewerObject *parentp = (LLViewerObject *)objectp->getParent();
-                if (parentp)
-                {
-                        id_to_check = parentp->getID();
-                }
-        }
-        
+        LLViewerObject* mute_object = get_object_to_mute_from_id(id);
+        LLUUID id_to_check  = (mute_object) ? mute_object->getID() : id;
+
         // don't need name or type for lookup
         LLMute mute(id_to_check);
         mute_set_t::const_iterator mute_it = mMutes.find(mute);
diff --git a/linden/indra/newview/llmutelist.h b/linden/indra/newview/llmutelist.h
index 400f13e..6b3cfcb 100644
--- a/linden/indra/newview/llmutelist.h
+++ b/linden/indra/newview/llmutelist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -60,8 +60,7 @@ public:
                 flagAll                         = 0x0000000F            // Mask of all currently defined flags
         };
         
-        LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0) 
-        : mID(id), mName(name), mType(type),mFlags(flags) { }
+        LLMute(const LLUUID& id, const std::string& name = std::string(), EType type = BY_NAME, U32 flags = 0);
 
         // Returns name + suffix based on type
         // For example:  "James Tester (resident)"
diff --git a/linden/indra/newview/llnamebox.cpp b/linden/indra/newview/llnamebox.cpp
index d178c5a..26759bc 100644
--- a/linden/indra/newview/llnamebox.cpp
+++ b/linden/indra/newview/llnamebox.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnamebox.h b/linden/indra/newview/llnamebox.h
index 09770e3..e77db88 100644
--- a/linden/indra/newview/llnamebox.h
+++ b/linden/indra/newview/llnamebox.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnameeditor.cpp b/linden/indra/newview/llnameeditor.cpp
index 5557f84..ef4d7f7 100644
--- a/linden/indra/newview/llnameeditor.cpp
+++ b/linden/indra/newview/llnameeditor.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnameeditor.h b/linden/indra/newview/llnameeditor.h
index 84ae219..b1a9467 100644
--- a/linden/indra/newview/llnameeditor.h
+++ b/linden/indra/newview/llnameeditor.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp
index b8bda78..1617a66 100644
--- a/linden/indra/newview/llnamelistctrl.cpp
+++ b/linden/indra/newview/llnamelistctrl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnamelistctrl.h b/linden/indra/newview/llnamelistctrl.h
index c4bf12b..85a214c 100644
--- a/linden/indra/newview/llnamelistctrl.h
+++ b/linden/indra/newview/llnamelistctrl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index ee853fe..9d92576 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -229,7 +229,7 @@ void LLNetMap::draw()
                 LLGLEnable scissor(GL_SCISSOR_TEST);
                 
                 {
-                        LLGLSNoTexture no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLLocalClipRect clip(getLocalRect());
 
                         glMatrixMode(GL_MODELVIEW);
@@ -289,8 +289,8 @@ void LLNetMap::draw()
 
 
                         // Draw using texture.
-                        LLViewerImage::bindTexture(regionp->getLand().getSTexture());
-                        gGL.begin(LLVertexBuffer::QUADS);
+                        gGL.getTexUnit(0)->bind(regionp->getLand().getSTexture());
+                        gGL.begin(LLRender::QUADS);
                                 gGL.texCoord2f(0.f, 1.f);
                                 gGL.vertex2f(left, top);
                                 gGL.texCoord2f(0.f, 0.f);
@@ -306,8 +306,8 @@ void LLNetMap::draw()
                         {
                                 if (regionp->getLand().getWaterTexture())
                                 {
-                                        LLViewerImage::bindTexture(regionp->getLand().getWaterTexture());
-                                        gGL.begin(LLVertexBuffer::QUADS);
+                                        gGL.getTexUnit(0)->bind(regionp->getLand().getWaterTexture());
+                                        gGL.begin(LLRender::QUADS);
                                                 gGL.texCoord2f(0.f, 1.f);
                                                 gGL.vertex2f(left, top);
                                                 gGL.texCoord2f(0.f, 0.f);
@@ -353,11 +353,11 @@ void LLNetMap::draw()
                 map_center_agent.mV[VX] *= gMiniMapScale/region_width;
                 map_center_agent.mV[VY] *= gMiniMapScale/region_width;
 
-                LLViewerImage::bindTexture(mObjectImagep);
+                gGL.getTexUnit(0)->bind(mObjectImagep);
                 F32 image_half_width = 0.5f*mObjectMapPixels;
                 F32 image_half_height = 0.5f*mObjectMapPixels;
 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                         gGL.texCoord2f(0.f, 1.f);
                         gGL.vertex2f(map_center_agent.mV[VX] - image_half_width, image_half_height + map_center_agent.mV[VY]);
                         gGL.texCoord2f(0.f, 0.f);
@@ -460,13 +460,13 @@ void LLNetMap::draw()
                 F32 ctr_y = (F32)center_sw_bottom;
 
 
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 if( LLNetMap::sRotateMap )
                 {
                         gGL.color4fv(gFrustumMapColor.mV);
 
-                        gGL.begin( LLVertexBuffer::TRIANGLES  );
+                        gGL.begin( LLRender::TRIANGLES  );
                                 gGL.vertex2f( ctr_x, ctr_y );
                                 gGL.vertex2f( ctr_x - half_width_pixels, ctr_y + far_clip_pixels );
                                 gGL.vertex2f( ctr_x + half_width_pixels, ctr_y + far_clip_pixels );
@@ -480,7 +480,7 @@ void LLNetMap::draw()
                         gGL.pushMatrix();
                                 gGL.translatef( ctr_x, ctr_y, 0 );
                                 glRotatef( atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] ) * RAD_TO_DEG, 0.f, 0.f, -1.f);
-                                gGL.begin( LLVertexBuffer::TRIANGLES  );
+                                gGL.begin( LLRender::TRIANGLES  );
                                         gGL.vertex2f( 0, 0 );
                                         gGL.vertex2f( -half_width_pixels, far_clip_pixels );
                                         gGL.vertex2f(  half_width_pixels, far_clip_pixels );
@@ -649,7 +649,11 @@ void LLNetMap::renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &
         LLVector3 local_pos;
         local_pos.setVec( pos - mObjectImageCenterGlobal );
 
-        S32 diameter_pixels = llround(2 * radius_meters * mObjectMapTPM);
+        // DEV-17370 - megaprims of size > 4096 cause lag.  (go figger.)
+        const F32 MAX_RADIUS = 256.0f;
+        F32 radius_clamped = llmin(radius_meters, MAX_RADIUS);
+        
+        S32 diameter_pixels = llround(2 * radius_clamped * mObjectMapTPM);
         renderPoint( local_pos, color, diameter_pixels );
 }
 
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 91027c5..65d4a4c 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index f703736..9e837a6 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -509,7 +509,7 @@ void LLNotifyBox::drawBackground() const
         LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
         if (imagep)
         {
-                LLViewerImage::bindTexture(imagep->getImage());
+                gGL.getTexUnit(0)->bind(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 ))
@@ -971,10 +971,12 @@ LLNotifyBox * LLNotifyBoxView::getFirstNontipBox() const
                         iter++)
         {
                 // hack! *TODO: Integrate llnotify and llgroupnotify
-                LLView* view = *iter;
-                if (view->getName() == "groupnotify")
+                if(isGroupNotifyBox(*iter))
+                {
                         continue;
-                LLNotifyBox* box = static_cast<LLNotifyBox*>(view);
+                }
+                
+                LLNotifyBox* box = (LLNotifyBox*)(*iter);
                 if(!box->isTip() && !box->isDead())
                 {
                         return box;
@@ -988,13 +990,23 @@ void LLNotifyBoxView::showOnly(LLView * view)
         if(view) 
         {
                 // assumes that the argument is actually a child
-                LLNotifyBox * shown = static_cast<LLNotifyBox*>(view);
+                LLNotifyBox * shown = dynamic_cast<LLNotifyBox*>(view);
+                if(!shown)
+                {
+                        return ;
+                }
+
                 // make every other notification invisible
                 for(child_list_const_iter_t iter = getChildList()->begin();
                         iter != getChildList()->end();
                         iter++)
                 {
-                        LLNotifyBox * box = static_cast<LLNotifyBox*>(*iter);
+                        if(isGroupNotifyBox(*iter))
+                        {
+                                continue;
+                        }
+
+                        LLNotifyBox * box = (LLNotifyBox*)(*iter);
                         if(box != view && box->getVisible() && !box->isTip())
                         {
                                 box->setVisible(FALSE);
@@ -1014,6 +1026,11 @@ void LLNotifyBoxView::purgeMessagesMatching(const Matcher& matcher)
                 iter != notification_queue.end();
                 iter++)
         {
+                if(isGroupNotifyBox(*iter))
+                {
+                        continue;
+                }
+
                 LLNotifyBox* notification = (LLNotifyBox*)*iter;
                 if(matcher.matches(notification->getNotifyCallback(), notification->getUserData()))
                 {
@@ -1021,3 +1038,14 @@ void LLNotifyBoxView::purgeMessagesMatching(const Matcher& matcher)
                 }
         }
 }
+
+bool LLNotifyBoxView::isGroupNotifyBox(const LLView* view) const
+{
+        if (view->getName() == "groupnotify")
+        {
+                return TRUE ;
+        }
+
+        return FALSE ;
+}
+
diff --git a/linden/indra/newview/llnotify.h b/linden/indra/newview/llnotify.h
index 95d61eb..a653d19 100644
--- a/linden/indra/newview/llnotify.h
+++ b/linden/indra/newview/llnotify.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -179,6 +179,9 @@ public:
         // Walks the list and removes any stacked messages for which the given matcher returns TRUE.
         // Useful when muting people and things in order to clear out any similar previously queued messages.
         void purgeMessagesMatching(const Matcher& matcher);
+
+private:
+        bool isGroupNotifyBox(const LLView* view) const ;
 };
 
 // This view contains the stack of notification windows.
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index a4eedbb..5dd5d39 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 73d0a43..8b9b6bc 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelLCD.cpp b/linden/indra/newview/llpanelLCD.cpp
index cd6626c..f3e1bb5 100644
--- a/linden/indra/newview/llpanelLCD.cpp
+++ b/linden/indra/newview/llpanelLCD.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelLCD.h b/linden/indra/newview/llpanelLCD.h
index ede1b38..bdba23a 100644
--- a/linden/indra/newview/llpanelLCD.h
+++ b/linden/indra/newview/llpanelLCD.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 6dc1e73..69f39fa 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelaudioprefs.h b/linden/indra/newview/llpanelaudioprefs.h
index 01483ca..21ed385 100644
--- a/linden/indra/newview/llpanelaudioprefs.h
+++ b/linden/indra/newview/llpanelaudioprefs.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp
index 9a66366..fa39f3e 100644
--- a/linden/indra/newview/llpanelaudiovolume.cpp
+++ b/linden/indra/newview/llpanelaudiovolume.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelaudiovolume.h b/linden/indra/newview/llpanelaudiovolume.h
index 0a2dbca..2227747 100644
--- a/linden/indra/newview/llpanelaudiovolume.h
+++ b/linden/indra/newview/llpanelaudiovolume.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 76dbd1f..e4a9c9e 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index c0ef260..4570145 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 8228a97..4d28be5 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelclassified.h b/linden/indra/newview/llpanelclassified.h
index 93bb726..ff5a253 100644
--- a/linden/indra/newview/llpanelclassified.h
+++ b/linden/indra/newview/llpanelclassified.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 4d6508a..d91790e 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelcontents.h b/linden/indra/newview/llpanelcontents.h
index c53db90..a1c5ac2 100644
--- a/linden/indra/newview/llpanelcontents.h
+++ b/linden/indra/newview/llpanelcontents.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldebug.cpp b/linden/indra/newview/llpaneldebug.cpp
index 9d3b865..fb3c4cc 100644
--- a/linden/indra/newview/llpaneldebug.cpp
+++ b/linden/indra/newview/llpaneldebug.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldebug.h b/linden/indra/newview/llpaneldebug.h
index c849027..f2ffcfe 100644
--- a/linden/indra/newview/llpaneldebug.h
+++ b/linden/indra/newview/llpaneldebug.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirbrowser.cpp b/linden/indra/newview/llpaneldirbrowser.cpp
index 732a919..753f0f0 100644
--- a/linden/indra/newview/llpaneldirbrowser.cpp
+++ b/linden/indra/newview/llpaneldirbrowser.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirbrowser.h b/linden/indra/newview/llpaneldirbrowser.h
index aa7b0f5..c814786 100644
--- a/linden/indra/newview/llpaneldirbrowser.h
+++ b/linden/indra/newview/llpaneldirbrowser.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirclassified.cpp b/linden/indra/newview/llpaneldirclassified.cpp
index 1114707..c58b887 100644
--- a/linden/indra/newview/llpaneldirclassified.cpp
+++ b/linden/indra/newview/llpaneldirclassified.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirclassified.h b/linden/indra/newview/llpaneldirclassified.h
index 58bcb9c..1507b25 100644
--- a/linden/indra/newview/llpaneldirclassified.h
+++ b/linden/indra/newview/llpaneldirclassified.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirevents.cpp b/linden/indra/newview/llpaneldirevents.cpp
index 81e5a38..7bf439a 100644
--- a/linden/indra/newview/llpaneldirevents.cpp
+++ b/linden/indra/newview/llpaneldirevents.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirevents.h b/linden/indra/newview/llpaneldirevents.h
index ac981d3..3ef7951 100644
--- a/linden/indra/newview/llpaneldirevents.h
+++ b/linden/indra/newview/llpaneldirevents.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index cc0a700..ff4286b 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -321,15 +321,8 @@ std::string LLPanelDirFind::getSearchURLSuffix(bool mature_in)
         substring = "[SESSION]";
         url.replace(url.find(substring), substring.length(), session_string);
 
-        // set the currently selected lanaguage by asking the pref setting
-        std::string language_string = LLUI::sConfigGroup->getString( "Language" );
-        if ( language_string == "default" ) 
-        {
-                // if "default system language" setting used, ask again
-                // (we can't do this directly since it can vary if you install
-                // under one language and select a different one using prefs)
-                language_string = gSavedSettings.getString( "SystemLanguage" );
-        }
+        // set the currently selected language by asking the pref setting
+        std::string language_string = LLUI::getLanguage();
         std::string language_tag = "[LANG]";
         url.replace( url.find( language_tag ), language_tag.length(), language_string );
 
diff --git a/linden/indra/newview/llpaneldirfind.h b/linden/indra/newview/llpaneldirfind.h
index 2359d62..60d645b 100644
--- a/linden/indra/newview/llpaneldirfind.h
+++ b/linden/indra/newview/llpaneldirfind.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirgroups.cpp b/linden/indra/newview/llpaneldirgroups.cpp
index b765e99..5dac8ca 100644
--- a/linden/indra/newview/llpaneldirgroups.cpp
+++ b/linden/indra/newview/llpaneldirgroups.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirgroups.h b/linden/indra/newview/llpaneldirgroups.h
index 03608e2..38a8f2d 100644
--- a/linden/indra/newview/llpaneldirgroups.h
+++ b/linden/indra/newview/llpaneldirgroups.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirland.cpp b/linden/indra/newview/llpaneldirland.cpp
index 6e8af5f..52dace0 100644
--- a/linden/indra/newview/llpaneldirland.cpp
+++ b/linden/indra/newview/llpaneldirland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirland.h b/linden/indra/newview/llpaneldirland.h
index 0ccfa51..2def0c4 100644
--- a/linden/indra/newview/llpaneldirland.h
+++ b/linden/indra/newview/llpaneldirland.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirpeople.cpp b/linden/indra/newview/llpaneldirpeople.cpp
index 4ecf3da..c111d40 100644
--- a/linden/indra/newview/llpaneldirpeople.cpp
+++ b/linden/indra/newview/llpaneldirpeople.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirpeople.h b/linden/indra/newview/llpaneldirpeople.h
index 14c4639..776af25 100644
--- a/linden/indra/newview/llpaneldirpeople.h
+++ b/linden/indra/newview/llpaneldirpeople.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirplaces.cpp b/linden/indra/newview/llpaneldirplaces.cpp
index a795845..d97b2df 100644
--- a/linden/indra/newview/llpaneldirplaces.cpp
+++ b/linden/indra/newview/llpaneldirplaces.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirplaces.h b/linden/indra/newview/llpaneldirplaces.h
index bd86235..f1eebe0 100644
--- a/linden/indra/newview/llpaneldirplaces.h
+++ b/linden/indra/newview/llpaneldirplaces.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirpopular.cpp b/linden/indra/newview/llpaneldirpopular.cpp
index 7cfc5b5..dc2cc46 100644
--- a/linden/indra/newview/llpaneldirpopular.cpp
+++ b/linden/indra/newview/llpaneldirpopular.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldirpopular.h b/linden/indra/newview/llpaneldirpopular.h
index 5f28ba0..b8a8bd6 100644
--- a/linden/indra/newview/llpaneldirpopular.h
+++ b/linden/indra/newview/llpaneldirpopular.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 3e60745..d510775 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -753,6 +753,8 @@ void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
 
 void LLPanelDisplay::applyResolution()
 {
+
+        gGL.flush();
         char aspect_ratio_text[ASPECT_RATIO_STR_LEN];           /*Flawfinder: ignore*/
         if (mCtrlAspectRatio->getCurrentIndex() == -1)
         {
@@ -787,75 +789,23 @@ void LLPanelDisplay::applyResolution()
         {
                 mAspectRatio = (F32)mCtrlAspectRatio->getValue().asReal();
         }
-
+        
         // presumably, user entered a non-numeric value if aspect_ratio == 0.f
         if (mAspectRatio != 0.f)
         {
                 mAspectRatio = llclamp(mAspectRatio, 0.2f, 5.f);
                 gSavedSettings.setF32("FullScreenAspectRatio", mAspectRatio);
-                if (gSavedSettings.getBOOL("FullScreenAutoDetectAspectRatio"))
-                {
-                        gViewerWindow->getWindow()->setNativeAspectRatio(0.f);
-                }
-                else
-                {
-                        gViewerWindow->getWindow()->setNativeAspectRatio(mAspectRatio);
-                }
         }
-        gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-
+        
         // Screen resolution
         S32 num_resolutions;
-        LLWindow::LLWindowResolution* supported_resolutions = gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
-
-        // switching to windowed
-        BOOL fullscreen = !mCtrlWindowed->get();
-
-        // check if resolution has changed
-        BOOL targetFullscreen;
-        S32 targetWidth;
-        S32 targetHeight;
-        
-        gViewerWindow->getTargetWindow(targetFullscreen, targetWidth, targetHeight);
+        LLWindow::LLWindowResolution* supported_resolutions = 
+                gViewerWindow->getWindow()->getSupportedResolutions(num_resolutions);
+        U32 resIndex = mCtrlFullScreen->getCurrentIndex();
+        gSavedSettings.setS32("FullScreenWidth", supported_resolutions[resIndex].mWidth);
+        gSavedSettings.setS32("FullScreenHeight", supported_resolutions[resIndex].mHeight);
 
-        if ((fullscreen != targetFullscreen) ||
-                (fullscreen &&
-                 (supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mWidth != targetWidth ||
-                  supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mHeight != targetHeight)
-                 ))
-        {
-                // change fullscreen resolution or switch in/out of windowed mode
-                BOOL result;
-
-                BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
-                if (fullscreen)
-                {
-                        result = gViewerWindow->changeDisplaySettings(TRUE, 
-                                LLCoordScreen(  supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mWidth, 
-                                                                supported_resolutions[mCtrlFullScreen->getCurrentIndex()].mHeight), 
-                                gSavedSettings.getBOOL("DisableVerticalSync"),
-                                logged_in);
-                }
-                else
-                {
-                        result = gViewerWindow->changeDisplaySettings(FALSE, 
-                                LLCoordScreen(gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight")), 
-                                TRUE,
-                                logged_in);
-                }
-                if (!result)
-                {
-
-                        // GL is non-existent at this point, so we can't continue.
-                        llerrs << "LLPanelDisplay::apply() failed" << llendl;
-                }
-        }
-
-        // force aspect ratio
-        if (fullscreen)
-        {
-                LLViewerCamera::getInstance()->setAspect( gViewerWindow->getDisplayAspectRatio() );
-        }
+        gViewerWindow->requestResolutionUpdate(!mCtrlWindowed->get());
 
         send_agent_update(TRUE);
 
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index 4b0d9d7..f98e94e 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelevent.cpp b/linden/indra/newview/llpanelevent.cpp
index f205e94..830cb1d 100644
--- a/linden/indra/newview/llpanelevent.cpp
+++ b/linden/indra/newview/llpanelevent.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelevent.h b/linden/indra/newview/llpanelevent.h
index a75ee28..7e91416 100644
--- a/linden/indra/newview/llpanelevent.h
+++ b/linden/indra/newview/llpanelevent.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 0c642bc..1e4258a 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelface.h b/linden/indra/newview/llpanelface.h
index b977583..5cdfe88 100644
--- a/linden/indra/newview/llpanelface.h
+++ b/linden/indra/newview/llpanelface.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 6166ba5..f370116 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -31,75 +31,15 @@
 
 #include "llviewerprecompiledheaders.h"
 
+//file include
 #include "llpanelgeneral.h"
 
-// linden library includes
-#include "llerror.h"
-#include "llrect.h"
-#include "llfontgl.h"
-#include "message.h"
-#include "lluictrlfactory.h"
-
 // project includes
-#include "llagent.h"
-#include "llviewerwindow.h"
 #include "llcolorswatch.h"
 #include "llcombobox.h"
-#include "llconsole.h"
-#include "lllineeditor.h"
-#include "llpanellogin.h"
-#include "llnetmap.h"
-#include "llresmgr.h"
-#include "llspinctrl.h"
-#include "lltextbox.h"
-#include "llui.h"
+#include "lluictrlfactory.h"
 #include "llurlsimstring.h"
 #include "llviewercontrol.h"
-#include "llurlsimstring.h"
-
-#include "llcheckboxctrl.h"
-#include "llradiogroup.h"
-//
-// Imported globals
-//
-
-void set_crash_behavior(LLUICtrl* ctrl, void* data);
-void set_start_location(LLUICtrl* ctrl, void* data);
-
-
-//
-// Globals
-//
-
-//
-// 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)
-{
-        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, ((LLComboBox*) ctrl)->getCurrentIndex());
-}
-
-void set_language(LLUICtrl* ctrl, void* data)
-{
-    gSavedSettings.setString("Language", ctrl->getValue().asString());
-}
-
-void LLPanelGeneral::set_start_location(LLUICtrl* ctrl, void* data)
-{
-    LLURLSimString::setString(ctrl->getValue().asString());
-}
-
-void LLPanelGeneral::set_specific_start_location(LLLineEditor* line_editor, void* data)
-{
-    LLURLSimString::setString(line_editor->getValue().asString());
-}
 
 LLPanelGeneral::LLPanelGeneral()
 {
@@ -108,51 +48,33 @@ LLPanelGeneral::LLPanelGeneral()
 
 BOOL LLPanelGeneral::postBuild()
 {
-        childSetCommitCallback("fade_out_combobox", set_render_name_fade_out);
-        childSetAction("reset_ui_size", onClickResetUISize, this);
-
-        std::string region_name_prompt = getString("region_name_prompt");
-
-
-        // location combobox
-        LLComboBox* combo = getChild<LLComboBox>( "location_combobox");
-        if (combo)
-        {
-                if (!LLURLSimString::sInstance.mSimString.empty())
-                {
-                        combo->setTextEntry(LLURLSimString::sInstance.mSimString);
-                }
-        
-                BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
-                if (!LLURLSimString::sInstance.mSimString.empty())
-                {
-                        combo->add( LLURLSimString::sInstance.mSimString );
-                        combo->setCurrentByIndex( 2 );
-                }
-                else
-                {
-                        combo->add( region_name_prompt );
-                        combo->setCurrentByIndex( login_last ? 1 : 0 );
-                }
-                combo->setCommitCallback( &set_start_location );
-                combo->setTextEntryCallback( &set_specific_start_location );
-        }
-        
-        // Show location on login screen
-        childSetCommitCallback("show_location_checkbox", &LLPanelGeneral::clickShowStartLocation);
-
-        combo = getChild<LLComboBox>( "crash_behavior_combobox");
-        if (combo)
-        {
-                combo->setCurrentByIndex( gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) );
-                combo->setCommitCallback( &set_crash_behavior );
-        }
+        LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
+        fade_out_combobox->setCurrentByIndex(gSavedSettings.getS32("RenderName"));
+
+        childSetValue("default_start_location", gSavedSettings.getBOOL("LoginLastLocation") ? "MyLastLocation" : "MyHome");
+        childSetValue("show_location_checkbox", gSavedSettings.getBOOL("ShowStartLocation"));
+        childSetValue("show_all_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitleAll"));
+        childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
+
+        childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
+        childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
+        childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
+        childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
+        childSetValue("rotate_mini_map_checkbox", gSavedSettings.getBOOL("MiniMapRotate"));
+        childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
+        childSetValue("use_system_color_picker_checkbox", gSavedSettings.getBOOL("UseDefaultColorPicker"));
+        childSetValue("show_search_panel", gSavedSettings.getBOOL("ShowSearchBar"));
+
+        getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
+
+        childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor"));
+        childSetValue("ui_auto_scale", gSavedSettings.getBOOL("UIAutoScale"));
+
+        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
+        crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
         
-        childSetCommitCallback("language_combobox", set_language );
         childSetValue("language_combobox",      gSavedSettings.getString("Language"));
 
-        refresh();
-
         return TRUE;
 }
 
@@ -161,92 +83,34 @@ LLPanelGeneral::~LLPanelGeneral()
         // Children all cleaned up by default view destructor.
 }
 
-void LLPanelGeneral::refresh()
-{
-        LLPanel::refresh();
-        BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
-        LLComboBox* combo = getChild<LLComboBox>( "location_combobox");
-        if (combo)
-        {
-                if (!LLURLSimString::sInstance.mSimString.empty())
-                {
-                        combo->setCurrentByIndex( 2 );
-                }
-                else
-                {
-                        combo->setCurrentByIndex( login_last ? 1 : 0 );
-                }
-                //save current settings in case cancel is clicked
-                mLoginLocation = combo->getValue().asString();
-        }
-        
-        mOldCrashBehavior = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-        combo = getChild<LLComboBox>( "crash_behavior_combobox");
-        if (combo)
-        {
-                combo->setCurrentByIndex( mOldCrashBehavior );
-        }
-        
-        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");
-        mChatOnlineNotification = gSavedSettings.getBOOL("ChatOnlineNotification");
-        mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
-        mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
-        mMiniMapTeleport = gSavedSettings.getBOOL("MiniMapTeleport");
-        mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
-        mUseDefaultColor = gSavedSettings.getBOOL("UseDefaultColorPicker");
-        mEffectColor = gSavedSettings.getColor4("EffectColor");
-        mShowSearch = gSavedSettings.getBOOL("ShowSearchBar");
-
-        mUIScaleFactor = gSavedSettings.getF32("UIScaleFactor");
-        mUIAutoScale = gSavedSettings.getBOOL("UIAutoScale");
-
-        mLanguage = gSavedSettings.getString("Language");
-}
-
 void LLPanelGeneral::apply()
 {
-}
-
-void LLPanelGeneral::cancel()
-{
-        gSavedSettings.setS32("RenderName", mRenderName);
-        gSavedSettings.setBOOL("RenderNameHideSelf", mRenderNameHideSelf );
-        gSavedSettings.setBOOL("SmallAvatarNames", mSmallAvatarNames );
-        gSavedSettings.setBOOL("RenderHideGroupTitle", mRenderHideGroupTitle );
-        gSavedSettings.setBOOL("ChatOnlineNotification", mChatOnlineNotification );
-        gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
-        gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
-        gSavedSettings.setBOOL("MiniMapTeleport", mMiniMapTeleport);
-        gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
-        gSavedSettings.setBOOL("UseDefaultColorPicker", mUseDefaultColor );
-        gSavedSettings.setBOOL("ShowSearchBar", mShowSearch);
-        gSavedSettings.setColor4("EffectColor", mEffectColor );
-        gSavedSettings.setF32("UIScaleFactor", mUIScaleFactor);
-        gSavedSettings.setBOOL("UIAutoScale", mUIAutoScale);
-        gSavedSettings.setString("Language", mLanguage);
+        LLComboBox* fade_out_combobox = getChild<LLComboBox>("fade_out_combobox");
+        gSavedSettings.setS32("RenderName", fade_out_combobox->getCurrentIndex());
         
-        LLURLSimString::setString(mLoginLocation);
-
-        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, mOldCrashBehavior);
+        gSavedSettings.setBOOL("LoginLastLocation", childGetValue("default_start_location").asString() == "MyLastLocation");
+        gSavedSettings.setBOOL("ShowStartLocation", childGetValue("show_location_checkbox"));
+        gSavedSettings.setBOOL("RenderHideGroupTitleAll", childGetValue("show_all_title_checkbox"));
+        gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
+        gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
+        gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
+        gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
+        gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
+        gSavedSettings.setBOOL("MiniMapRotate", childGetValue("rotate_mini_map_checkbox"));
+        gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
+        gSavedSettings.setBOOL("UseDefaultColorPicker", childGetValue("use_system_color_picker_checkbox"));
+        gSavedSettings.setBOOL("ShowSearchBar", childGetValue("show_search_panel"));
+        gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
+        gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
+        gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
+        gSavedSettings.setString("Language", childGetValue("language_combobox"));
+
+        LLURLSimString::setString(childGetValue("location_combobox"));
+
+        LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
+        gCrashSettings.setS32(CRASH_BEHAVIOR_SETTING, crash_behavior_combobox->getCurrentIndex());
 }
 
-void LLPanelGeneral::clickShowStartLocation(LLUICtrl*, void* user_data)
-{
-        LLPanelLogin::refreshLocation( false ); // in case LLPanelLogin is visible
-}
-
-// static
-void LLPanelGeneral::onClickResetUISize(void* user_data)
+void LLPanelGeneral::cancel()
 {
-        gSavedSettings.setF32("UIScaleFactor", 1.0f);
-        gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
 }
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 00dc874..6fd10ff 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,47 +35,16 @@
 
 #include "llpanel.h"
 
-class LLCheckBoxCtrl;
-class LLRadioGroup;
-class LLColorSwatchCtrl;
-class LLSpinCtrl;
-class LLTextBox;
-class LLComboBox;
-
 class LLPanelGeneral : public LLPanel
 {
 public:
         LLPanelGeneral();
-        virtual ~LLPanelGeneral();
+        /*virtual*/ ~LLPanelGeneral();
+
+        BOOL postBuild();
 
-        virtual BOOL postBuild();
-        void refresh();
         void apply();
         void cancel();
-
-        static void clickShowStartLocation(LLUICtrl*, void* user_data);
-        static void set_start_location(LLUICtrl* ctrl, void* data);
-        static void set_specific_start_location(LLLineEditor* line_editor, void* data);
-        static void onClickResetUISize(void*);
-
-protected:
-        S32 mRenderName;
-        BOOL mRenderNameHideSelf;
-        BOOL mSmallAvatarNames;
-        BOOL mRenderHideGroupTitle;
-        BOOL mChatOnlineNotification;
-        BOOL mShowSearch;
-        F32 mAFKTimeout;
-        BOOL mNotifyMoney;
-        BOOL mUseDefaultColor;
-        LLColor4 mEffectColor;
-        F32 mUIScaleFactor;
-        BOOL mUIAutoScale;
-        BOOL mMiniMapRotate;
-        BOOL mMiniMapTeleport;
-        S32 mOldCrashBehavior;
-        std::string mLoginLocation;
-        std::string mLanguage;
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index 9ced1bb..beccb2d 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroup.h b/linden/indra/newview/llpanelgroup.h
index 90ce8fc..57b7d46 100644
--- a/linden/indra/newview/llpanelgroup.h
+++ b/linden/indra/newview/llpanelgroup.h
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 166cc04..86cce51 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index 407057c..f06a46e 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp
index 17312ef..26d39d7 100644
--- a/linden/indra/newview/llpanelgroupinvite.cpp
+++ b/linden/indra/newview/llpanelgroupinvite.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupinvite.h b/linden/indra/newview/llpanelgroupinvite.h
index 497f97a..48833ff 100644
--- a/linden/indra/newview/llpanelgroupinvite.h
+++ b/linden/indra/newview/llpanelgroupinvite.h
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index b8c9e69..51bdbdc 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -705,12 +705,13 @@ BOOL LLPanelGroupLandMoney::postBuild()
         textp = getChild<LLTextEditor>("group_money_planning_text", true);
         panelp = getChild<LLPanel>("group_money_planning_tab", true);
 
-        if ( !can_view )
+        if ( 1 ) //!can_view
         {
                 textp->setText(mImplementationp->mCantViewAccountsText);
         }
         else
         {
+                //Temporally disabled for DEV-11287.
                 mImplementationp->mMoneyPlanningTabEHp = 
                         new LLGroupMoneyPlanningTabEventHandler(textp,
                                                                                                         tabcp,
diff --git a/linden/indra/newview/llpanelgrouplandmoney.h b/linden/indra/newview/llpanelgrouplandmoney.h
index 3a4236c..4fc5204 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.h
+++ b/linden/indra/newview/llpanelgrouplandmoney.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 30a9c5b..3eab2c3 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupnotices.h b/linden/indra/newview/llpanelgroupnotices.h
index 8064c6a..a00ef12 100644
--- a/linden/indra/newview/llpanelgroupnotices.h
+++ b/linden/indra/newview/llpanelgroupnotices.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index e956dff..f63c975 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgrouproles.h b/linden/indra/newview/llpanelgrouproles.h
index d510260..818a719 100644
--- a/linden/indra/newview/llpanelgrouproles.h
+++ b/linden/indra/newview/llpanelgrouproles.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupvoting.cpp b/linden/indra/newview/llpanelgroupvoting.cpp
index b1e3e15..41650ad 100644
--- a/linden/indra/newview/llpanelgroupvoting.cpp
+++ b/linden/indra/newview/llpanelgroupvoting.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelgroupvoting.h b/linden/indra/newview/llpanelgroupvoting.h
index c7721d7..2f65a20 100644
--- a/linden/indra/newview/llpanelgroupvoting.h
+++ b/linden/indra/newview/llpanelgroupvoting.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 7034b1c..7ab261b 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,46 +30,10 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llpanelinput.h"
-
-// linden library includes
-#include "llerror.h"
-#include "llrect.h"
-#include "llfontgl.h"
-#include "message.h"
 #include "lluictrlfactory.h"
-
-// project includes
-#include "llviewerwindow.h"
-#include "llcheckboxctrl.h"
-#include "llfloaterjoystick.h"
-#include "llradiogroup.h"
-#include "llresmgr.h"
-#include "llspinctrl.h"
-#include "llslider.h"
-#include "llsliderctrl.h"
-#include "lltextbox.h"
-#include "llui.h"
-#include "llappviewer.h"
 #include "llviewercontrol.h"
-
-//Ventrella
-#include "llagent.h"
-//end Ventrella
-
-
-//
-// Imported globals
-//
-
-//
-// Globals
-//
-
-//
-// Static functions
-//
+#include "llfloaterjoystick.h"
 
 
 LLPanelInput::LLPanelInput() 
@@ -79,50 +43,41 @@ LLPanelInput::LLPanelInput()
 
 BOOL LLPanelInput::postBuild()
 {
-        childSetAction("joystic_setup_button", onClickJoystickSetup, (void*)this);
-        
-        refresh();
+        childSetAction("joystick_setup_button", onClickJoystickSetup, (void*)this);
+
+        childSetValue("mouse_sensitivity", gSavedSettings.getF32("MouseSensitivity"));
+        childSetValue("automatic_fly", gSavedSettings.getBOOL("AutomaticFly"));
+        childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
+        childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
+        childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
+        childSetValue("dynamic_camera_strength", gSavedSettings.getF32("DynamicCameraStrength"));
+        childSetValue("zoom_time", gSavedSettings.getF32("ZoomTime"));
+        childSetValue("camera_position_smoothing", gSavedSettings.getF32("CameraPositionSmoothing"));
+        childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
 
         return TRUE;
 }
 
-
 LLPanelInput::~LLPanelInput()
 {
         // Children all cleaned up by default view destructor.
 }
 
-void LLPanelInput::refresh()
-{
-        LLPanel::refresh();
-
-        mMouseSensitivityVal = gSavedSettings.getF32("MouseSensitivity");
-        mAutomaticFly =gSavedSettings.getBOOL("AutomaticFly");
-        mInvertMouse = gSavedSettings.getBOOL("InvertMouse");
-        mEditCameraMovement = gSavedSettings.getBOOL("EditCameraMovement");
-        mAppearanceCameraMovement = gSavedSettings.getBOOL("AppearanceCameraMovement");
-        mDynamicCameraStrengthVal = gSavedSettings.getF32("DynamicCameraStrength");
-        mNumpadControlVal = gSavedSettings.getS32("NumpadControl");
-        
-        // First Person Visibility
-        mFirstPersonAvatarVisible = gSavedSettings.getBOOL("FirstPersonAvatarVisible");
-}
-
 void LLPanelInput::apply()
 {
-
+        gSavedSettings.setF32("MouseSensitivity", childGetValue("mouse_sensitivity").asReal());
+        gSavedSettings.setBOOL("AutomaticFly", childGetValue("automatic_fly"));
+        gSavedSettings.setBOOL("InvertMouse", childGetValue("invert_mouse"));
+        gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
+        gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
+        gSavedSettings.setF32("DynamicCameraStrength", childGetValue("dynamic_camera_strength").asReal());
+        gSavedSettings.setF32("ZoomTime", childGetValue("zoom_time").asReal());
+        gSavedSettings.setF32("CameraPositionSmoothing", childGetValue("camera_position_smoothing").asReal());
+        gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
 }
 
 void LLPanelInput::cancel()
 {
-        gSavedSettings.setF32("MouseSensitivity", mMouseSensitivityVal);
-        gSavedSettings.setBOOL("AutomaticFly", mAutomaticFly);
-        gSavedSettings.setBOOL("InvertMouse", mInvertMouse);
-        gSavedSettings.setBOOL("EditCameraMovement", mEditCameraMovement);
-        gSavedSettings.setBOOL("AppearanceCameraMovement", mAppearanceCameraMovement);
-        gSavedSettings.setF32("DynamicCameraStrength", mDynamicCameraStrengthVal);
-        gSavedSettings.setS32("NumpadControl", mNumpadControlVal);
-        gSavedSettings.setBOOL("FirstPersonAvatarVisible", mFirstPersonAvatarVisible);
 }
 
 //static
diff --git a/linden/indra/newview/llpanelinput.h b/linden/indra/newview/llpanelinput.h
index e73e0ed..5d84203 100644
--- a/linden/indra/newview/llpanelinput.h
+++ b/linden/indra/newview/llpanelinput.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,11 +34,6 @@
 
 #include "llpanel.h"
 
-class LLCheckBoxCtrl;
-class LLSlider;
-class LLSliderCtrl;
-class LLSpinCtrl;
-
 class LLPanelInput : public LLPanel
 {
 public:
@@ -46,23 +41,11 @@ public:
         virtual ~LLPanelInput();
 
         virtual BOOL postBuild();
-        virtual void refresh();
         void apply();
         void cancel();
 
 private:
         static void onClickJoystickSetup(void* user_data);
-
-protected:
-        F32 mMouseSensitivityVal;
-        BOOL mAutomaticFly;
-        BOOL mInvertMouse;
-        BOOL mEditCameraMovement;
-        BOOL mAppearanceCameraMovement;
-        BOOL mFirstPersonAvatarVisible;
-        F32 mDynamicCameraStrengthVal;
-        S32 mNumpadControlVal;
-
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 7277f05..c53395d 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelinventory.h b/linden/indra/newview/llpanelinventory.h
index d848300..8aa28e8 100644
--- a/linden/indra/newview/llpanelinventory.h
+++ b/linden/indra/newview/llpanelinventory.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 0b3ba52..b40450c 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelland.h b/linden/indra/newview/llpanelland.h
index c44cb9d..d2f51c0 100644
--- a/linden/indra/newview/llpanelland.h
+++ b/linden/indra/newview/llpanelland.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index e4cdfaf..d6787f8 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandmedia.h b/linden/indra/newview/llpanellandmedia.h
index 7320f56..0a67e57 100644
--- a/linden/indra/newview/llpanellandmedia.h
+++ b/linden/indra/newview/llpanellandmedia.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandobjects.cpp b/linden/indra/newview/llpanellandobjects.cpp
index db7273b..b61eab6 100644
--- a/linden/indra/newview/llpanellandobjects.cpp
+++ b/linden/indra/newview/llpanellandobjects.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandobjects.h b/linden/indra/newview/llpanellandobjects.h
index 68f5c17..90cd46c 100644
--- a/linden/indra/newview/llpanellandobjects.h
+++ b/linden/indra/newview/llpanellandobjects.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandoptions.cpp b/linden/indra/newview/llpanellandoptions.cpp
index bd88a21..eb1edbd 100644
--- a/linden/indra/newview/llpanellandoptions.cpp
+++ b/linden/indra/newview/llpanellandoptions.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellandoptions.h b/linden/indra/newview/llpanellandoptions.h
index 1c0d058..12983d1 100644
--- a/linden/indra/newview/llpanellandoptions.h
+++ b/linden/indra/newview/llpanellandoptions.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index aeb3b2d..4af0f1b 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,7 +63,6 @@
 #include "llviewernetwork.h"
 #include "llviewerwindow.h"                     // to link into child list
 #include "llnotify.h"
-#include "llappviewer.h"                                        // for gHideLinks
 #include "llurlsimstring.h"
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
@@ -259,6 +258,11 @@ namespace {
         boost::intrusive_ptr< LLIamHereLogin > gResponsePtr = 0;
 };
 
+void set_start_location(LLUICtrl* ctrl, void* data)
+{
+    LLURLSimString::setString(ctrl->getValue().asString());
+}
+
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
@@ -345,7 +349,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
                 combo->setCurrentByIndex( 0 );
         }
 
-        combo->setCommitCallback( &LLPanelGeneral::set_start_location );
+        combo->setCommitCallback( &set_start_location );
 
         LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
         server_choice_combo->setCommitCallback(onSelectServer);
@@ -852,11 +856,7 @@ void LLPanelLogin::loadLoginPage()
         }
 
         // Language
-        std::string language(gSavedSettings.getString("Language"));
-        if(language == "default")
-        {
-                language = gSavedSettings.getString("SystemLanguage");
-        }
+        std::string language = LLUI::getLanguage();
         oStr << first_query_delimiter<<"lang=" << language;
         
         // First Login?
@@ -1017,15 +1017,8 @@ void LLPanelLogin::onClickConnect(void *)
                 }
                 else
                 {
-                        if (gHideLinks)
-                        {
-                                gViewerWindow->alertXml("MustHaveAccountToLogInNoLinks");
-                        }
-                        else
-                        {
-                                gViewerWindow->alertXml("MustHaveAccountToLogIn",
-                                                                                LLPanelLogin::newAccountAlertCallback);
-                        }
+                        gViewerWindow->alertXml("MustHaveAccountToLogIn",
+                                                                        LLPanelLogin::newAccountAlertCallback);
                 }
         }
 }
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 78b0a22..a303e32 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelmorph.cpp b/linden/indra/newview/llpanelmorph.cpp
index a8da26d..7b1b5f1 100644
--- a/linden/indra/newview/llpanelmorph.cpp
+++ b/linden/indra/newview/llpanelmorph.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelmorph.h b/linden/indra/newview/llpanelmorph.h
index d868181..99934ab 100644
--- a/linden/indra/newview/llpanelmorph.h
+++ b/linden/indra/newview/llpanelmorph.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index cc3579e..065bbdd 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -39,17 +39,6 @@
 #include "lluictrlfactory.h"
 #include "llfirstuse.h"
 
-class LLPopupData
-{
-public:
-        LLPopupData() : mShowNewInventory(FALSE), mAutoAcceptNewInventory(FALSE) { }
-
-        BOOL mShowNewInventory;
-        BOOL mAutoAcceptNewInventory;
-};
-
-LLPopupData sPopupData;
-
 //-----------------------------------------------------------------------------
 LLPanelMsgs::LLPanelMsgs() : 
         LLPanel(std::string("Messages Panel")),
@@ -75,8 +64,9 @@ BOOL LLPanelMsgs::postBuild()
         childSetAction("skip_dialogs_btn", onClickSkipDialogs, this);
         buildLists();
 
-        sPopupData.mAutoAcceptNewInventory = gSavedSettings.getBOOL("AutoAcceptNewInventory");
-        sPopupData.mShowNewInventory = gSavedSettings.getBOOL("ShowNewInventory");
+        childSetValue("accept_new_inventory", gSavedSettings.getBOOL("AutoAcceptNewInventory"));
+        childSetValue("show_new_inventory", gSavedSettings.getBOOL("ShowNewInventory"));
+        childSetValue("show_in_inventory", gSavedSettings.getBOOL("ShowInInventory"));
 
         return TRUE;
 }
@@ -159,13 +149,13 @@ void LLPanelMsgs::draw()
 
 void LLPanelMsgs::apply()
 {
+        gSavedSettings.setBOOL("AutoAcceptNewInventory", childGetValue("accept_new_inventory"));
+        gSavedSettings.setBOOL("ShowNewInventory", childGetValue("show_new_inventory"));
+        gSavedSettings.setBOOL("ShowInInventory", childGetValue("show_in_inventory"));
 }
 
-
 void LLPanelMsgs::cancel()
 {
-        gSavedSettings.setBOOL("ShowNewInventory", sPopupData.mShowNewInventory);
-        gSavedSettings.setBOOL("AutoAcceptNewInventory", sPopupData.mAutoAcceptNewInventory);
 }
 
 void LLPanelMsgs::resetAllIgnored()
diff --git a/linden/indra/newview/llpanelmsgs.h b/linden/indra/newview/llpanelmsgs.h
index c9f9ce1..ac86c59 100644
--- a/linden/indra/newview/llpanelmsgs.h
+++ b/linden/indra/newview/llpanelmsgs.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index e324c3b..6ba8906 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -31,29 +31,14 @@
 
 #include "llviewerprecompiledheaders.h"
 
-// file include
+//file include
 #include "llpanelnetwork.h"
 
-// linden library includes
-#include "llerror.h"
-#include "llrect.h"
-#include "llstring.h"
-
 // project includes
-#include "llbutton.h"
+#include "llcheckboxctrl.h"
 #include "lldirpicker.h"
-#include "llui.h"
 #include "lluictrlfactory.h"
-#include "llresmgr.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "llcheckboxctrl.h"
-#include "lltextbox.h"
-#include "llviewerregion.h"
-#include "llviewerthrottle.h"
-#include "llworld.h"
 #include "llviewercontrol.h"
-#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
 LLPanelNetwork::LLPanelNetwork()
@@ -70,12 +55,13 @@ BOOL LLPanelNetwork::postBuild()
         childSetAction("set_cache", onClickSetCache, this);
         childSetAction("reset_cache", onClickResetCache, this);
         
-        childSetEnabled("connection_port", 
-                        gSavedSettings.getBOOL("ConnectionPortEnabled"));
+        childSetEnabled("connection_port", gSavedSettings.getBOOL("ConnectionPortEnabled"));
         childSetCommitCallback("connection_port_enabled", onCommitPort, this);
 
-
-        refresh();
+        childSetValue("cache_size", (F32)gSavedSettings.getU32("CacheSize"));
+        childSetValue("max_bandwidth", gSavedSettings.getF32("ThrottleBandwidthKBPS"));
+        childSetValue("connection_port_enabled", gSavedSettings.getBOOL("ConnectionPortEnabled"));
+        childSetValue("connection_port", (F32)gSavedSettings.getU32("ConnectionPort"));
 
         return TRUE;
 }
@@ -88,24 +74,14 @@ LLPanelNetwork::~LLPanelNetwork()
 
 void LLPanelNetwork::apply()
 {
-}
-
-void LLPanelNetwork::refresh()
-{
-        LLPanel::refresh();
-
-        mCacheSetting = gSavedSettings.getU32("CacheSize");
-        mBandwidthBPS = gSavedSettings.getF32("ThrottleBandwidthKBPS")*1024;
-        mConnectionPortEnabled = gSavedSettings.getBOOL("ConnectionPortEnabled");
-        mConnectionPort = gSavedSettings.getU32("ConnectionPort");
+        gSavedSettings.setU32("CacheSize", childGetValue("cache_size").asInteger());
+        gSavedSettings.setF32("ThrottleBandwidthKBPS", childGetValue("max_bandwidth").asReal());
+        gSavedSettings.setBOOL("ConnectionPortEnabled", childGetValue("connection_port_enabled"));
+        gSavedSettings.setU32("ConnectionPort", childGetValue("connection_port").asInteger());
 }
 
 void LLPanelNetwork::cancel()
 {
-        gSavedSettings.setU32("CacheSize", mCacheSetting);
-        gSavedSettings.setF32("ThrottleBandwidthKBPS", mBandwidthBPS/1024);
-        gSavedSettings.setBOOL("ConnectionPortEnabled", mConnectionPortEnabled);
-        gSavedSettings.setU32("ConnectionPort", mConnectionPort);
 }
 
 // static
diff --git a/linden/indra/newview/llpanelnetwork.h b/linden/indra/newview/llpanelnetwork.h
index 9848461..1c9eb4f 100644
--- a/linden/indra/newview/llpanelnetwork.h
+++ b/linden/indra/newview/llpanelnetwork.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,37 +33,23 @@
 #define LL_LLPANELNETWORK_H
 
 #include "llpanel.h"
-#include "llviewerthrottle.h"
-
-class LLSliderCtrl;
-class LLCheckBoxCtrl;
-class LLLineEditor;
-class LLTextBox;
-class LLRadioGroup;
-class LLButton;
 
 class LLPanelNetwork : public LLPanel
 {
 public:
         LLPanelNetwork();
-        virtual ~LLPanelNetwork();
+        ~LLPanelNetwork();
+
+        BOOL postBuild();
 
-        virtual BOOL postBuild();
-        virtual void refresh();
-        virtual void apply();   // Apply the changed values.
-        virtual void cancel();  // Cancel the changed values.
+        void apply();
+        void cancel();
 
 private:
         static void onClickClearCache(void*);
         static void onClickSetCache(void*);
         static void onClickResetCache(void*);
         static void onCommitPort(LLUICtrl* ctrl, void*);
-
-private:
-        U32 mCacheSetting;
-        F32 mBandwidthBPS;
-        BOOL mConnectionPortEnabled;
-        U32 mConnectionPort;
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 584ecb8..5c70590 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -373,6 +373,18 @@ void LLPanelObject::getState( )
         BOOL enable_rotate      = objectp->permMove() && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
         childSetEnabled("build_math_constants",true);
+
+        S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+        BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
+                                                 && (selected_count == 1);
+
+        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 1)
+        {
+                enable_move = FALSE;
+                enable_scale = FALSE;
+                enable_rotate = FALSE;
+        }
+
         LLVector3 vec;
         if (enable_move)
         {
@@ -464,9 +476,6 @@ void LLPanelObject::getState( )
         // BUG? Check for all objects being editable?
         S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
         BOOL editable = root_objectp->permModify();
-        S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-        BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
-                                                 && (selected_count == 1);
 
         // Select Single Message
         childSetVisible("select_single", FALSE);
diff --git a/linden/indra/newview/llpanelobject.h b/linden/indra/newview/llpanelobject.h
index b72289c..d3bb7b3 100644
--- a/linden/indra/newview/llpanelobject.h
+++ b/linden/indra/newview/llpanelobject.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 4867980..c430922 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelpermissions.h b/linden/indra/newview/llpanelpermissions.h
index 283cbc1..3b73254 100644
--- a/linden/indra/newview/llpanelpermissions.h
+++ b/linden/indra/newview/llpanelpermissions.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 8c2b175..480f703 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelpick.h b/linden/indra/newview/llpanelpick.h
index 57483dc..b7a02ae 100644
--- a/linden/indra/newview/llpanelpick.h
+++ b/linden/indra/newview/llpanelpick.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index d8813b3..78477d7 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelplace.h b/linden/indra/newview/llpanelplace.h
index df53013..64fc877 100644
--- a/linden/indra/newview/llpanelplace.h
+++ b/linden/indra/newview/llpanelplace.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelskins.cpp b/linden/indra/newview/llpanelskins.cpp
index 56c0694..db6ad13 100644
--- a/linden/indra/newview/llpanelskins.cpp
+++ b/linden/indra/newview/llpanelskins.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelskins.h b/linden/indra/newview/llpanelskins.h
index 88d5da2..d629474 100644
--- a/linden/indra/newview/llpanelskins.h
+++ b/linden/indra/newview/llpanelskins.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 43c80f1..038ba99 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelvolume.h b/linden/indra/newview/llpanelvolume.h
index 637894c..6259d1b 100644
--- a/linden/indra/newview/llpanelvolume.h
+++ b/linden/indra/newview/llpanelvolume.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index 13ed9bf..85ddc71 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,22 +34,12 @@
 // file include
 #include "llpanelweb.h"
 
-// linden library includes
-#include "llerror.h"
-#include "llrect.h"
-#include "llstring.h"
-
 // project includes
-#include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "lllineeditor.h"
-#include "llui.h"
+#include "llmediamanager.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
-#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
-#include "llmediamanager.h"
-
 
 // helper functions for getting/freeing the web browser media
 // if creating/destroying these is too slow, we'll need to create
@@ -97,23 +87,21 @@ LLPanelWeb::LLPanelWeb()
 
 BOOL LLPanelWeb::postBuild()
 {
-        childSetAction( "clear_cache", onClickClearCache, this );
-        childSetAction( "clear_cookies", onClickClearCookies, this );
-        childSetCommitCallback("use_external_browser", onSelectBrowser, this );
-//      childSetEnabled( "connection_port", gSavedSettings.getBOOL( "CookiesEnabled" ) );
-        childSetCommitCallback( "cookies_enabled", onCommitCookies, this );
-        childSetCommitCallback( "web_proxy_editor", onCommitWebProxyAddress, this);
-        childSetCommitCallback( "web_proxy_port", onCommitWebProxyPort, this);
-        
-        childSetEnabled("web_proxy_editor", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("web_proxy_port", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("proxy_text_label", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetAction("clear_cache", onClickClearCache, this);
         childSetCommitCallback("web_proxy_enabled", onCommitWebProxyEnabled, this);
 
-        refresh();
+        std::string value = gSavedSettings.getBOOL("UseExternalBrowser") ? "external" : "internal";
+        childSetValue("use_external_browser", value);
+
+        childSetValue("cookies_enabled", gSavedSettings.getBOOL("CookiesEnabled"));
+
+        childSetValue("web_proxy_enabled", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetValue("web_proxy_editor", gSavedSettings.getString("BrowserProxyAddress"));
+        childSetValue("web_proxy_port", gSavedSettings.getS32("BrowserProxyPort"));
+
+        childSetEnabled("proxy_text_label", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_editor", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_port", gSavedSettings.getBOOL("BrowserProxyEnabled"));
 
         return TRUE;
 }
@@ -127,50 +115,29 @@ LLPanelWeb::~LLPanelWeb()
 
 void LLPanelWeb::apply()
 {
-}
-
-void LLPanelWeb::refresh()
-{
-        LLPanel::refresh();
+        gSavedSettings.setBOOL("CookiesEnabled", childGetValue("cookies_enabled"));
+        gSavedSettings.setBOOL("BrowserProxyEnabled", childGetValue("web_proxy_enabled"));
+        gSavedSettings.setString("BrowserProxyAddress", childGetValue("web_proxy_editor"));
+        gSavedSettings.setS32("BrowserProxyPort", childGetValue("web_proxy_port"));
 
-        mCookiesEnabled = gSavedSettings.getBOOL("CookiesEnabled");
-        mWebProxyEnabled = gSavedSettings.getBOOL("BrowserProxyEnabled");
-        mWebProxyAddress = gSavedSettings.getString("BrowserProxyAddress");
-        mWebProxyPort =  gSavedSettings.getS32("BrowserProxyPort");
+        bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
+        gSavedSettings.setBOOL("UseExternalBrowser", value);
         
-        LLLineEditor* web_proxy_editor = getChild<LLLineEditor>("web_proxy_editor");
-        if (web_proxy_editor)
-        {
-                web_proxy_editor->setText( gSavedSettings.getString("BrowserProxyAddress") );
-        }
-        mExternalBrowser = gSavedSettings.getBOOL("UseExternalBrowser");
-
-        childSetValue("use_external_browser", mExternalBrowser ? "external" : "internal");
-
         LLMediaBase *media_source = get_web_media();
         if (media_source)
-                media_source->enableCookies(mCookiesEnabled);
-        free_web_media(media_source);
+        {
+                media_source->enableCookies(childGetValue("cookies_enabled"));
 
+                bool proxy_enable = childGetValue("web_proxy_enabled");
+                std::string proxy_address = childGetValue("web_proxy_editor");
+                int proxy_port = childGetValue("web_proxy_port");
+                media_source->enableProxy(proxy_enable, proxy_address, proxy_port);
+        }
+        free_web_media(media_source);
 }
 
 void LLPanelWeb::cancel()
 {
-        
-        gSavedSettings.setBOOL( "CookiesEnabled", mCookiesEnabled );
-        gSavedSettings.setBOOL( "BrowserProxyEnabled", mWebProxyEnabled );
-        gSavedSettings.setString( "BrowserProxyAddress", mWebProxyAddress );
-        gSavedSettings.setS32( "BrowserProxyPort", mWebProxyPort );
-
-        gSavedSettings.setBOOL("UseExternalBrowser", mExternalBrowser);
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableCookies(mCookiesEnabled);
-                media_source->enableProxy( mWebProxyEnabled, mWebProxyAddress, mWebProxyPort );
-        }
-        free_web_media(media_source);
-
 }
 
 // static
@@ -192,94 +159,15 @@ void LLPanelWeb::callback_clear_browser_cache(S32 option, void* userdata)
 }
 
 // static
-void LLPanelWeb::onClickClearCookies(void*)
-{
-        gViewerWindow->alertXml("ConfirmClearCookies", callback_clear_cookies, 0);
-}
-
-//static
-void LLPanelWeb::callback_clear_cookies(S32 option, void* userdata)
-{
-        if ( option == 0 ) // YES
-        {
-                LLMediaBase *media_source = get_web_media();
-                if (media_source)
-                        media_source->clearCookies();
-                free_web_media(media_source);
-        }
-}
-
-// static
-void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
-{
-  LLPanelWeb* self = (LLPanelWeb*)data;
-  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
-
-  if (!self || !check) return;
-
-  LLMediaBase *media_source = get_web_media();
-  if (media_source)
-          media_source->enableCookies(check->get());
-  free_web_media(media_source);
-}
-// static
 void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
 {
         LLPanelWeb* self = (LLPanelWeb*)data;
         LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
 
         if (!self || !check) return;
-        self->childSetEnabled("web_proxy_editor", 
-                                check->get());
-        self->childSetEnabled("web_proxy_port", 
-                                check->get());
-        self->childSetEnabled("proxy_text_label", 
-                                check->get());
-                
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                        gSavedSettings.getString("BrowserProxyAddress"), 
-                        gSavedSettings.getS32("BrowserProxyPort") );
-        }
-        free_web_media(media_source);
-
-}
-
-void LLPanelWeb::onCommitWebProxyAddress(LLUICtrl *ctrl, void *userdata)
-{
-  LLLineEditor* web_proxy = (LLLineEditor*)ctrl;
-
-  if (web_proxy)
-  {
-          gSavedSettings.setString("BrowserProxyAddress", web_proxy->getText());
-  }     
-  LLMediaBase *media_source = get_web_media();
-  if (media_source)
-  {
-          media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                  gSavedSettings.getString("BrowserProxyAddress"), 
-                  gSavedSettings.getS32("BrowserProxyPort") );
-  }
-  free_web_media(media_source);
-}
+        self->childSetEnabled("web_proxy_editor", check->get());
+        self->childSetEnabled("web_proxy_port", check->get());
+        self->childSetEnabled("proxy_text_label", check->get());
 
-void LLPanelWeb::onCommitWebProxyPort(LLUICtrl *ctrl, void *userdata)
-{
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                        gSavedSettings.getString("BrowserProxyAddress"), 
-                        gSavedSettings.getS32("BrowserProxyPort") );
-        }
-        free_web_media(media_source);
-}
 
-// static 
-void LLPanelWeb::onSelectBrowser(LLUICtrl* ctrl, void* data)
-{
-        // "external" or "internal"
-        gSavedSettings.setBOOL("UseExternalBrowser", ctrl->getValue().asString() == "external");
 }
diff --git a/linden/indra/newview/llpanelweb.h b/linden/indra/newview/llpanelweb.h
index 34d7b3d..9d58e0a 100644
--- a/linden/indra/newview/llpanelweb.h
+++ b/linden/indra/newview/llpanelweb.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,39 +33,22 @@
 #define LL_LLPANELWEB_H
 
 #include "llpanel.h"
-#include "llviewerthrottle.h"
-
-class LLCheckBoxCtrl;
-class LLButton;
 
 class LLPanelWeb : public LLPanel
 {
 public:
         LLPanelWeb();
-        virtual ~LLPanelWeb();
+        ~LLPanelWeb();
+
+        BOOL postBuild();
 
-        virtual BOOL postBuild();
-        virtual void refresh();
-        virtual void apply();   // Apply the changed values.
-        virtual void cancel();  // Cancel the changed values.
+        void apply();
+        void cancel();
 
 private:
-        static void onClickClearCache(void*);
-        static void onClickClearCookies(void*);
+        static void onClickClearCache(void* data);
         static void callback_clear_browser_cache(S32 option, void* userdata);
-        static void callback_clear_cookies(S32 option, void* userdata);
-        static void onCommitCookies(LLUICtrl* ctrl, void* data);
         static void onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data);
-        static void onCommitWebProxyAddress(LLUICtrl *ctrl, void *userdata);
-        static void onCommitWebProxyPort(LLUICtrl *ctrl, void *userdata);
-        static void onSelectBrowser(LLUICtrl* ctrl, void* data);
-
-private:
-        BOOL mCookiesEnabled;
-        BOOL mWebProxyEnabled;
-        std::string mWebProxyAddress;
-        S32 mWebProxyPort;
-        BOOL mExternalBrowser;
 };
 
 #endif
diff --git a/linden/indra/newview/llparcelselection.cpp b/linden/indra/newview/llparcelselection.cpp
index cec2c48..38505a2 100644
--- a/linden/indra/newview/llparcelselection.cpp
+++ b/linden/indra/newview/llparcelselection.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llparcelselection.h b/linden/indra/newview/llparcelselection.h
index 1a41bcf..c0312ce 100644
--- a/linden/indra/newview/llparcelselection.h
+++ b/linden/indra/newview/llparcelselection.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpatchvertexarray.cpp b/linden/indra/newview/llpatchvertexarray.cpp
index 60e6391..74861ac 100644
--- a/linden/indra/newview/llpatchvertexarray.cpp
+++ b/linden/indra/newview/llpatchvertexarray.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpatchvertexarray.h b/linden/indra/newview/llpatchvertexarray.h
index 2f2057f..a4fe5f2 100644
--- a/linden/indra/newview/llpatchvertexarray.h
+++ b/linden/indra/newview/llpatchvertexarray.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index 0a1e2ce..ac53834 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpolymesh.h b/linden/indra/newview/llpolymesh.h
index 7f4f087..e7c387b 100644
--- a/linden/indra/newview/llpolymesh.h
+++ b/linden/indra/newview/llpolymesh.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -150,7 +150,7 @@ public:
 class LLJointRenderData
 {
 public:
-        LLJointRenderData(const LLMatrix4* world_matrix, LLSkinJoint* skin_joint) : mWorldMatrix(world_matrix), mSkinJoint(skin_joint){}
+        LLJointRenderData(const LLMatrix4* world_matrix, LLSkinJoint* skin_joint) : mWorldMatrix(world_matrix), mSkinJoint(skin_joint) {}
         ~LLJointRenderData(){}
 
         const LLMatrix4*                mWorldMatrix;
diff --git a/linden/indra/newview/llpolymorph.cpp b/linden/indra/newview/llpolymorph.cpp
index 34a9b71..e88d757 100644
--- a/linden/indra/newview/llpolymorph.cpp
+++ b/linden/indra/newview/llpolymorph.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpolymorph.h b/linden/indra/newview/llpolymorph.h
index aea30e6..008fdc2 100644
--- a/linden/indra/newview/llpolymorph.h
+++ b/linden/indra/newview/llpolymorph.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index e045e61..4453751 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -36,6 +36,8 @@
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
+#include "llcolorswatch.h"
+#include "llradiogroup.h"
 #include "llstylemap.h"
 
 class LLPrefsChatImpl : public LLPanel
@@ -43,8 +45,6 @@ class LLPrefsChatImpl : public LLPanel
 public:
         LLPrefsChatImpl();
         /*virtual*/ ~LLPrefsChatImpl(){};
-        
-        virtual void refresh();
 
         void apply();
         void cancel();
@@ -79,12 +79,30 @@ LLPrefsChatImpl::LLPrefsChatImpl()
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_chat.xml");
 
-        refresh();
-}
+        getChild<LLRadioGroup>("chat_font_size")->setSelectedIndex(gSavedSettings.getS32("ChatFontSize"));
+        childSetValue("fade_chat_time", gSavedSettings.getF32("ChatPersistTime"));
+        childSetValue("max_chat_count", gSavedSettings.getS32("ConsoleMaxLines"));
+
+        getChild<LLColorSwatchCtrl>("system")->set(gSavedSettings.getColor4("SystemChatColor"));
+        getChild<LLColorSwatchCtrl>("user")->set(gSavedSettings.getColor4("UserChatColor"));
+        getChild<LLColorSwatchCtrl>("agent")->set(gSavedSettings.getColor4("AgentChatColor"));
+        getChild<LLColorSwatchCtrl>("im")->set(gSavedSettings.getColor4("IMChatColor"));
+        getChild<LLColorSwatchCtrl>("script_error")->set(gSavedSettings.getColor4("ScriptErrorColor"));
+        getChild<LLColorSwatchCtrl>("objects")->set(gSavedSettings.getColor4("ObjectChatColor"));
+        getChild<LLColorSwatchCtrl>("owner")->set(gSavedSettings.getColor4("llOwnerSayChatColor"));
+        getChild<LLColorSwatchCtrl>("background")->set(gSavedSettings.getColor4("BackgroundChatColor"));
+        getChild<LLColorSwatchCtrl>("links")->set(gSavedSettings.getColor4("HTMLLinkColor"));
+
+        childSetValue("arrow_keys_move_avatar_check", gSavedSettings.getBOOL("ArrowKeysMoveAvatar"));
+        childSetValue("show_timestamps_check", gSavedSettings.getBOOL("ChatShowTimestamps"));
+        childSetValue("script_errors_as_chat", gSavedSettings.getBOOL("ScriptErrorsAsChat"));
  
-void LLPrefsChatImpl::refresh()
-{
-        LLPanel::refresh();
+        childSetValue("bubble_text_chat", gSavedSettings.getBOOL("UseChatBubbles"));
+        childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
+        childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn"));
+        childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
+        childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
+        childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
 
         //set values
         mChatSize = gSavedSettings.getS32("ChatFontSize");
@@ -137,7 +155,32 @@ void LLPrefsChatImpl::cancel()
 
 void LLPrefsChatImpl::apply()
 {
-                
+        gSavedSettings.setS32("ChatFontSize", getChild<LLRadioGroup>("chat_font_size")->getSelectedIndex());
+        gSavedSettings.setF32("ChatPersistTime", childGetValue("fade_chat_time").asReal());
+        gSavedSettings.setS32("ConsoleMaxLines", childGetValue("max_chat_count"));
+
+        gSavedSettings.setColor4("SystemChatColor", childGetValue("system"));
+        gSavedSettings.setColor4("UserChatColor", childGetValue("user"));
+        gSavedSettings.setColor4("AgentChatColor", childGetValue("agent"));
+        gSavedSettings.setColor4("IMChatColor", childGetValue("im"));
+        gSavedSettings.setColor4("ScriptErrorColor", childGetValue("script_error"));
+        gSavedSettings.setColor4("ObjectChatColor", childGetValue("objects"));
+        gSavedSettings.setColor4("llOwnerSayChatColor", childGetValue("owner"));
+        gSavedSettings.setColor4("BackgroundChatColor", childGetValue("background"));
+
+        gSavedSettings.setColor4("HTMLLinkColor", childGetValue("links"));
+        LLTextEditor::setLinkColor(childGetValue("links"));
+
+        gSavedSettings.setBOOL("ArrowKeysMoveAvatar", childGetValue("arrow_keys_move_avatar_check"));
+        gSavedSettings.setBOOL("ChatShowTimestamps", childGetValue("show_timestamps_check"));
+        gSavedSettings.setBOOL("ScriptErrorsAsChat", childGetValue("script_errors_as_chat"));
+        gSavedSettings.setBOOL("UseChatBubbles", childGetValue("bubble_text_chat"));
+        gSavedSettings.setBOOL("ChatFullWidth", childGetValue("chat_full_width_check"));
+        gSavedSettings.setBOOL("CloseChatOnReturn", childGetValue("close_chat_on_return_check"));
+        gSavedSettings.setBOOL("PlayTypingAnim", childGetValue("play_typing_animation"));
+
+        gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
+        gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 }
 
 //---------------------------------------------------------------------------
@@ -154,7 +197,6 @@ LLPrefsChat::~LLPrefsChat()
 void LLPrefsChat::apply()
 {
         impl.apply();
-        LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
         LLStyleMap::instance().update();
 }
 
diff --git a/linden/indra/newview/llprefschat.h b/linden/indra/newview/llprefschat.h
index 016c433..f090042 100644
--- a/linden/indra/newview/llprefschat.h
+++ b/linden/indra/newview/llprefschat.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 5333df8..1af6e86 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -55,73 +55,33 @@ public:
         /*virtual*/ BOOL postBuild();
 
         void apply();
-        void refresh();
         void cancel();
-        void setPersonalInfo(
-                const std::string& visibility,
-                bool im_via_email,
-                const std::string& email);
+        void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
         void enableHistory();
+
         static void onClickLogPath(void* user_data);
-        static void onCommitLogging( LLUICtrl* ctrl, void* user_data);
+        static void onCommitLogging(LLUICtrl* ctrl, void* user_data);
 
 protected:
-        BOOL mIMInChatHistory;
-        BOOL mLogInstantMessages;
-        BOOL mLogChat;
-        BOOL mLogShowHistory;
-        BOOL mShowTimestamps;
-        BOOL mIMLogTimestamp;
-        BOOL mLogChatTimestamp;
-        BOOL mLogIMChat;
-        BOOL mLogTimestampDate;
-
-        std::string mIMBusyResponse;
-        std::string mLogPath;
-
+ 
         bool mGotPersonalInfo;
         bool mOriginalIMViaEmail;
 
-        // online status info
         bool mOriginalHideOnlineStatus;
         std::string mDirectoryVisibility;
 };
 
 
 LLPrefsIMImpl::LLPrefsIMImpl()
-        : LLPanel(std::string("IM Prefs Panel"))
+        : LLPanel(std::string("IM Prefs Panel")),
+          mGotPersonalInfo(false),
+          mOriginalIMViaEmail(false)
 {
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
 }
 
-void LLPrefsIMImpl::refresh()
-{
-        mIMInChatHistory   = gSavedSettings.getBOOL("IMInChatHistory");
-        mShowTimestamps    = gSavedSettings.getBOOL("IMShowTimestamps");
-        mIMBusyResponse    = gSavedPerAccountSettings.getString("BusyModeResponse");
-        mLogPath           = gSavedPerAccountSettings.getString("InstantMessageLogPath");
-        mLogInstantMessages= gSavedPerAccountSettings.getBOOL("LogInstantMessages");
-        mLogChat           = gSavedPerAccountSettings.getBOOL("LogChat");
-        mLogShowHistory    = gSavedPerAccountSettings.getBOOL("LogShowHistory");
-        mIMLogTimestamp    = gSavedPerAccountSettings.getBOOL("IMLogTimestamp");
-        mLogChatTimestamp  = gSavedPerAccountSettings.getBOOL("LogChatTimestamp");
-        mLogIMChat         = gSavedPerAccountSettings.getBOOL("LogChatIM");
-        mLogTimestampDate  = gSavedPerAccountSettings.getBOOL("LogTimestampDate");
-}
-
 void LLPrefsIMImpl::cancel()
 {
-        gSavedSettings.setBOOL("IMInChatHistory", mIMInChatHistory);
-        gSavedSettings.setBOOL("IMShowTimestamps", mShowTimestamps);
-        gSavedPerAccountSettings.setString("BusyModeResponse", mIMBusyResponse);
-        gSavedPerAccountSettings.setString("InstantMessageLogPath",mLogPath);
-        gSavedPerAccountSettings.setBOOL("LogInstantMessages",mLogInstantMessages);
-        gSavedPerAccountSettings.setBOOL("LogChat",mLogChat);
-        gSavedPerAccountSettings.setBOOL("LogShowHistory",mLogShowHistory);
-        gSavedPerAccountSettings.setBOOL("IMLogTimestamp",mIMLogTimestamp);
-        gSavedPerAccountSettings.setBOOL("LogChatTimestamp",mLogChatTimestamp);
-        gSavedPerAccountSettings.setBOOL("LogChatIM",mLogIMChat);
-        gSavedPerAccountSettings.setBOOL("LogTimestampDate",mLogTimestampDate);
 }
 
 BOOL LLPrefsIMImpl::postBuild()
@@ -133,12 +93,13 @@ BOOL LLPrefsIMImpl::postBuild()
                 return FALSE;
         }
 
-        mGotPersonalInfo = false;
-        mOriginalIMViaEmail = false;
-        mOriginalHideOnlineStatus = true;
         childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
 
         // Don't enable this until we get personal data
+        childDisable("include_im_in_chat_history");
+        childDisable("show_timestamps_check");
+        childDisable("friends_online_notify_checkbox");
+        
         childDisable("online_visibility");
         childDisable("send_im_to_email");
         childDisable("log_instant_messages");
@@ -152,17 +113,20 @@ BOOL LLPrefsIMImpl::postBuild()
         childDisable("log_date_timestamp");
 
         childSetText("busy_response", getString("log_in_to_change"));
-        
-        refresh(); 
-
-        childSetText("log_path_string", mLogPath);
-        childSetValue("log_instant_messages", mLogInstantMessages); 
-        childSetValue("log_chat", mLogChat); 
-        childSetValue("log_show_history", mLogShowHistory);
-        childSetValue("log_instant_messages_timestamp", mIMLogTimestamp);
-        childSetValue("log_chat_timestamp", mLogChatTimestamp);
-        childSetValue("log_chat_IM", mLogIMChat);
-        childSetValue("log_date_timestamp",mLogTimestampDate);
+
+        childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
+        childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
+        childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
+
+        childSetText("log_path_string", gSavedPerAccountSettings.getString("InstantMessageLogPath"));
+        childSetValue("log_instant_messages", gSavedPerAccountSettings.getBOOL("LogInstantMessages")); 
+        childSetValue("log_chat", gSavedPerAccountSettings.getBOOL("LogChat")); 
+        childSetValue("log_show_history", gSavedPerAccountSettings.getBOOL("LogShowHistory"));
+        childSetValue("log_instant_messages_timestamp", gSavedPerAccountSettings.getBOOL("IMLogTimestamp"));
+        childSetValue("log_chat_timestamp", gSavedPerAccountSettings.getBOOL("LogChatTimestamp"));
+        childSetValue("log_chat_IM", gSavedPerAccountSettings.getBOOL("LogChatIM"));
+        childSetValue("log_date_timestamp", gSavedPerAccountSettings.getBOOL("LogTimestampDate"));
+
         childSetAction("log_path_button", onClickLogPath, this);
         childSetCommitCallback("log_chat",onCommitLogging,this);
         childSetCommitCallback("log_instant_messages",onCommitLogging,this);
@@ -199,6 +163,10 @@ void LLPrefsIMImpl::apply()
 
                 gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
+                gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
+                gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
+                gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
+                
                 gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
                 gSavedPerAccountSettings.setBOOL("LogInstantMessages",childGetValue("log_instant_messages").asBoolean());
                 gSavedPerAccountSettings.setBOOL("LogChat",childGetValue("log_chat").asBoolean());
@@ -245,14 +213,12 @@ void LLPrefsIMImpl::apply()
         }
 }
 
-void LLPrefsIMImpl::setPersonalInfo(
-        const std::string& visibility,
-        bool im_via_email,
-        const std::string& email)
+void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
         mGotPersonalInfo = true;
         mOriginalIMViaEmail = im_via_email;
         mDirectoryVisibility = visibility;
+        
         if(visibility == VISIBILITY_DEFAULT)
         {
                 mOriginalHideOnlineStatus = false;
@@ -267,6 +233,11 @@ void LLPrefsIMImpl::setPersonalInfo(
         {
                 mOriginalHideOnlineStatus = true;
         }
+
+        childEnable("include_im_in_chat_history");
+        childEnable("show_timestamps_check");
+        childEnable("friends_online_notify_checkbox");
+
         childSetValue("online_visibility", mOriginalHideOnlineStatus);   
         childSetLabelArg("online_visibility", "[DIR_VIS]", mDirectoryVisibility);
         childEnable("send_im_to_email");
@@ -308,7 +279,7 @@ void LLPrefsIMImpl::onClickLogPath(void* user_data)
         std::string proposed_name(self->childGetText("log_path_string"));        
         
         LLDirPicker& picker = LLDirPicker::instance();
-        if (! picker.getDir(&proposed_name ) )
+        if (!picker.getDir(&proposed_name ) )
         {
                 return; //Canceled!
         }
diff --git a/linden/indra/newview/llprefsim.h b/linden/indra/newview/llprefsim.h
index 839501f..1423832 100644
--- a/linden/indra/newview/llprefsim.h
+++ b/linden/indra/newview/llprefsim.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 6661f08..ae7c921 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,245 +35,175 @@
 #include "llprefsvoice.h"
 
 #include "llcheckboxctrl.h"
-#include "llcombobox.h"
-
+#include "llfloatervoicedevicesettings.h"
+#include "llfocusmgr.h"
+#include "llkeyboard.h"
+#include "llmodaldialog.h"
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
 
-#include "llmodaldialog.h"
-#include "llkeyboard.h"
-#include "llfocusmgr.h"
-#include "llfloatervoicedevicesettings.h"
-
-#include "llappviewer.h"
-
-#include "llvoiceclient.h"
 
-class LLVoiceHotkeySelectDialog : public LLModalDialog
+class LLVoiceSetKeyDialog : public LLModalDialog
 {
-private:
-        LLPrefsVoiceLogic       *mParent;
-        LLFloater                       *mOldFrontmost;
-
 public:
-        LLVoiceHotkeySelectDialog( LLPrefsVoiceLogic *parent )
-                : LLModalDialog( LLStringUtil::null, 240, 100 ),
-                  mParent( parent )
-        {
-                mOldFrontmost = gFloaterView->getFrontmost();
-
-                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_select_key.xml");
-                
-                childSetAction("Cancel", LLVoiceHotkeySelectDialog::onCancel, this );
-                childSetFocus("Cancel");
-        }
-
-        /*virtual*/ void setFocus( BOOL b )
-        {
-                LLFloater::setFocus(b);
-
-                // This forces keyboard processing to happen at the raw key level instead of going through handleUnicodeChar.
-                if (b)
-                {
-                        gFocusMgr.setKeystrokesOnly(TRUE);
-                }
-        }
-
-        static void onCancel( void* userdata );
+        LLVoiceSetKeyDialog(LLPrefsVoice* parent);
+        ~LLVoiceSetKeyDialog();
 
         BOOL handleKeyHere(KEY key, MASK mask);
 
+        static void onCancel(void* user_data);
+
+private:
+        LLPrefsVoice* mParent;
 };
 
-LLPrefsVoiceLogic::LLPrefsVoiceLogic(LLPanel* panelp) : 
-        mPanel(panelp)
+LLVoiceSetKeyDialog::LLVoiceSetKeyDialog(LLPrefsVoice* parent)
+        : LLModalDialog(LLStringUtil::null, 240, 100), mParent(parent)
 {
-        init();
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_select_key.xml");
+        childSetAction("Cancel", onCancel, this);
+        childSetFocus("Cancel");
+
+        gFocusMgr.setKeystrokesOnly(TRUE);
 }
- 
-void LLPrefsVoiceLogic::init()
-{
-        mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat");
 
-        mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly");
-        mModifier = gSavedSettings.getString("PushToTalkButton");
-        mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle");
-        mEarLocation = gSavedSettings.getS32("VoiceEarLocation");
+LLVoiceSetKeyDialog::~LLVoiceSetKeyDialog()
+{
+}
 
-        LLUICtrl* ear_location = mPanel->getChild<LLUICtrl>("ear_location");
-        mCtrlEarLocation = ear_location->getSelectionInterface();
-        if (mCtrlEarLocation)
+BOOL LLVoiceSetKeyDialog::handleKeyHere(KEY key, MASK mask)
+{
+        BOOL result = TRUE;
+        
+        if(key == 'Q' && mask == MASK_CONTROL)
         {
-                mCtrlEarLocation->selectByValue(LLSD(gSavedSettings.getS32("VoiceEarLocation")));
+                result = FALSE;
+        }
+        else
+        {
+                mParent->setKey(key);
         }
-        mPanel->childSetCommitCallback("ear_location", onEarLocationCommit, this );
-
-        mPanel->childSetAction("set_voice_hotkey_button", onClickSetKey, this);
-        mPanel->childSetAction("set_voice_middlemouse_button", onClickSetMiddleMouse, this);
 
-        refresh();
-        mEatNextSetKeyClick = FALSE;
+        close();
+        return result;
 }
 
-void LLPrefsVoiceLogic::refresh()
+//static
+void LLVoiceSetKeyDialog::onCancel(void* user_data)
 {
-    BOOL voiceDisabled = gSavedSettings.getBOOL("CmdLineDisableVoice");
-        mPanel->childSetVisible("voice_unavailable", voiceDisabled);
-        mPanel->childSetVisible("enable_voice_check", !voiceDisabled);
-        mPanel->childSetEnabled("enable_voice_check", !voiceDisabled);
-        
-        bool enable = !voiceDisabled && gSavedSettings.getBOOL("EnableVoiceChat");
-        
-        mPanel->childSetEnabled("friends_only_check", enable);
-        mPanel->childSetEnabled("push_to_talk_check", enable);
-        mPanel->childSetEnabled("push_to_talk_label", enable);
-        mPanel->childSetEnabled("voice_call_friends_only_check", enable);
-        mPanel->childSetEnabled("push_to_talk_toggle_check", enable);
-        mPanel->childSetEnabled("ear_location", enable);
-        mPanel->childSetEnabled("set_voice_hotkey_button", enable);
-        mPanel->childSetEnabled("set_voice_middlemouse_button", enable);
+        LLVoiceSetKeyDialog* self = (LLVoiceSetKeyDialog*)user_data;
+        self->close();
 }
 
-void LLPrefsVoiceLogic::cancel()
-{
-        gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice);
-        gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly);
-        gSavedSettings.setString("PushToTalkButton", mModifier);
-        gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle );
-        gSavedSettings.setS32("VoiceEarLocation", mEarLocation);
+//--------------------------------------------------------------------
+//LLPrefsVoice
+LLPrefsVoice::LLPrefsVoice()
+        :       LLPanel(std::string("Voice Chat Panel"))
+{ 
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml");
 }
 
-void LLPrefsVoiceLogic::apply()
+LLPrefsVoice::~LLPrefsVoice()
 {
 }
 
-//static 
-void LLPrefsVoiceLogic::onEarLocationCommit(LLUICtrl* ctrl, void* user_data)
+BOOL LLPrefsVoice::postBuild()
 {
-        LLCtrlSelectionInterface* interfacep = ctrl->getSelectionInterface();
-        if (interfacep)
-        {
-                gSavedSettings.setS32("VoiceEarLocation", interfacep->getSelectedValue().asInteger());
-        }
-}
+        childSetCommitCallback("enable_voice_check", onCommitEnableVoiceChat, this);
+        childSetAction("set_voice_hotkey_button", onClickSetKey, this);
+        childSetAction("set_voice_middlemouse_button", onClickSetMiddleMouse, this);
+        childSetAction("device_settings_btn", onClickVoiceDeviceSettings, NULL);
 
-// static
-void LLPrefsVoiceLogic::onClickSetKey(void* user_data)
-{
-        LLPrefsVoiceLogic* self=(LLPrefsVoiceLogic*)user_data;  
-        if(self->mEatNextSetKeyClick)
-        {
-                self->mEatNextSetKeyClick = false;
-        }
-        else
-        {
-                LLVoiceHotkeySelectDialog* dialog = new LLVoiceHotkeySelectDialog( self );
-                dialog->startModal();
-                // dialog will delete itself
-        }
-}
+        BOOL voice_disabled = gSavedSettings.getBOOL("CmdLineDisableVoice");
+        childSetVisible("voice_unavailable", voice_disabled);
+        childSetVisible("enable_voice_check", !voice_disabled);
+        childSetEnabled("enable_voice_check", !voice_disabled);
 
+        bool enable = !voice_disabled && gSavedSettings.getBOOL("EnableVoiceChat");
+        childSetValue("enable_voice_check", enable);
+        onCommitEnableVoiceChat(getChild<LLCheckBoxCtrl>("enable_voice_check"), this);
 
-// static
-void LLPrefsVoiceLogic::onClickSetMiddleMouse(void* user_data)
-{
-//      LLPrefsVoiceLogic* self=(LLPrefsVoiceLogic*)user_data;
-        
-        gSavedSettings.setString("PushToTalkButton", "MiddleMouse");
+        childSetValue("modifier_combo", gSavedSettings.getString("PushToTalkButton"));
+        childSetValue("voice_call_friends_only_check", gSavedSettings.getBOOL("VoiceCallsFriendsOnly"));
+        childSetValue("push_to_talk_toggle_check", gSavedSettings.getBOOL("PushToTalkToggle"));
+        childSetValue("ear_location", gSavedSettings.getS32("VoiceEarLocation"));
+
+        return TRUE;
 }
 
-void LLPrefsVoiceLogic::setKey(KEY key, MASK mask)
+void LLPrefsVoice::apply()
 {
-        std::string keystring = LLKeyboard::stringFromKey(key);
-        gSavedSettings.setString("PushToTalkButton", keystring);
+        gSavedSettings.setBOOL("EnableVoiceChat", childGetValue("enable_voice_check"));
+
+        gSavedSettings.setString("PushToTalkButton", childGetValue("modifier_combo"));
+        gSavedSettings.setBOOL("VoiceCallsFriendsOnly", childGetValue("voice_call_friends_only_check"));
+        gSavedSettings.setBOOL("PushToTalkToggle", childGetValue("push_to_talk_toggle_check"));
+        gSavedSettings.setS32("VoiceEarLocation", childGetValue("ear_location"));
         
-        if(key == ' ')
+        LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+        if(voice_device_settings)
         {
-                // This will cause the select dialog to immediately reopen.
-                // Eat the next click event.
-                mEatNextSetKeyClick = TRUE;
+                voice_device_settings->apply();
         }
 }
 
-void LLVoiceHotkeySelectDialog::onCancel( void* userdata )
-{
-        LLVoiceHotkeySelectDialog* self = (LLVoiceHotkeySelectDialog*) userdata;
-        self->close(); // destroys this object
-        self->mOldFrontmost->setFrontmost(TRUE);
-}
-
-BOOL LLVoiceHotkeySelectDialog::handleKeyHere(KEY key, MASK mask)
+void LLPrefsVoice::cancel()
 {
-        BOOL result = TRUE;
-        
-        // Suck up all keystokes except CTRL-Q.
-        BOOL is_quit = ('Q' == key) && (MASK_CONTROL == mask);
-        if(is_quit)
+        LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterVoiceDeviceSettings::getInstance();
+        if(voice_device_settings)
         {
-                result = FALSE;
-        }
-        else
-        {
-                mParent->setKey(key, mask);
+                voice_device_settings->cancel();
         }
-
-        close(); // destroys this object
-        mOldFrontmost->setFrontmost(TRUE);
-        
-        return result;
 }
 
-//---------------------------------------------------------------------------
-
-
-LLPrefsVoice::LLPrefsVoice()
-        :       LLPanel(std::string("Voice Chat Panel"))
-{ 
-        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml");
-        mLogic = new LLPrefsVoiceLogic(this);
-        childSetAction("device_settings_btn", onClickVoiceDeviceSettingsBtn, this);
-
-        // create floater immediately and keep it hidden
-        // since it stores preference state for audio devices
-        mVoiceDeviceSettings = LLFloaterVoiceDeviceSettings::getInstance();
-}
-
-LLPrefsVoice::~LLPrefsVoice()
+void LLPrefsVoice::setKey(KEY key)
 {
-        delete mLogic;
+        childSetValue("modifier_combo", LLKeyboard::stringFromKey(key));
 }
 
-void LLPrefsVoice::draw()
+//static
+void LLPrefsVoice::onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data)
 {
-        bool enable = !gSavedSettings.getBOOL("CmdLineDisableVoice")
-                  && gSavedSettings.getBOOL("EnableVoiceChat");
-        childSetEnabled("device_settings_btn", enable);
+        LLPrefsVoice* self = (LLPrefsVoice*)user_data;
+        LLCheckBoxCtrl* enable_voice_chat = (LLCheckBoxCtrl*)ctrl;
+
+        bool enable = enable_voice_chat->getValue();
 
-        mLogic->refresh();
-        mVoiceDeviceSettings->refresh();
-        LLPanel::draw();
+        self->childSetEnabled("modifier_combo", enable);
+        self->childSetEnabled("friends_only_check", enable);
+        self->childSetEnabled("push_to_talk_label", enable);
+        self->childSetEnabled("voice_call_friends_only_check", enable);
+        self->childSetEnabled("push_to_talk_toggle_check", enable);
+        self->childSetEnabled("ear_location", enable);
+        self->childSetEnabled("set_voice_hotkey_button", enable);
+        self->childSetEnabled("set_voice_middlemouse_button", enable);
+        self->childSetEnabled("device_settings_btn", enable);
 }
 
-void LLPrefsVoice::apply()
+//static
+void LLPrefsVoice::onClickSetKey(void* user_data)
 {
-        mLogic->apply();
-        mVoiceDeviceSettings->apply();
+        LLPrefsVoice* self = (LLPrefsVoice*)user_data;
+        LLVoiceSetKeyDialog* dialog = new LLVoiceSetKeyDialog(self);
+        dialog->startModal();
 }
 
-void LLPrefsVoice::cancel()
+//static
+void LLPrefsVoice::onClickSetMiddleMouse(void* user_data)
 {
-        mLogic->cancel();
-        mVoiceDeviceSettings->cancel();
+        LLPrefsVoice* self = (LLPrefsVoice*)user_data;
+        self->childSetValue("modifier_combo", "MiddleMouse");
 }
 
-//static 
-void LLPrefsVoice::onClickVoiceDeviceSettingsBtn(void* user_data)
+//static
+void LLPrefsVoice::onClickVoiceDeviceSettings(void* user_data)
 {
-        LLPrefsVoice* prefs = (LLPrefsVoice*)user_data;
-        prefs->mVoiceDeviceSettings->open();
-        LLFloater* parent_floater = gFloaterView->getParentFloater(prefs);
-        if (parent_floater)
+        LLPrefsVoice* voice_prefs = (LLPrefsVoice*)user_data;
+        LLFloaterVoiceDeviceSettings* device_settings_floater = LLFloaterVoiceDeviceSettings::showInstance();
+        LLFloater* parent_floater = gFloaterView->getParentFloater(voice_prefs);
+        if(parent_floater)
         {
-                parent_floater->addDependentFloater(prefs->mVoiceDeviceSettings, FALSE);
+                parent_floater->addDependentFloater(device_settings_floater, FALSE);
         }
 }
+
diff --git a/linden/indra/newview/llprefsvoice.h b/linden/indra/newview/llprefsvoice.h
index 836108d..fa48395 100644
--- a/linden/indra/newview/llprefsvoice.h
+++ b/linden/indra/newview/llprefsvoice.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,55 +34,24 @@
 
 #include "llpanel.h"
 
-class LLFloaterVoiceDeviceSettings;
-
-class LLPrefsVoiceLogic
-{
-public:
-        LLPrefsVoiceLogic(LLPanel* panelp);
-        virtual ~LLPrefsVoiceLogic(){};
-        
-        virtual void init();
-
-        void apply();
-        void cancel();
-        void refresh();
-        
-        void setKey(KEY key, MASK mask);
-
-protected:
-
-        static void onClickSetKey(void* user_data);
-        static void onClickSetMiddleMouse(void* user_data);
-        static void onEarLocationCommit(LLUICtrl* ctrl, void* user_data);
-
-        BOOL mEnableVoice;
-        BOOL mVoiceCallsFriendsOnly;
-        std::string mModifier;
-        BOOL mPushToTalkToggle;
-        S32  mEarLocation;
-        LLCtrlSelectionInterface        *mCtrlEarLocation;
-        
-        BOOL mEatNextSetKeyClick;
-
-        LLPanel* mPanel;
-};
-
 class LLPrefsVoice : public LLPanel
 {
 public:
         LLPrefsVoice();
         ~LLPrefsVoice();
 
-        /*virtual*/ void draw();
+        BOOL postBuild();
+
         void apply();
         void cancel();
 
-protected:
-        static void onClickVoiceDeviceSettingsBtn(void* user_data);
+        void setKey(KEY key);
 
-        LLPrefsVoiceLogic* mLogic;
-        LLFloaterVoiceDeviceSettings* mVoiceDeviceSettings;
+private:
+        static void onCommitEnableVoiceChat(LLUICtrl* ctrl, void* user_data);
+        static void onClickSetKey(void* user_data);
+        static void onClickSetMiddleMouse(void* user_data);
+        static void onClickVoiceDeviceSettings(void* user_data);
 };
 
 #endif // LLPREFSVOICE_H
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index ef212d2..1a6d2ca 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index d7496d6..74daca6 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewanim.cpp b/linden/indra/newview/llpreviewanim.cpp
index 9c7fb4a..2dc0a84 100644
--- a/linden/indra/newview/llpreviewanim.cpp
+++ b/linden/indra/newview/llpreviewanim.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewanim.h b/linden/indra/newview/llpreviewanim.h
index 8c32d9f..1b192ac 100644
--- a/linden/indra/newview/llpreviewanim.h
+++ b/linden/indra/newview/llpreviewanim.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index c0c3c93..c018e4d 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewgesture.h b/linden/indra/newview/llpreviewgesture.h
index 41008f9..a5b8492 100644
--- a/linden/indra/newview/llpreviewgesture.h
+++ b/linden/indra/newview/llpreviewgesture.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 20b0ee5..12cf739 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewlandmark.h b/linden/indra/newview/llpreviewlandmark.h
index 61d8309..cbce74c 100644
--- a/linden/indra/newview/llpreviewlandmark.h
+++ b/linden/indra/newview/llpreviewlandmark.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 30df1c3..977be32 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index 9e90f18..17752fa 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 52fca27..af52a4b 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -101,7 +101,7 @@ const std::string HELLO_LSL =
         "        llSay(0, \"Touched.\");\n"
         "    }\n"
         "}\n";
-const std::string HELP_LSL = "lsl_guide.html";
+const std::string HELP_LSL_URL = "http://wiki.secondlife.com/wiki/LSL_Portal";
 
 const std::string DEFAULT_SCRIPT_NAME = "New Script"; // *TODO:Translate?
 const std::string DEFAULT_SCRIPT_DESC = "(No Description)"; // *TODO:Translate?
@@ -294,7 +294,7 @@ LLScriptEdCore::LLScriptEdCore(
         const std::string& name,
         const LLRect& rect,
         const std::string& sample,
-        const std::string& help,
+        const std::string& help_url,
         const LLHandle<LLFloater>& floater_handle,
         void (*load_callback)(void*),
         void (*save_callback)(void*, BOOL),
@@ -304,7 +304,7 @@ LLScriptEdCore::LLScriptEdCore(
         :
         LLPanel( std::string("name"), rect ),
         mSampleText(sample),
-        mHelpFile ( help ),
+        mHelpURL(help_url),
         mEditor( NULL ),
         mLoadCallback( load_callback ),
         mSaveCallback( save_callback ),
@@ -547,7 +547,6 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         if (!history_combo) return;
 
         LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
-        url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
         url_string.setArg("[LSL_STRING]", help_string);
 
         addHelpItemToHistory(help_string);
@@ -556,6 +555,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
 
 }
 
+
 void LLScriptEdCore::addHelpItemToHistory(const std::string& help_string)
 {
         if (help_string.empty()) return;
@@ -647,7 +647,7 @@ void LLScriptEdCore::onHelpWebDialog(S32 option, void* userdata)
         switch(option)
         {
         case 0:
-                load_url_local_file(corep->mHelpFile);
+                LLWeb::loadURL(corep->mHelpURL);
                 break;
         default:
                 break;
@@ -773,7 +773,6 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
-                url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);
                 web_browser->navigateTo(url_string);
         }
@@ -1072,7 +1071,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
         self->mScriptEd =  new LLScriptEdCore("script panel",
                                                                    LLRect(),
                                                                    HELLO_LSL,
-                                                                   HELP_LSL,
+                                                                   HELP_LSL_URL,
                                                                    self->getHandle(),
                                                                    LLPreviewLSL::onLoad,
                                                                    LLPreviewLSL::onSave,
@@ -1590,7 +1589,7 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
         self->mScriptEd =  new LLScriptEdCore("script ed panel",
                                                                    LLRect(),
                                                                    HELLO_LSL,
-                                                                   HELP_LSL,
+                                                                   HELP_LSL_URL,
                                                                    self->getHandle(),
                                                                    &LLLiveLSLEditor::onLoad,
                                                                    &LLLiveLSLEditor::onSave,
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 977b9ce..7026482 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -65,7 +65,7 @@ public:
                 const std::string& name,
                 const LLRect& rect,
                 const std::string& sample,
-                const std::string& help,
+                const std::string& help_url,
                 const LLHandle<LLFloater>& floater_handle,
                 void (*load_callback)(void* userdata),
                 void (*save_callback)(void* userdata, BOOL close_after_save),
@@ -132,7 +132,7 @@ protected:
 
 private:
         std::string             mSampleText;
-        std::string             mHelpFile;
+        std::string             mHelpURL;
         LLTextEditor*   mEditor;
         void                    (*mLoadCallback)(void* userdata);
         void                    (*mSaveCallback)(void* userdata, BOOL close_after_save);
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 6b79bfb..cd16fb3 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewsound.h b/linden/indra/newview/llpreviewsound.h
index 8557b5e..03d14b7 100644
--- a/linden/indra/newview/llpreviewsound.h
+++ b/linden/indra/newview/llpreviewsound.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 0a204dc..82331b5 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -200,7 +200,7 @@ void LLPreviewTexture::draw()
         if (!isMinimized())
         {
                 LLGLSUIDefault gls_ui;
-                LLGLSNoTexture gls_notex;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 
                 const LLRect& border = mClientRect;
                 LLRect interior = mClientRect;
@@ -299,20 +299,21 @@ BOOL LLPreviewTexture::canSaveAs() const
 // virtual
 void LLPreviewTexture::saveAs()
 {
-        if( !mLoadingFullImage )
+        if( mLoadingFullImage ) return;
+
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        const LLViewerInventoryItem* item = getItem() ;
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) )
         {
-                LLFilePicker& file_picker = LLFilePicker::instance();
-                if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA ) )
-                {
-                        // User canceled save.
-                        return;
-                }
-                mSaveFileName = file_picker.getFirstFile();
-                mLoadingFullImage = TRUE;
-                getWindow()->incBusyCount();
-                mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
-                                                                   0, TRUE, FALSE, new LLUUID( mItemUUID ) );
+                // User canceled or we failed to acquire save file.
+                return;
         }
+        // remember the user-approved/edited file name.
+        mSaveFileName = file_picker.getFirstFile();
+        mLoadingFullImage = TRUE;
+        getWindow()->incBusyCount();
+        mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 
+                                                                0, TRUE, FALSE, new LLUUID( mItemUUID ) );
 }
 
 
diff --git a/linden/indra/newview/llpreviewtexture.h b/linden/indra/newview/llpreviewtexture.h
index aaa740f..a090d70 100644
--- a/linden/indra/newview/llpreviewtexture.h
+++ b/linden/indra/newview/llpreviewtexture.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index 123c583..a38aada 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -208,7 +208,7 @@ void LLProgressView::draw()
         if (gStartImageGL)
         {
                 LLGLSUIDefault gls_ui;
-                LLViewerImage::bindTexture(gStartImageGL);
+                gGL.getTexUnit(0)->bind(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;
@@ -224,11 +224,11 @@ void LLProgressView::draw()
                         glScalef(1.f, view_aspect / image_aspect, 1.f);
                 }
                 gl_rect_2d_simple_tex( getRect().getWidth(), getRect().getHeight() );
-                gStartImageGL->unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
         else
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4f(0.f, 0.f, 0.f, 1.f);
                 gl_rect_2d(getRect());
         }
diff --git a/linden/indra/newview/llprogressview.h b/linden/indra/newview/llprogressview.h
index 8ea3dfb..c6ba62a 100644
--- a/linden/indra/newview/llprogressview.h
+++ b/linden/indra/newview/llprogressview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llregionposition.cpp b/linden/indra/newview/llregionposition.cpp
index de2c11d..c928180 100644
--- a/linden/indra/newview/llregionposition.cpp
+++ b/linden/indra/newview/llregionposition.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llregionposition.h b/linden/indra/newview/llregionposition.h
index bccf1a8..e9aaa00 100644
--- a/linden/indra/newview/llregionposition.h
+++ b/linden/indra/newview/llregionposition.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llremoteparcelrequest.cpp b/linden/indra/newview/llremoteparcelrequest.cpp
index e0a6ada..a036e7d 100644
--- a/linden/indra/newview/llremoteparcelrequest.cpp
+++ b/linden/indra/newview/llremoteparcelrequest.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llremoteparcelrequest.h b/linden/indra/newview/llremoteparcelrequest.h
index b80dd5b..1b461af 100644
--- a/linden/indra/newview/llremoteparcelrequest.h
+++ b/linden/indra/newview/llremoteparcelrequest.h
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llresourcedata.h b/linden/indra/newview/llresourcedata.h
index d6c6ee1..8b9cf6e 100644
--- a/linden/indra/newview/llresourcedata.h
+++ b/linden/indra/newview/llresourcedata.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsavedsettingsglue.cpp b/linden/indra/newview/llsavedsettingsglue.cpp
index e6f3044..9b5b279 100644
--- a/linden/indra/newview/llsavedsettingsglue.cpp
+++ b/linden/indra/newview/llsavedsettingsglue.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsavedsettingsglue.h b/linden/indra/newview/llsavedsettingsglue.h
index e3a53dc..935216c 100644
--- a/linden/indra/newview/llsavedsettingsglue.h
+++ b/linden/indra/newview/llsavedsettingsglue.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index fe1755b..7afe073 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -4828,7 +4828,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                 return;
         }
 
-        LLViewerImage::bindTexture(mSilhouetteImagep);
+        gGL.getTexUnit(0)->bind(mSilhouetteImagep.get());
         LLGLSPipelineSelection gls_select;
         gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.f);
         LLGLEnable blend(GL_BLEND);
@@ -4936,7 +4936,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                 stop_glerror();
         }
 
-        mSilhouetteImagep->unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
@@ -4968,6 +4968,7 @@ LLSelectNode::LLSelectNode(LLViewerObject* object, BOOL glow)
         mSitName = LLStringUtil::null;
         mSilhouetteExists = FALSE;
         mDuplicated = FALSE;
+        mCreationDate = 0;
 
         saveColors();
 }
@@ -5005,6 +5006,7 @@ LLSelectNode::LLSelectNode(const LLSelectNode& nodep)
         mFromTaskID = nodep.mFromTaskID;
         mTouchName = nodep.mTouchName;
         mSitName = nodep.mSitName;
+        mCreationDate = nodep.mCreationDate;
 
         mSilhouetteVertices = nodep.mSilhouetteVertices;
         mSilhouetteNormals = nodep.mSilhouetteNormals;
@@ -5313,7 +5315,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
                         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                         {
                                 S32 i = 0;
                                 for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
@@ -5334,7 +5336,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
 
                 gGL.flush();
                 gGL.setSceneBlendType(LLRender::BT_ALPHA);
-                gGL.begin(LLVertexBuffer::TRIANGLES);
+                gGL.begin(LLRender::TRIANGLES);
                 {
                         S32 i = 0;
                         for (S32 seg_num = 0; seg_num < (S32)mSilhouetteSegments.size(); seg_num++)
@@ -5945,9 +5947,9 @@ S32 LLObjectSelection::getRootObjectCount()
         return count;
 }
 
-bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool firstonly)
+bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func)
 {
-        bool result = firstonly ? false : true;
+        bool result = true;
         for (iterator iter = begin(); iter != end(); )
         {
                 iterator nextiter = iter++;
@@ -5955,10 +5957,7 @@ bool LLObjectSelection::applyToObjects(LLSelectedObjectFunctor* func, bool first
                 if (!object)
                         continue;
                 bool r = func->apply(object);
-                if (firstonly && r)
-                        return true;
-                else
-                        result = result && r;
+                result = result && r;
         }
         return result;
 }
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index d85ba04..a332053 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -316,7 +316,7 @@ public:
         // If firstonly is FALSE, returns the AND of all apply() calls.
         // Else returns TRUE immediately if any apply() call succeeds (i.e. OR with early exit)
         bool applyToRootObjects(LLSelectedObjectFunctor* func, bool firstonly = false);
-        bool applyToObjects(LLSelectedObjectFunctor* func, bool firstonly = false);
+        bool applyToObjects(LLSelectedObjectFunctor* func);
         bool applyToTEs(LLSelectedTEFunctor* func, bool firstonly = false);
         bool applyToRootNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
         bool applyToNodes(LLSelectedNodeFunctor* func, bool firstonly = false);
diff --git a/linden/indra/newview/llsky.cpp b/linden/indra/newview/llsky.cpp
index 8265d9d..3e67119 100644
--- a/linden/indra/newview/llsky.cpp
+++ b/linden/indra/newview/llsky.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -284,16 +284,16 @@ LLColor4U LLSky::getFadeColor() const
 
 void LLSky::init(const LLVector3 &sun_direction)
 {
-        mVOWLSkyp = static_cast<LLVOWLSky*>(gObjectList.createObjectViewer(LLViewerObject::LL_VO_WL_SKY, gAgent.getRegion()));
+        mVOWLSkyp = static_cast<LLVOWLSky*>(gObjectList.createObjectViewer(LLViewerObject::LL_VO_WL_SKY, NULL));
         mVOWLSkyp->initSunDirection(sun_direction, LLVector3::zero);
         gPipeline.addObject(mVOWLSkyp.get());
 
-        mVOSkyp = (LLVOSky *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_SKY, gAgent.getRegion());
+        mVOSkyp = (LLVOSky *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_SKY, NULL);
         mVOSkyp->initSunDirection(sun_direction, LLVector3());
         gPipeline.addObject((LLViewerObject *)mVOSkyp);
 
 
-        mVOGroundp = (LLVOGround*)gObjectList.createObjectViewer(LLViewerObject::LL_VO_GROUND, gAgent.getRegion());
+        mVOGroundp = (LLVOGround*)gObjectList.createObjectViewer(LLViewerObject::LL_VO_GROUND, NULL);
         LLVOGround *groundp = mVOGroundp;
         gPipeline.addObject((LLViewerObject *)groundp);
 
diff --git a/linden/indra/newview/llsky.h b/linden/indra/newview/llsky.h
index 3b17c18..adfe290 100644
--- a/linden/indra/newview/llsky.h
+++ b/linden/indra/newview/llsky.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 9f5d115..127fca2 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -46,6 +46,7 @@
 #include "pipeline.h"
 #include "llrender.h"
 #include "lloctree.h"
+#include "llvoavatar.h"
 
 const F32 SG_OCCLUSION_FUDGE = 1.01f;
 #define SG_DISCARD_TOLERANCE 0.01f
@@ -117,10 +118,14 @@ void validate_drawable(LLDrawable* drawablep)
 
 S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad)
 {
+        return AABBSphereIntersectR2(min, max, origin, rad*rad);
+}
+
+S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &r)
+{
         F32 d = 0.f;
         F32 t;
-        F32 r = rad*rad;
-
+        
         if ((min-origin).magVecSquared() < r &&
                 (max-origin).magVecSquared() < r)
         {
@@ -1624,7 +1629,7 @@ public:
 
 void drawBox(const LLVector3& c, const LLVector3& r)
 {
-        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+        gGL.begin(LLRender::TRIANGLE_STRIP);
         //left front
         gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,-1))).mV);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,1))).mV);
@@ -1643,7 +1648,7 @@ void drawBox(const LLVector3& c, const LLVector3& r)
         gGL.end();
         
         //bottom
-        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+        gGL.begin(LLRender::TRIANGLE_STRIP);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(1,1,-1))).mV);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(1,-1,-1))).mV);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,-1))).mV);
@@ -1651,7 +1656,7 @@ void drawBox(const LLVector3& c, const LLVector3& r)
         gGL.end();
 
         //top
-        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+        gGL.begin(LLRender::TRIANGLE_STRIP);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(1,1,1))).mV);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(-1,1,1))).mV);
         gGL.vertex3fv((c+r.scaledVec(LLVector3(1,-1,1))).mV);
@@ -1666,7 +1671,7 @@ void drawBoxOutline(const LLVector3& pos, const LLVector3& size)
         LLVector3 v3 = size.scaledVec(LLVector3(-1,-1,1));
         LLVector3 v4 = size.scaledVec(LLVector3( 1,-1,1));
 
-        gGL.begin(LLVertexBuffer::LINES); 
+        gGL.begin(LLRender::LINES); 
         
         //top
         gGL.vertex3fv((pos+v1).mV);
@@ -1814,7 +1819,7 @@ void pushVerts(LLDrawInfo* params, U32 mask)
 {
         LLRenderPass::applyModelMatrix(*params);
         params->mVertexBuffer->setBuffer(mask);
-        params->mVertexBuffer->drawRange(params->mParticle ? LLVertexBuffer::POINTS : LLVertexBuffer::TRIANGLES,
+        params->mVertexBuffer->drawRange(params->mParticle ? LLRender::POINTS : LLRender::TRIANGLES,
                                                                 params->mStart, params->mEnd, params->mCount, params->mOffset);
 }
 
@@ -1843,7 +1848,7 @@ void pushVerts(LLFace* face, U32 mask)
                 U16 end = start + face->getGeomCount()-1;
                 U32 count = face->getIndicesCount();
                 U16 offset = face->getIndicesStart();
-                buffer->drawRange(LLVertexBuffer::TRIANGLES, start, end, count, offset);
+                buffer->drawRange(LLRender::TRIANGLES, start, end, count, offset);
         }
 
 }
@@ -1853,7 +1858,7 @@ void pushBufferVerts(LLVertexBuffer* buffer, U32 mask)
         if (buffer)
         {
                 buffer->setBuffer(mask);
-                buffer->drawRange(LLVertexBuffer::TRIANGLES, 0, buffer->getRequestedVerts()-1, buffer->getRequestedIndices(), 0);
+                buffer->drawRange(LLRender::TRIANGLES, 0, buffer->getRequestedVerts()-1, buffer->getRequestedIndices(), 0);
         }
 }
 
@@ -1902,7 +1907,7 @@ void pushVertsColorCoded(LLSpatialGroup* group, U32 mask)
                         LLRenderPass::applyModelMatrix(*params);
                         glColor4f(colors[col].mV[0], colors[col].mV[1], colors[col].mV[2], 0.5f);
                         params->mVertexBuffer->setBuffer(mask);
-                        params->mVertexBuffer->drawRange(params->mParticle ? LLVertexBuffer::POINTS : LLVertexBuffer::TRIANGLES,
+                        params->mVertexBuffer->drawRange(params->mParticle ? LLRender::POINTS : LLRender::TRIANGLES,
                                 params->mStart, params->mEnd, params->mCount, params->mOffset);
                         col = (col+1)%col_count;
                 }
@@ -1972,7 +1977,7 @@ void renderOctree(LLSpatialGroup* group)
                                                 face->mVertexBuffer->setBuffer(LLVertexBuffer::MAP_VERTEX);
                                                 //drawBox((face->mExtents[0] + face->mExtents[1])*0.5f,
                                                 //              (face->mExtents[1]-face->mExtents[0])*0.5f);
-                                                face->mVertexBuffer->draw(LLVertexBuffer::TRIANGLES, face->getIndicesCount(), face->getIndicesStart());
+                                                face->mVertexBuffer->draw(LLRender::TRIANGLES, face->getIndicesCount(), face->getIndicesStart());
                                         }
                                 }
 
@@ -2103,6 +2108,7 @@ void renderBoundingBox(LLDrawable* drawable)
                                         gGL.color4f(0.5f,0.5f,0.5f,1.0f);
                                         break;
                         case LLViewerObject::LL_VO_PART_GROUP:
+                        case LLViewerObject::LL_VO_HUD_PART_GROUP:
                                         gGL.color4f(0,0,1,1);
                                         break;
                         case LLViewerObject::LL_VO_WATER:
@@ -2222,7 +2228,7 @@ void renderPoints(LLDrawable* drawablep)
         LLGLDepthTest depth(GL_FALSE, GL_FALSE);
         if (drawablep->getNumFaces())
         {
-                gGL.begin(LLVertexBuffer::POINTS);
+                gGL.begin(LLRender::POINTS);
                 gGL.color3f(1,1,1);
                 LLVector3 center(drawablep->getPositionGroup());
                 for (S32 i = 0; i < drawablep->getNumFaces(); i++)
@@ -2298,9 +2304,17 @@ void renderRaycast(LLDrawable* drawablep)
                 LLGLEnable blend(GL_BLEND);
                 gGL.color4f(0,1,1,0.5f);
 
-                for (S32 i = 0; i < drawablep->getNumFaces(); i++)
+                if (drawablep->getVOVolume() && gDebugRaycastFaceHit != -1)
                 {
-                        pushVerts(drawablep->getFace(i), LLVertexBuffer::MAP_VERTEX);
+                        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+                        pushVerts(drawablep->getFace(gDebugRaycastFaceHit), LLVertexBuffer::MAP_VERTEX);
+                        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+                }
+                else if (drawablep->isAvatar())
+                {
+                        LLGLDepthTest depth(GL_FALSE);
+                        LLVOAvatar* av = (LLVOAvatar*) drawablep->getVObj().get();
+                        av->renderCollisionVolumes();
                 }
 
                 // draw intersection point
@@ -2468,7 +2482,7 @@ void LLSpatialPartition::renderDebug()
         LLGLDisable cullface(GL_CULL_FACE);
         LLGLEnable blend(GL_BLEND);
         gGL.setSceneBlendType(LLRender::BT_ALPHA);
-        LLImageGL::unbindTexture(0);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gPipeline.disableLights();
 
         LLSpatialBridge* bridge = asBridge();
@@ -2508,8 +2522,9 @@ public:
         LLVector3 *mNormal;
         LLVector3 *mBinormal;
         LLDrawable* mHit;
-        
-        LLOctreeIntersect(LLVector3 start, LLVector3 end,
+        BOOL mPickTransparent;
+
+        LLOctreeIntersect(LLVector3 start, LLVector3 end, BOOL pick_transparent,
                                           S32* face_hit, LLVector3* intersection, LLVector2* tex_coord, LLVector3* normal, LLVector3* binormal)
                 : mStart(start),
                   mEnd(end),
@@ -2518,14 +2533,15 @@ public:
                   mTexCoord(tex_coord),
                   mNormal(normal),
                   mBinormal(binormal),
-                  mHit(NULL)
+                  mHit(NULL),
+                  mPickTransparent(pick_transparent)
         {
         }
         
         virtual void visit(const LLSpatialGroup::OctreeNode* branch) 
         {       
                 for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
-        {
+                {
                         check(*i);
                 }
         }
@@ -2570,25 +2586,35 @@ public:
 
         virtual bool check(LLDrawable* drawable)
         {       
+                LLVector3 local_start = mStart;
+                LLVector3 local_end = mEnd;
+
+                if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible())
+                {
+                        return false;
+                }
+
                 if (drawable->isSpatialBridge())
                 {
                         LLSpatialPartition *part = drawable->asPartition();
-
-                        check(part->mOctree);
-        }
-
+                        LLSpatialBridge* bridge = part->asBridge();
+                        if (bridge && gPipeline.hasRenderType(bridge->mDrawableType))
+                        {
+                                check(part->mOctree);
+                        }
+                }
                 else
-        {
-                LLViewerObject* vobj = drawable->getVObj();
+                {
+                        LLViewerObject* vobj = drawable->getVObj();
 
                         if (vobj)
                         {
                                 LLVector3 intersection;
-                                if (vobj->lineSegmentIntersect(mStart, mEnd, -1, mFaceHit, &intersection, mTexCoord, mNormal, mBinormal))
+                                if (vobj->lineSegmentIntersect(mStart, mEnd, -1, mPickTransparent, mFaceHit, &intersection, mTexCoord, mNormal, mBinormal))
                                 {
                                         mEnd = intersection;  // shorten ray so we only find CLOSER hits
                                         if (mIntersection)
-                {
+                                        {
                                                 *mIntersection = intersection;
                                         }
                                         
@@ -2596,12 +2622,13 @@ public:
                                 }
                         }
                 }
-                
+                                
                 return false;
         }
 };
 
 LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                                                         BOOL pick_transparent,                                                                                                 
                                                                                                          S32* face_hit,                   // return the face hit
                                                                                                          LLVector3* intersection,         // return the intersection point
                                                                                                          LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -2610,7 +2637,7 @@ LLDrawable* LLSpatialPartition::lineSegmentIntersect(const LLVector3& start, con
         )
 
 {
-        LLOctreeIntersect intersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+        LLOctreeIntersect intersect(start, end, pick_transparent, face_hit, intersection, tex_coord, normal, bi_normal);
         LLDrawable* drawable = intersect.check(mOctree);
 
         return drawable;
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index bd09da2..20cb061 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -52,6 +52,7 @@ class LLSpatialBridge;
 class LLSpatialGroup;
 
 S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad);
+S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared);
 
 class LLDrawInfo : public LLRefCount 
 {
@@ -301,6 +302,7 @@ public:
         BOOL remove(LLDrawable *drawablep, LLSpatialGroup *curp);
         
         LLDrawable* lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                         BOOL pick_transparent, 
                                                                          S32* face_hit,                          // return the face hit
                                                                          LLVector3* intersection = NULL,         // return the intersection point
                                                                          LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -482,6 +484,12 @@ protected:
         U32 mRenderPass;
 };
 
+class LLHUDParticlePartition : public LLParticlePartition
+{
+public:
+        LLHUDParticlePartition();
+};
+
 //spatial partition for grass (implemented in LLVOGrass.cpp)
 class LLGrassPartition : public LLParticlePartition
 {
diff --git a/linden/indra/newview/llsprite.cpp b/linden/indra/newview/llsprite.cpp
index 7da1d48..fb89094 100644
--- a/linden/indra/newview/llsprite.cpp
+++ b/linden/indra/newview/llsprite.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -126,8 +126,8 @@ void LLSprite::updateFace(LLFace &face)
                         LLVector3 camera_vec = mPosition - sCameraPosition;
                         mScaledRight = camera_vec % LLVector3(0.f, 0.f, 1.f);
                         mScaledUp = -(camera_vec % mScaledRight);
-                        mScaledUp.normVec();
-                        mScaledRight.normVec();
+                        mScaledUp.normalize();
+                        mScaledRight.normalize();
                         mScaledUp *= mHeightDiv2;
                         mScaledRight *= mWidthDiv2;
 
@@ -156,7 +156,7 @@ void LLSprite::updateFace(LLFace &face)
                 else
                 {
                         x_axis = sNormal % LLVector3(0.f, -1.f, 0.f);
-                        x_axis.normVec();
+                        x_axis.normalize();
 
                         y_axis = sNormal % x_axis;
                 }
diff --git a/linden/indra/newview/llsprite.h b/linden/indra/newview/llsprite.h
index 7170cb2..dbefc87 100644
--- a/linden/indra/newview/llsprite.h
+++ b/linden/indra/newview/llsprite.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -73,7 +73,7 @@ public:
         void setColor(const LLColor4 &color);
         void setColor(const F32 r, const F32 g, const F32 b, const F32 a);
         void setAlpha(const F32 alpha)                                  { mColor.mV[VALPHA] = alpha; }
-        void setNormal(const LLVector3 &normal)         { sNormal = normal; sNormal.normVec();}
+        void setNormal(const LLVector3 &normal)         { sNormal = normal; sNormal.normalize();}
 
         F32 getAlpha();
 
diff --git a/linden/indra/newview/llsrv.cpp b/linden/indra/newview/llsrv.cpp
index 275bb9f..46e0b15 100644
--- a/linden/indra/newview/llsrv.cpp
+++ b/linden/indra/newview/llsrv.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsrv.h b/linden/indra/newview/llsrv.h
index 980aef7..09af46f 100644
--- a/linden/indra/newview/llsrv.h
+++ b/linden/indra/newview/llsrv.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 84a5ecd..bb1982f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -93,6 +93,7 @@
 #include "llfeaturemanager.h"
 #include "llfirstuse.h"
 #include "llfloateractivespeakers.h"
+#include "llfloaterbeacons.h"
 #include "llfloatercamera.h"
 #include "llfloaterchat.h"
 #include "llfloatergesture.h"
@@ -248,6 +249,7 @@ void callback_choose_gender(S32 option, void* userdata);
 void init_start_screen(S32 location_id);
 void release_start_screen();
 void reset_login();
+void apply_udp_blacklist(const std::string& csv);
 
 void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group, void* data)
 {
@@ -876,6 +878,20 @@ bool idle_startup()
                 LLFile::mkdir(gDirUtilp->getChatLogsDir());
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
 
+                //good as place as any to create user windlight directories
+                std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
+                LLFile::mkdir(user_windlight_path_name.c_str());                
+
+                std::string user_windlight_skies_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
+                LLFile::mkdir(user_windlight_skies_path_name.c_str());
+
+                std::string user_windlight_water_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
+                LLFile::mkdir(user_windlight_water_path_name.c_str());
+
+                std::string user_windlight_days_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", ""));
+                LLFile::mkdir(user_windlight_days_path_name.c_str());
+
+
                 if (show_connect_box)
                 {
                         if ( LLPanelLogin::isGridComboDirty() )
@@ -1128,6 +1144,7 @@ bool idle_startup()
                 LL_DEBUGS("AppInit") << "STATE_LOGIN_PROCESS_RESPONSE" << LL_ENDL;
                 std::ostringstream emsg;
                 bool quit = false;
+                bool update = false;
                 std::string login_response;
                 std::string reason_response;
                 std::string message_response;
@@ -1171,11 +1188,7 @@ bool idle_startup()
                                 reason_response = LLUserAuth::getInstance()->getResponse("reason");
                                 message_response = LLUserAuth::getInstance()->getResponse("message");
 
-                                if (gHideLinks && reason_response == "disabled")
-                                {
-                                        emsg << gDisabledMessage;
-                                }
-                                else if (!message_response.empty())
+                                if (!message_response.empty())
                                 {
                                         // XUI: fix translation for strings returned during login
                                         // We need a generic table for translations
@@ -1233,16 +1246,7 @@ bool idle_startup()
                                 if(reason_response == "update")
                                 {
                                         auth_message = LLUserAuth::getInstance()->getResponse("message");
-                                        if (show_connect_box)
-                                        {
-                                                update_app(TRUE, auth_message);
-                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
-                                                return false;
-                                        }
-                                        else
-                                        {
-                                                quit = true;
-                                        }
+                                        update = true;
                                 }
                                 if(reason_response == "optional")
                                 {
@@ -1280,6 +1284,21 @@ bool idle_startup()
                         break;
                 }
 
+                if (update || gSavedSettings.getBOOL("ForceMandatoryUpdate"))
+                {
+                        gSavedSettings.setBOOL("ForceMandatoryUpdate", FALSE);
+                        if (show_connect_box)
+                        {
+                                update_app(TRUE, auth_message);
+                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
+                                return false;
+                        }
+                        else
+                        {
+                                quit = true;
+                        }
+                }
+
                 // Version update and we're not showing the dialog
                 if(quit)
                 {
@@ -1290,8 +1309,14 @@ bool idle_startup()
 
                 if(successful_login)
                 {
-                        // unpack login data needed by the application
                         std::string text;
+                        text = LLUserAuth::getInstance()->getResponse("udp_blacklist");
+                        if(!text.empty())
+                        {
+                                apply_udp_blacklist(text);
+                        }
+
+                        // unpack login data needed by the application
                         text = LLUserAuth::getInstance()->getResponse("agent_id");
                         if(!text.empty()) gAgentID.set(text);
                         gDebugInfo["AgentID"] = text;
@@ -1664,6 +1689,11 @@ bool idle_startup()
                         LLFloaterActiveSpeakers::showInstance();
                 }
 
+                if (gSavedSettings.getBOOL("BeaconAlwaysOn"))
+                {
+                        LLFloaterBeacons::showInstance();
+                }
+
                 if (!gNoRender)
                 {
                         // Move the progress view in front of the UI
@@ -2465,7 +2495,7 @@ bool idle_startup()
                 gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
-                LLAppViewer::instance()->initMainloopTimeout("Mainloop Init");
+                LLAppViewer::instance()->handleLoginComplete();
 
                 return TRUE;
         }
@@ -2781,7 +2811,6 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
 
 void update_dialog_callback(S32 option, void *userdata)
 {
-        std::string update_exe_path;
         bool mandatory = userdata != NULL;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -2824,29 +2853,41 @@ void update_dialog_callback(S32 option, void *userdata)
         // *TODO constantize this guy
         LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
         
+        if(LLAppViewer::sUpdaterInfo)
+        {
+                delete LLAppViewer::sUpdaterInfo ;
+        }
+        LLAppViewer::sUpdaterInfo = new LLAppViewer::LLUpdaterInfo() ;
+        
 #if LL_WINDOWS
-        update_exe_path = gDirUtilp->getTempFilename();
-        if (update_exe_path.empty())
+        LLAppViewer::sUpdaterInfo->mUpdateExePath = gDirUtilp->getTempFilename();
+        if (LLAppViewer::sUpdaterInfo->mUpdateExePath.empty())
         {
+                delete LLAppViewer::sUpdaterInfo ;
+                LLAppViewer::sUpdaterInfo = NULL ;
+
                 // We're hosed, bail
                 LL_WARNS("AppInit") << "LLDir::getTempFilename() failed" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
                 return;
         }
 
-        update_exe_path += ".exe";
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += ".exe";
 
         std::string updater_source = gDirUtilp->getAppRODataDir();
         updater_source += gDirUtilp->getDirDelimiter();
         updater_source += "updater.exe";
 
         LL_DEBUGS("AppInit") << "Calling CopyFile source: " << updater_source
-                        << " dest: " << update_exe_path
+                        << " dest: " << LLAppViewer::sUpdaterInfo->mUpdateExePath
                         << LL_ENDL;
 
 
-        if (!CopyFileA(updater_source.c_str(), update_exe_path.c_str(), FALSE))
+        if (!CopyFileA(updater_source.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), FALSE))
         {
+                delete LLAppViewer::sUpdaterInfo ;
+                LLAppViewer::sUpdaterInfo = NULL ;
+
                 LL_WARNS("AppInit") << "Unable to copy the updater!" << LL_ENDL;
                 LLAppViewer::instance()->forceQuit();
                 return;
@@ -2859,41 +2900,13 @@ void update_dialog_callback(S32 option, void *userdata)
                 gSavedSettings.setString( "NextLoginLocation", LLURLSimString::sInstance.mSimString ); 
         };
 
-        std::ostringstream params;
-        params << "-url \"" << update_url.asString() << "\"";
-        if (gHideLinks)
-        {
-                // Figure out the program name.
-                const std::string& data_dir = gDirUtilp->getAppRODataDir();
-                // Roll back from the end, stopping at the first '\'
-                const char* program_name = data_dir.c_str() + data_dir.size();          /* Flawfinder: ignore */
-                while ( (data_dir != --program_name) &&
-                                *(program_name) != '\\');
-                
-                if ( *(program_name) == '\\')
-                {
-                        // We found a '\'.
-                        program_name++;
-                }
-                else
-                {
-                        // Oops.
-                        program_name = "SecondLife";
-                }
-
-                params << " -silent -name \"" << LLAppViewer::instance()->getSecondLifeTitle() << "\"";
-                params << " -program \"" << program_name << "\"";
-        }
+        LLAppViewer::sUpdaterInfo->mParams << "-url \"" << update_url.asString() << "\"";
 
-        LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << " " << params.str() << LL_ENDL;
+        LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << " " << LLAppViewer::sUpdaterInfo->mParams.str() << LL_ENDL;
 
         //Explicitly remove the marker file, otherwise we pass the lock onto the child process and things get weird.
         LLAppViewer::instance()->removeMarkerFile(); // In case updater fails
         
-        // Use spawn() to run asynchronously
-        int retval = _spawnl(_P_NOWAIT, update_exe_path.c_str(), update_exe_path.c_str(), params.str().c_str(), NULL);
-        LL_DEBUGS("AppInit") << "Spawn returned " << retval << LL_ENDL;
-
 #elif LL_DARWIN
         // if a sim name was passed in via command line parameter (typically through a SLURL)
         if ( LLURLSimString::sInstance.mSimString.length() )
@@ -2902,19 +2915,19 @@ void update_dialog_callback(S32 option, void *userdata)
                 gSavedSettings.setString( "NextLoginLocation", LLURLSimString::sInstance.mSimString ); 
         };
         
-        update_exe_path = "'";
-        update_exe_path += gDirUtilp->getAppRODataDir();
-        update_exe_path += "/mac-updater.app/Contents/MacOS/mac-updater' -url \"";
-        update_exe_path += update_url.asString();
-        update_exe_path += "\" -name \"";
-        update_exe_path += LLAppViewer::instance()->getSecondLifeTitle();
-        update_exe_path += "\" &";
-
-        LL_DEBUGS("AppInit") << "Calling updater: " << update_exe_path << LL_ENDL;
-        
+        LLAppViewer::sUpdaterInfo->mUpdateExePath = "'";
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += gDirUtilp->getAppRODataDir();
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += "/mac-updater.app/Contents/MacOS/mac-updater' -url \"";
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += update_url.asString();
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -name \"";
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += LLAppViewer::instance()->getSecondLifeTitle();
+        LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &";
+
+        LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;
+
         // Run the auto-updater.
-        system(update_exe_path.c_str());                /* Flawfinder: ignore */
-        
+        system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
+
 #elif LL_LINUX
         OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
                 "Please download the latest version from www.secondlife.com.",
@@ -3570,7 +3583,7 @@ void init_stat_view()
         stat_barp->mDisplayBar = FALSE;
         stat_barp->mDisplayMean = FALSE;
 
-        stat_barp = sim_time_viewp->addStat("Sim Time (Physics)", &(LLViewerStats::getInstance()->mSimSimPhysicsMsec));
+        stat_barp = sim_time_viewp->addStat("Physics Time", &(LLViewerStats::getInstance()->mSimSimPhysicsMsec));
         stat_barp->setUnitLabel("ms");
         stat_barp->mPrecision = 1;
         stat_barp->mMinBar = 0.f;
@@ -3581,45 +3594,7 @@ void init_stat_view()
         stat_barp->mDisplayBar = FALSE;
         stat_barp->mDisplayMean = FALSE;
 
-        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 = sim_time_viewp->addStat("Simulation Time", &(LLViewerStats::getInstance()->mSimSimOtherMsec));
         stat_barp->setUnitLabel("ms");
         stat_barp->mPrecision = 1;
         stat_barp->mMinBar = 0.f;
@@ -3663,6 +3638,79 @@ void init_stat_view()
         stat_barp->mDisplayBar = FALSE;
         stat_barp->mDisplayMean = FALSE;
 
+        stat_barp = sim_time_viewp->addStat("Spare Time", &(LLViewerStats::getInstance()->mSimSpareMsec));
+        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;
+
+        
+        // 2nd level time blocks under 'Details' second
+        LLStatView *detailed_time_viewp;
+        detailed_time_viewp = new LLStatView("sim perf view", "Time Details (ms)", "", rect);
+        sim_time_viewp->addChildAtEnd(detailed_time_viewp);
+        {
+                stat_barp = detailed_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 = detailed_time_viewp->addStat("  Update Physics 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 = detailed_time_viewp->addStat("  Physics 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 = detailed_time_viewp->addStat("  Sleep Time", &(LLViewerStats::getInstance()->mSimSleepMsec));
+                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 = detailed_time_viewp->addStat("  Pump IO", &(LLViewerStats::getInstance()->mSimPumpIOMsec));
+                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;
+        }
+
         LLRect r = gDebugView->mFloaterStatsp->getRect();
 
         // Reshape based on the parameters we set.
@@ -3924,3 +3972,28 @@ void login_alert_done(S32 option, void* user_data)
         LLPanelLogin::giveFocus();
 }
 
+
+void apply_udp_blacklist(const std::string& csv)
+{
+
+        std::string::size_type start = 0;
+        std::string::size_type comma = 0;
+        do 
+        {
+                comma = csv.find(",", start);
+                if (comma == std::string::npos)
+                {
+                        comma = csv.length();
+                }
+                std::string item(csv, start, comma-start);
+
+                lldebugs << "udp_blacklist " << item << llendl;
+                gMessageSystem->banUdpMessage(item);
+                
+                start = comma + 1;
+
+        }
+        while(comma < csv.length());
+        
+}
+
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 1a9f659..cde9a1a 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,6 +87,7 @@ public:
         // Always use this to set gStartupState so changes are logged
         static void setStartupState( EStartupState state );
         static EStartupState getStartupState() { return gStartupState; };
+        static std::string getStartupStateString() { return startupStateToString(gStartupState); };
 
         static void multimediaInit();
                 // Initialize LLViewerMedia multimedia engine.
diff --git a/linden/indra/newview/llstatbar.cpp b/linden/indra/newview/llstatbar.cpp
index 19a9442..2673166 100644
--- a/linden/indra/newview/llstatbar.cpp
+++ b/linden/indra/newview/llstatbar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -166,7 +166,7 @@ void LLStatBar::draw()
                 bottom = bar_top - bar_height - tick_height/2;
 
                 LLGLSUIDefault gls_ui;
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 for (tick_value = mMinBar; tick_value <= mMaxBar; tick_value += mTickSpacing)
                 {
                         left = llfloor((tick_value - mMinBar)*value_scale);
diff --git a/linden/indra/newview/llstatbar.h b/linden/indra/newview/llstatbar.h
index d79a117..136f7c3 100644
--- a/linden/indra/newview/llstatbar.h
+++ b/linden/indra/newview/llstatbar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatgraph.cpp b/linden/indra/newview/llstatgraph.cpp
index 73c80ca..0825bfd 100644
--- a/linden/indra/newview/llstatgraph.cpp
+++ b/linden/indra/newview/llstatgraph.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatgraph.h b/linden/indra/newview/llstatgraph.h
index 73e0ba0..caeb17a 100644
--- a/linden/indra/newview/llstatgraph.h
+++ b/linden/indra/newview/llstatgraph.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 2f9227a..b0ef61f 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -4,7 +4,7 @@
 *
 * $LicenseInfo:firstyear=2002&license=viewergpl$
 * 
-* Copyright (c) 2002-2008, Linden Research, Inc.
+* Copyright (c) 2002-2009, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index 5cdb481..7db651c 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatview.cpp b/linden/indra/newview/llstatview.cpp
index 84d4d83..7d20639 100644
--- a/linden/indra/newview/llstatview.cpp
+++ b/linden/indra/newview/llstatview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstatview.h b/linden/indra/newview/llstatview.h
index 2588f44..8cfc3fb 100644
--- a/linden/indra/newview/llstatview.h
+++ b/linden/indra/newview/llstatview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp
index 89fa3cd..6a3415f 100644
--- a/linden/indra/newview/llstylemap.cpp
+++ b/linden/indra/newview/llstylemap.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llstylemap.h b/linden/indra/newview/llstylemap.h
index 782299e..a38d253 100644
--- a/linden/indra/newview/llstylemap.h
+++ b/linden/indra/newview/llstylemap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 017517c..e301516 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,6 +33,8 @@
 
 #include "llsurface.h"
 
+#include "llrender.h"
+
 #include "llviewerimagelist.h"
 #include "llpatchvertexarray.h"
 #include "patch_dct.h"
@@ -249,7 +251,7 @@ void LLSurface::createSTexture()
 
                 mSTexturep = new LLViewerImage(raw, FALSE);
                 mSTexturep->dontDiscard();
-                mSTexturep->bind();
+                gGL.getTexUnit(0)->bind(mSTexturep.get());
                 mSTexturep->setClamp(TRUE, TRUE);
                 gImageList.addImage(mSTexturep);
         }
@@ -274,7 +276,7 @@ void LLSurface::createWaterTexture()
                 }
                 mWaterTexturep = new LLViewerImage(raw, FALSE);
                 mWaterTexturep->dontDiscard();
-                mWaterTexturep->bind();
+                gGL.getTexUnit(0)->bind(mWaterTexturep.get());
                 mWaterTexturep->setClamp(TRUE, TRUE);
                 gImageList.addImage(mWaterTexturep);
         }
diff --git a/linden/indra/newview/llsurface.h b/linden/indra/newview/llsurface.h
index ebd8595..6e48f48 100644
--- a/linden/indra/newview/llsurface.h
+++ b/linden/indra/newview/llsurface.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsurfacepatch.cpp b/linden/indra/newview/llsurfacepatch.cpp
index 68ce4af..59d7318 100644
--- a/linden/indra/newview/llsurfacepatch.cpp
+++ b/linden/indra/newview/llsurfacepatch.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llsurfacepatch.h b/linden/indra/newview/llsurfacepatch.h
index 92756ba..32711c2 100644
--- a/linden/indra/newview/llsurfacepatch.h
+++ b/linden/indra/newview/llsurfacepatch.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltable.h b/linden/indra/newview/lltable.h
index 325497a..52ea165 100644
--- a/linden/indra/newview/lltable.h
+++ b/linden/indra/newview/lltable.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index e331146..0944d4b 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -60,8 +60,6 @@
 // SJB: We really always want to use the GL cache;
 // let GL page textures in and out of video RAM instead of trying to do so by hand.
 
-LLGradientPaletteList gGradientPaletteList;
-
 // static
 S32 LLTexLayerSetBuffer::sGLByteCount = 0;
 S32 LLTexLayerSetBuffer::sGLBumpByteCount = 0;
@@ -95,51 +93,76 @@ LLTexLayerSetBuffer::LLTexLayerSetBuffer( LLTexLayerSet* owner, S32 width, S32 h
         mNeedsUpdate( TRUE ),
         mNeedsUpload( FALSE ),
         mUploadPending( FALSE ), // Not used for any logic here, just to sync sending of updates
-        mTexLayerSet( owner ),
-        mInitialized( FALSE ),
-        mBumpTexName(0)
+        mTexLayerSet( owner )   
 {
         LLTexLayerSetBuffer::sGLByteCount += getSize();
+        mHasBump = has_bump ;
+        mBumpTex = NULL ;
+
+        createBumpTexture() ;
+}
+
+LLTexLayerSetBuffer::~LLTexLayerSetBuffer()
+{
+        LLTexLayerSetBuffer::sGLByteCount -= getSize();
 
-        if( has_bump )
+        if( mBumpTex.notNull())
+        {
+                mBumpTex = NULL ;
+                LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4;
+                LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4;
+        }
+}
+//virtual 
+void LLTexLayerSetBuffer::restoreGLTexture() 
+{       
+        createBumpTexture() ;
+        LLDynamicTexture::restoreGLTexture() ;
+}
+
+//virtual 
+void LLTexLayerSetBuffer::destroyGLTexture() 
+{
+        if( mBumpTex.notNull() )
+        {
+                mBumpTex = NULL ;
+                LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4;
+                LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4;
+        }
+
+        LLDynamicTexture::destroyGLTexture() ;
+}
+
+void LLTexLayerSetBuffer::createBumpTexture()
+{
+        if( mHasBump )
         {
                 LLGLSUIDefault gls_ui;
-                glGenTextures(1, (GLuint*) &mBumpTexName);
+                mBumpTex = new LLImageGL(FALSE) ;
+                if(!mBumpTex->createGLTexture())
+                {
+                        mBumpTex = NULL ;
+                        return ;
+                }
 
-                LLImageGL::bindExternalTexture(mBumpTexName, 0, GL_TEXTURE_2D); 
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mBumpTex->getTexName());
                 stop_glerror();
 
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
 
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+                glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
                 stop_glerror();
 
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLImageGL::sGlobalTextureMemory += mWidth * mHeight * 4;
                 LLTexLayerSetBuffer::sGLBumpByteCount += mWidth * mHeight * 4;
         }
 }
 
-LLTexLayerSetBuffer::~LLTexLayerSetBuffer()
-{
-        LLTexLayerSetBuffer::sGLByteCount -= getSize();
-
-        if( mBumpTexName )
-        {
-                glDeleteTextures(1, (GLuint*) &mBumpTexName);
-                stop_glerror();
-                mBumpTexName = 0;
-
-                LLImageGL::sGlobalTextureMemory -= mWidth * mHeight * 4;
-                LLTexLayerSetBuffer::sGLBumpByteCount -= mWidth * mHeight * 4;
-        }
-}
-
 // static
 void LLTexLayerSetBuffer::dumpTotalByteCount()
 {
@@ -248,7 +271,7 @@ BOOL LLTexLayerSetBuffer::render()
         BOOL success = TRUE;
 
         // Composite bump
-        if( mBumpTexName )
+        if( mBumpTex.notNull() )
         {
                 // Composite the bump data
                 success &= mTexLayerSet->renderBump( mOrigin.mX, mOrigin.mY, mWidth, mHeight );
@@ -259,7 +282,7 @@ BOOL LLTexLayerSetBuffer::render()
                         LLGLSUIDefault gls_ui;
 
                         // read back into texture (this is done externally for the color data)
-                        LLImageGL::bindExternalTexture( mBumpTexName, 0, GL_TEXTURE_2D ); 
+                        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mBumpTex->getTexName());
                         stop_glerror();
 
                         glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, mOrigin.mX, mOrigin.mY, mWidth, mHeight);
@@ -299,12 +322,17 @@ BOOL LLTexLayerSetBuffer::render()
         gGL.setSceneBlendType(LLRender::BT_ALPHA);
 
         // we have valid texture data now
-        mInitialized = TRUE;
+        mTexture->setGLTextureCreated(true);
         mNeedsUpdate = FALSE;
 
         return success;
 }
 
+bool LLTexLayerSetBuffer::isInitialized(void) const
+{
+        return mTexture.notNull() && mTexture->isGLTextureCreated();
+}
+
 BOOL LLTexLayerSetBuffer::updateImmediate()
 {
         mNeedsUpdate = TRUE;
@@ -350,11 +378,11 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data)
         // writes into baked_color_data
         const char* comment_text = NULL;
 
-        S32 baked_image_components = mBumpTexName ? 5 : 4; // red green blue [bump] clothing
+        S32 baked_image_components = mBumpTex.notNull() ? 5 : 4; // red green blue [bump] clothing
         LLPointer<LLImageRaw> baked_image = new LLImageRaw( mWidth, mHeight, baked_image_components );
         U8* baked_image_data = baked_image->getData();
         
-        if( mBumpTexName )
+        if( mBumpTex.notNull() )
         {
                 comment_text = LINDEN_J2C_COMMENT_PREFIX "RGBHM"; // 5 channels: rgb, heightfield/alpha, mask
 
@@ -551,24 +579,12 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* user
         delete baked_upload_data;
 }
 
-
-void LLTexLayerSetBuffer::bindTexture()
-{
-        if( mInitialized )
-        {
-                LLDynamicTexture::bindTexture();
-        }
-        else
-        {
-                gImageList.getImage(IMG_DEFAULT)->bind();
-        }
-}
-
 void LLTexLayerSetBuffer::bindBumpTexture( U32 stage )
 {
-        if( mBumpTexName ) 
+        if( mBumpTex.notNull() ) 
         {
-                LLImageGL::bindExternalTexture(mBumpTexName, stage, GL_TEXTURE_2D); 
+                gGL.getTexUnit(stage)->bindManual(LLTexUnit::TT_TEXTURE, mBumpTex->getTexName());
+                gGL.getTexUnit(0)->activate();
         
                 if( mLastBindTime != LLImageGL::sLastFrameTime )
                 {
@@ -578,7 +594,8 @@ void LLTexLayerSetBuffer::bindBumpTexture( U32 stage )
         }
         else
         {
-                LLImageGL::unbindTexture(stage, GL_TEXTURE_2D);
+                gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE);
+                gGL.getTexUnit(0)->activate();
         }
 }
 
@@ -786,7 +803,7 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height )
                         if( image_gl )
                         {
                                 LLGLSUIDefault gls_ui;
-                                image_gl->bind();
+                                gGL.getTexUnit(0)->bind(image_gl);
                                 gl_rect_2d_simple_tex( width, height );
                         }
                         else
@@ -794,7 +811,7 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height )
                                 success = FALSE;
                         }
                 }
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 gGL.flush();
                 gGL.setColorMask(true, true);
@@ -804,7 +821,8 @@ BOOL LLTexLayerSet::render( S32 x, S32 y, S32 width, S32 height )
         if( getInfo()->mClearAlpha )
         {
                 // Set the alpha channel to one (clean up after previous blending)
-                LLGLSNoTextureNoAlphaTest gls_no_alpha;
+                LLGLDisable no_alpha(GL_ALPHA_TEST);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4f( 0.f, 0.f, 0.f, 1.f );
                 gGL.flush();
                 gGL.setColorMask(false, true);
@@ -838,7 +856,8 @@ BOOL LLTexLayerSet::renderBump( S32 x, S32 y, S32 width, S32 height )
         }
 
         // Set the alpha channel to one (clean up after previous blending)
-        LLGLSNoTextureNoAlphaTest gls_no_texture_no_alpha;
+        LLGLDisable no_alpha(GL_ALPHA_TEST);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         gGL.color4f( 0.f, 0.f, 0.f, 1.f );
         gGL.setColorMask(false, true);
 
@@ -1358,13 +1377,13 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                                         BOOL old_clamps = image_gl->getClampS();
                                         BOOL old_clampt = image_gl->getClampT();
                                         
-                                        image_gl->bind();
+                                        gGL.getTexUnit(0)->bind(image_gl);
                                         image_gl->setClamp(TRUE, TRUE);
 
                                         gl_rect_2d_simple_tex( width, height );
 
                                         image_gl->setClamp(old_clamps, old_clampt);
-                                        image_gl->unbindTexture(0, GL_TEXTURE_2D);
+                                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 }
                         }
                         else
@@ -1380,9 +1399,9 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                         LLImageGL* image_gl = gTexStaticImageList.getImageGL( getInfo()->mStaticImageFileName, getInfo()->mStaticImageIsMask );
                         if( image_gl )
                         {
-                                image_gl->bind();
+                                gGL.getTexUnit(0)->bind(image_gl);
                                 gl_rect_2d_simple_tex( width, height );
-                                image_gl->unbindTexture(0, GL_TEXTURE_2D);
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         }
                         else
                         {
@@ -1396,7 +1415,8 @@ BOOL LLTexLayer::render( S32 x, S32 y, S32 width, S32 height )
                 getInfo()->mStaticImageFileName.empty() &&
                 color_specified )
         {
-                LLGLSNoTextureNoAlphaTest gls;
+                LLGLDisable no_alpha(GL_ALPHA_TEST);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( net_color.mV);
                 gl_rect_2d_simple( width, height );
         }
@@ -1518,7 +1538,8 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
         // Note: if the first param is a mulitply, multiply against the current buffer's alpha
         if( !first_param || !first_param->getMultiplyBlend() )
         {
-                LLGLSNoTextureNoAlphaTest gls_no_texture_no_alpha_test;
+                LLGLDisable no_alpha(GL_ALPHA_TEST);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
                 // Clear the alpha
                 gGL.flush();
@@ -1555,13 +1576,13 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
 
                                         BOOL old_clamps = image_gl->getClampS();
                                         BOOL old_clampt = image_gl->getClampT();                                        
-                                        image_gl->bind();
+                                        gGL.getTexUnit(0)->bind(image_gl);
                                         image_gl->setClamp(TRUE, TRUE);
 
                                         gl_rect_2d_simple_tex( width, height );
 
                                         image_gl->setClamp(old_clamps, old_clampt);
-                                        image_gl->unbindTexture(0, GL_TEXTURE_2D);
+                                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 }
                         }
                         else
@@ -1581,9 +1602,9 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
                                         ( (image_gl->getComponents() == 1) && getInfo()->mStaticImageIsMask ) )
                                 {
                                         LLGLSNoAlphaTest gls_no_alpha_test;
-                                        image_gl->bind();
+                                        gGL.getTexUnit(0)->bind(image_gl);
                                         gl_rect_2d_simple_tex( width, height );
-                                        image_gl->unbindTexture(0, GL_TEXTURE_2D);
+                                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 }
                         }
                         else
@@ -1597,7 +1618,8 @@ BOOL LLTexLayer::renderAlphaMasks( S32 x, S32 y, S32 width, S32 height, LLColor4
         // Note: we're still using gGL.blendFunc( GL_DST_ALPHA, GL_ZERO );
         if( colorp->mV[VW] != 1.f )
         {
-                LLGLSNoTextureNoAlphaTest gls_no_texture_no_alpha_test;
+                LLGLDisable no_alpha(GL_ALPHA_TEST);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( colorp->mV );
                 gl_rect_2d_simple( width, height );
         }
@@ -1700,7 +1722,7 @@ BOOL LLTexLayer::renderImageRaw( U8* in_data, S32 in_width, S32 in_height, S32 i
                 glGenTextures(1, &name );
                 stop_glerror();
 
-                LLImageGL::bindExternalTexture( name, 0, GL_TEXTURE_2D ); 
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, name);
                 stop_glerror();
 
                 glTexImage2D(
@@ -1712,12 +1734,11 @@ BOOL LLTexLayer::renderImageRaw( U8* in_data, S32 in_width, S32 in_height, S32 i
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                 
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
 
                 gl_rect_2d_simple_tex( width, height );
 
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 glDeleteTextures(1, &name );
                 stop_glerror();
@@ -1736,7 +1757,7 @@ BOOL LLTexLayer::renderImageRaw( U8* in_data, S32 in_width, S32 in_height, S32 i
 
                 gl_rect_2d_simple_tex( width, height );
 
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
 
         return TRUE;
@@ -1800,8 +1821,6 @@ BOOL LLTexLayerParamAlphaInfo::parseXml(LLXmlTreeNode* node)
         static LLStdStringHandle domain_string = LLXmlTree::addAttributeString("domain");
         param_alpha_node->getFastAttributeF32( domain_string, mDomain );
 
-        gGradientPaletteList.initPalette(mDomain);
-
         return TRUE;
 }
 
@@ -1996,7 +2015,7 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                 if(     !mCachedProcessedImageGL ||
                         (mCachedProcessedImageGL->getWidth() != image_tga_width) ||
                         (mCachedProcessedImageGL->getHeight() != image_tga_height) ||
-                        (weight_changed && !(gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))) )
+                        (weight_changed ))
                 {
 //                      llinfos << "Building Cached Alpha: " << mName << ": (" << mStaticImageRaw->getWidth() << ", " << mStaticImageRaw->getHeight() << ") " << effective_weight << llendl;
                         mCachedEffectiveWeight = effective_weight;
@@ -2008,71 +2027,34 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
                                 // We now have something in one of our caches
                                 LLTexLayerSet::sHasCaches |= mCachedProcessedImageGL ? TRUE : FALSE;
 
-                                if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-                                {
-                                        // interpret luminance values as color index table
-                                        mCachedProcessedImageGL->setExplicitFormat( GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX ); 
-                                }
-                                else
-                                {
-                                        mCachedProcessedImageGL->setExplicitFormat( GL_ALPHA8, GL_ALPHA );
-                                }
+
+                                mCachedProcessedImageGL->setExplicitFormat( GL_ALPHA8, GL_ALPHA );
                         }
 
                         // Applies domain and effective weight to data as it is decoded. Also resizes the raw image if needed.
-                        if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
-                        {
-                                mStaticImageRaw = NULL;
-                                mStaticImageRaw = new LLImageRaw;
-                                mStaticImageTGA->decode(mStaticImageRaw);
-                                mNeedsCreateTexture = TRUE;
-                        }
-                        else
-                        {
-                                mStaticImageRaw = NULL;
-                                mStaticImageRaw = new LLImageRaw;
-                                mStaticImageTGA->decodeAndProcess( mStaticImageRaw, getInfo()->mDomain, effective_weight );
-                                mNeedsCreateTexture = TRUE;
-                        }
+                        mStaticImageRaw = NULL;
+                        mStaticImageRaw = new LLImageRaw;
+                        mStaticImageTGA->decodeAndProcess( mStaticImageRaw, getInfo()->mDomain, effective_weight );
+                        mNeedsCreateTexture = TRUE;
                 }
 
                 if( mCachedProcessedImageGL )
                 {
                         {
-                                if (gGLManager.mHasPalettedTextures && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_PALETTE))
+                                // Create the GL texture, and then hang onto it for future use.
+                                if( mNeedsCreateTexture )
                                 {
-                                        if( mNeedsCreateTexture )
-                                        {
-                                                mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw);
-                                                mNeedsCreateTexture = FALSE;
-                                                
-                                                mCachedProcessedImageGL->bind();
-                                                mCachedProcessedImageGL->setClamp(TRUE, TRUE);
-                                        }
-
-                                        LLGLSNoAlphaTest gls_no_alpha_test;
-                                        mCachedProcessedImageGL->bind();
-                                        gGradientPaletteList.setHardwarePalette( getInfo()->mDomain, effective_weight );
-                                        gl_rect_2d_simple_tex( width, height );
-                                        mCachedProcessedImageGL->unbindTexture(0, GL_TEXTURE_2D);
-                                }
-                                else
-                                {
-                                        // Create the GL texture, and then hang onto it for future use.
-                                        if( mNeedsCreateTexture )
-                                        {
-                                                mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw);
-                                                mNeedsCreateTexture = FALSE;
-                                                
-                                                mCachedProcessedImageGL->bind();
-                                                mCachedProcessedImageGL->setClamp(TRUE, TRUE);
-                                        }
-                                
-                                        LLGLSNoAlphaTest gls_no_alpha_test;
-                                        mCachedProcessedImageGL->bind();
-                                        gl_rect_2d_simple_tex( width, height );
-                                        mCachedProcessedImageGL->unbindTexture(0, GL_TEXTURE_2D);
+                                        mCachedProcessedImageGL->createGLTexture(0, mStaticImageRaw);
+                                        mNeedsCreateTexture = FALSE;
+                                        
+                                        gGL.getTexUnit(0)->bind(mCachedProcessedImageGL);
+                                        mCachedProcessedImageGL->setClamp(TRUE, TRUE);
                                 }
+
+                                LLGLSNoAlphaTest gls_no_alpha_test;
+                                gGL.getTexUnit(0)->bind(mCachedProcessedImageGL);
+                                gl_rect_2d_simple_tex( width, height );
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                                 stop_glerror();
                         }
                 }
@@ -2086,7 +2068,8 @@ BOOL LLTexLayerParamAlpha::render( S32 x, S32 y, S32 width, S32 height )
         }
         else
         {
-                LLGLSNoTextureNoAlphaTest gls_no_texture_no_alpha_test;
+                LLGLDisable no_alpha(GL_ALPHA_TEST);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4f( 0.f, 0.f, 0.f, effective_weight );
                 gl_rect_2d_simple( width, height );
         }
@@ -2519,7 +2502,7 @@ LLImageGL* LLTexStaticImageList::getImageGL(const std::string& file_name, BOOL i
                         }
                         image_gl->createGLTexture(0, image_raw);
 
-                        image_gl->bind();
+                        gGL.getTexUnit(0)->bind(image_gl);
                         image_gl->setClamp(TRUE, TRUE);
 
                         mStaticImageListGL [ namekey ] = image_gl;
@@ -2559,68 +2542,3 @@ LLMaskedMorph::LLMaskedMorph( LLPolyMorphTarget *morph_target, BOOL invert ) : m
         morph_target->addPendingMorphMask();
 }
 
-
-//-----------------------------------------------------------------------------
-// LLGradientPaletteList
-//-----------------------------------------------------------------------------
-
-LLGradientPaletteList::~LLGradientPaletteList()
-{
-        // Note: can't just call deleteAllData() because the data values are arrays.
-        for( palette_map_t::iterator iter = mPaletteMap.begin();
-                 iter != mPaletteMap.end(); iter++ )
-        {
-                U8* data = iter->second;
-                delete []data;
-        }
-}
-
-void LLGradientPaletteList::initPalette(F32 domain)
-{
-        palette_map_t::iterator iter = mPaletteMap.find( domain );
-        if( iter == mPaletteMap.end() )
-        {
-                U8 *palette = new U8[512 * 4];
-                mPaletteMap[domain] = palette;
-                S32 ramp_start = 255 - llfloor(domain * 255.f);
-                S32 ramp_end = 255;
-                F32 ramp_factor = (ramp_end == ramp_start) ? 0.f : (255.f / ((F32)ramp_end - (F32)ramp_start));
-
-                // *TODO: move conditionals outside of loop, since this really
-                // is just a sequential process.
-                for (S32 i = 0; i < 512; i++)
-                {
-                        palette[(i * 4) + 1] = 0;
-                        palette[(i * 4) + 2] = 0;
-                        if (i <= ramp_start)
-                        {
-                                palette[(i * 4)] = 0;
-                                palette[(i * 4) + 3] = 0;
-                        }
-                        else if (i < ramp_end)
-                        {
-                                palette[(i * 4)] = llfloor(((F32)i - (F32)ramp_start) * ramp_factor);
-                                palette[(i * 4) + 3] = llfloor(((F32)i - (F32)ramp_start) * ramp_factor);
-                        }
-                        else
-                        {
-                                palette[(i * 4)] = 255;
-                                palette[(i * 4) + 3] = 255;
-                        }
-                }
-        }
-}
-
-void LLGradientPaletteList::setHardwarePalette( F32 domain, F32 effective_weight )
-{
-        palette_map_t::iterator iter = mPaletteMap.find( domain );
-        if( iter != mPaletteMap.end() )
-        {
-                U8* palette = iter->second;
-                set_palette( palette + llfloor(effective_weight * (255.f * (1.f - domain))) * 4);
-        }
-        else
-        {
-                llwarns << "LLGradientPaletteList::setHardwarePalette() missing domain " << domain << llendl;
-        }
-}
diff --git a/linden/indra/newview/lltexlayer.h b/linden/indra/newview/lltexlayer.h
index 742b484..69132fe 100644
--- a/linden/indra/newview/lltexlayer.h
+++ b/linden/indra/newview/lltexlayer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -211,9 +211,8 @@ public:
         virtual void                    postRender(BOOL success);
         virtual BOOL                    render();
         BOOL                                    updateImmediate();
-        virtual void                    bindTexture();
         void                                    bindBumpTexture( U32 stage );
-        BOOL                                    isInitialized()                                                 { return mInitialized; }  // Initialized here means that we've done at least one render
+        bool                                    isInitialized(void) const;
         BOOL                                    needsRender();
         void                                    requestUpdate();
         void                                    requestUpload();
@@ -221,23 +220,28 @@ public:
         BOOL                                    uploadPending() { return mUploadPending; }
         BOOL                                    render( S32 x, S32 y, S32 width, S32 height );
         void                                    readBackAndUpload(U8* baked_bump_data);
+        void                    createBumpTexture() ;
+
         static void                             onTextureUploadComplete( const LLUUID& uuid,
                                                                                                          void* userdata,
                                                                                                          S32 result, LLExtStat ext_status);
         static void                             dumpTotalByteCount();
 
+        virtual void restoreGLTexture() ;
+        virtual void destroyGLTexture() ;
+
 private:
         void                                    pushProjection();
         void                                    popProjection();
 
 private:
+        BOOL                    mHasBump ;
         BOOL                                    mNeedsUpdate;
         BOOL                                    mNeedsUpload;
         BOOL                                    mUploadPending;
         LLUUID                                  mUploadID;              // Identifys the current upload process (null if none).  Used to avoid overlaps (eg, when the user rapidly makes two changes outside of Face Edit)
         LLTexLayerSet*                  mTexLayerSet;
-        BOOL                                    mInitialized;
-        LLGLuint                                mBumpTexName;   // zero if none
+        LLPointer<LLImageGL>    mBumpTex;       // zero if none
 
         static S32                              sGLByteCount;
         static S32                              sGLBumpByteCount;
@@ -529,41 +533,6 @@ public:
 };
 
 
-//-----------------------------------------------------------------------------
-// LLGradientPaletteList
-// A static set of ramp grayscale palettes.  The "effective_weight" is used 
-// to determine the x position of the ramp (offset)
-//
-// "Domain" isn't really the right word.  It refers to the width of the 
-// ramp portion of the function that relates input and output pixel values.
-// A domain of 0 gives a step function.
-// 
-//   |                      /----------------
-//  O|                     / |
-//  u|                    /  |
-//  t|                   /   |
-//  p|------------------/    |
-//  u|                  |    | 
-//  t|<---------------->|<-->|
-//   |  "offset"         "domain"
-//   |
-// --+---Input--------------------------------
-//   |
-//-----------------------------------------------------------------------------
-class LLGradientPaletteList
-{
-public:
-        LLGradientPaletteList() {}
-        ~LLGradientPaletteList();
-
-        void             initPalette(F32 domain);
-        void             setHardwarePalette(F32 domain, F32 effective_weight);
-        
-private:
-        typedef std::map<F32, U8*> palette_map_t;
-        palette_map_t           mPaletteMap;
-};
-
 // Used by LLTexLayerSetBuffer for a callback.
 class LLBakedUploadData
 {
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 8044859..ec5cf78 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index b5abb67..8089ae1 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 6b84be4..be0b8eb 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -479,9 +479,9 @@ void LLFloaterTexturePicker::draw()
                 LLRect local_rect = getLocalRect();
                 if (gFocusMgr.childHasKeyboardFocus(this) && mOwner->isInVisibleChain() && mContextConeOpacity > 0.001f)
                 {
-                        LLGLSNoTexture no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLGLEnable(GL_CULL_FACE);
-                        gGL.begin(LLVertexBuffer::QUADS);
+                        gGL.begin(LLRender::QUADS);
                         {
                                 gGL.color4f(0.f, 0.f, 0.f, CONTEXT_CONE_IN_ALPHA * mContextConeOpacity);
                                 gGL.vertex2i(owner_rect.mLeft, owner_rect.mTop);
diff --git a/linden/indra/newview/lltexturectrl.h b/linden/indra/newview/lltexturectrl.h
index 24cde30..34623d4 100644
--- a/linden/indra/newview/lltexturectrl.h
+++ b/linden/indra/newview/lltexturectrl.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 80b8b4d..24046cc 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -562,6 +562,14 @@ bool LLTextureFetchWorker::doWork(S32 param)
         {
                 mFetchTimer.reset();
         }
+
+        if (mImagePriority <= 0.0f)
+        {
+                if (mState < WRITE_TO_CACHE)
+                {
+                        return true; // cancel request
+                }
+        }
         
         if (mState == INIT)
         {
@@ -708,7 +716,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
                         mFetcher->lockQueue();
                         mFetcher->removeFromNetworkQueue(this);
                         mFetcher->unlockQueue();
-                        if (!mFormattedImage->getDataSize())
+                        if (mFormattedImage.isNull() || !mFormattedImage->getDataSize())
                         {
                                 // processSimulatorPackets() failed
 //                              llwarns << "processSimulatorPackets() failed to load buffer" << llendl;
@@ -1050,17 +1058,22 @@ void LLTextureFetchWorker::removeFromCache()
 
 bool LLTextureFetchWorker::processSimulatorPackets()
 {
+        if (mFormattedImage.isNull() || mRequestedSize < 0)
+        {
+                // not sure how we got here, but not a valid state, abort!
+                mFormattedImage = NULL;
+                return true;
+        }
+        
         if (mLastPacket >= mFirstPacket)
         {
-                llassert_always(mFormattedImage) ;
                 S32 buffer_size = mFormattedImage->getDataSize();
                 for (S32 i = mFirstPacket; i<=mLastPacket; i++)
                 {
-                        llassert_always(mPackets[i]) ;
+                        llassert_always(mPackets[i]);
                         buffer_size += mPackets[i]->mSize;
                 }
                 bool have_all_data = mLastPacket >= mTotalPackets-1;
-                llassert_always(mRequestedSize > 0);
                 if (buffer_size >= mRequestedSize || have_all_data)
                 {
                         /// We have enough (or all) data
@@ -1227,7 +1240,12 @@ void LLTextureFetchWorker::callbackDecoded(bool success)
 
 bool LLTextureFetchWorker::decodeImage()
 {
-        llassert_always(mImageWorker);
+        if(!mImageWorker)
+        {
+                //LLTextureFetchWorker is aborted, skip image decoding.
+                return true ;
+        }
+
         bool res = true;
         if (mRawImage.isNull())
         {
@@ -1641,7 +1659,7 @@ void LLTextureFetch::sendRequestListToSimulators()
                                 S32 packet = req->mLastPacket + 1;
                                 gMessageSystem->nextBlockFast(_PREHASH_RequestImage);
                                 gMessageSystem->addUUIDFast(_PREHASH_Image, req->mID);
-                                gMessageSystem->addS8Fast(_PREHASH_DiscardLevel, (S8)req->mSimRequestedDiscard);
+                                gMessageSystem->addS8Fast(_PREHASH_DiscardLevel, (S8)req->mDesiredDiscard);
                                 gMessageSystem->addF32Fast(_PREHASH_DownloadPriority, req->mImagePriority);
                                 gMessageSystem->addU32Fast(_PREHASH_Packet, packet);
                                 gMessageSystem->addU8Fast(_PREHASH_Type, req->mType);
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 6c7f6ba..9f12c07 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index 49bc968..14f62dd 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -162,7 +162,7 @@ void LLTextureBar::draw()
         {
                 color = LLColor4::magenta;
         }
-        else if (mImagep->getDecodePriority() == 0.0f)
+        else if (mImagep->getDecodePriority() <= 0.0f)
         {
                 color = LLColor4::grey; color[VALPHA] = .7f;
         }
@@ -247,7 +247,7 @@ void LLTextureBar::draw()
         LLFontGL::sMonospace->renderUTF8(fetch_state_desc[state].desc, 0, title_x2, getRect().getHeight(),
                                                                          fetch_state_desc[state].color,
                                                                          LLFontGL::LEFT, LLFontGL::TOP);
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         // Draw the progress bar.
         S32 bar_width = 100;
@@ -383,9 +383,9 @@ private:
 
 void LLGLTexMemBar::draw()
 {
-        S32 bound_mem = LLViewerImage::sBoundTextureMemory;
+        S32 bound_mem = (LLViewerImage::sBoundTextureMemory >> 20);
         S32 max_bound_mem = LLViewerImage::sMaxBoundTextureMem;
-        S32 total_mem = LLViewerImage::sTotalTextureMemory;
+        S32 total_mem = (LLViewerImage::sTotalTextureMemory >> 20);
         S32 max_total_mem = LLViewerImage::sMaxTotalTextureMem;
         F32 discard_bias = LLViewerImage::sDesiredDiscardBias;
         S32 line_height = (S32)(LLFontGL::sMonospace->getLineHeight() + .5f);
@@ -396,10 +396,10 @@ void LLGLTexMemBar::draw()
         
         std::string text;
         text = llformat("GL Tot: %d/%d MB Bound: %d/%d MB Discard Bias: %.2f",
-                                        total_mem/(1024*1024),
-                                        max_total_mem/(1024*1024),
-                                        bound_mem/(1024*1024),
-                                        max_bound_mem/(1024*1024),
+                                        total_mem,
+                                        max_total_mem,
+                                        bound_mem,
+                                        max_bound_mem,
                                         discard_bias);
 
         LLFontGL::sMonospace->renderUTF8(text, 0, 0, line_height*3,
@@ -415,7 +415,7 @@ void LLGLTexMemBar::draw()
 
         F32 bar_scale = (F32)bar_width / (max_bound_mem * 1.5f);
         
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
         gGL.color4f(0.5f, 0.5f, 0.5f, 0.75f);
         gl_rect_2d(left, top, right, bottom);
@@ -612,6 +612,7 @@ void LLTextureView::draw()
                         {
                                 pri = imagep->getDecodePriority();
                         }
+                        pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f);
                         
                         if (sDebugImages.find(imagep) != sDebugImages.end())
                         {
diff --git a/linden/indra/newview/lltextureview.h b/linden/indra/newview/lltextureview.h
index fd4b80d..969f5c6 100644
--- a/linden/indra/newview/lltextureview.h
+++ b/linden/indra/newview/lltextureview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index cb0d3b1..99dbe31 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -42,6 +42,7 @@
 #include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
+#include "llviewerjoystick.h"
 
 extern BOOL gDebugClicks;
 
@@ -160,6 +161,11 @@ BOOL LLTool::handleKey(KEY key, MASK mask)
 
 LLTool* LLTool::getOverrideTool(MASK mask)
 {
+        // NOTE: if in flycam mode, ALT-ZOOM camera should be disabled
+        if (LLViewerJoystick::getInstance()->getOverrideCamera())
+        {
+                return NULL;
+        }
         if (mask & MASK_ALT)
         {
                 return LLToolCamera::getInstance();
diff --git a/linden/indra/newview/lltool.h b/linden/indra/newview/lltool.h
index 2cc4ec2..cf97fb4 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 98ad5ff..8202191 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolbar.h b/linden/indra/newview/lltoolbar.h
index be0e1b4..720b9c0 100644
--- a/linden/indra/newview/lltoolbar.h
+++ b/linden/indra/newview/lltoolbar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 214d773..46b36d9 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -491,7 +491,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
                                                                         const LLVector3& pos_world)
 {
         glMatrixMode(GL_MODELVIEW);
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest mDepthTest(GL_TRUE);
         glPushMatrix();
         gGL.color4fv(OVERLAY_COLOR.mV);
@@ -503,7 +503,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
         S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
         F32 force = gSavedSettings.getF32("LandBrushForce"); // .1 to 100?
         
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
         for(S32 di = -half_edge; di <= half_edge; di++)
         {
                 if((i+di) < 0 || (i+di) >= (S32)land.mGridsPerEdge) continue;
diff --git a/linden/indra/newview/lltoolbrush.h b/linden/indra/newview/lltoolbrush.h
index 0ba6db4..8df4b67 100644
--- a/linden/indra/newview/lltoolbrush.h
+++ b/linden/indra/newview/lltoolbrush.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 26f0bac..1453d51 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 0fd13fe..3718227 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 72ee24b..efd8060 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltooldraganddrop.h b/linden/indra/newview/lltooldraganddrop.h
index 7e96b81..38e8161 100644
--- a/linden/indra/newview/lltooldraganddrop.h
+++ b/linden/indra/newview/lltooldraganddrop.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 0ebb2c3..d5e4f81 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolface.h b/linden/indra/newview/lltoolface.h
index b9ce9a5..25c0618 100644
--- a/linden/indra/newview/lltoolface.h
+++ b/linden/indra/newview/lltoolface.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index ffc1766..6141567 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolfocus.h b/linden/indra/newview/lltoolfocus.h
index a09cc52..31eb3a7 100644
--- a/linden/indra/newview/lltoolfocus.h
+++ b/linden/indra/newview/lltoolfocus.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index 5eb688b..a6695f9 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolgrab.h b/linden/indra/newview/lltoolgrab.h
index 03cbcaf..d6ebde5 100644
--- a/linden/indra/newview/lltoolgrab.h
+++ b/linden/indra/newview/lltoolgrab.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolgun.cpp b/linden/indra/newview/lltoolgun.cpp
index f63e554..6d70675 100644
--- a/linden/indra/newview/lltoolgun.cpp
+++ b/linden/indra/newview/lltoolgun.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolgun.h b/linden/indra/newview/lltoolgun.h
index af8eed8..a26b896 100644
--- a/linden/indra/newview/lltoolgun.h
+++ b/linden/indra/newview/lltoolgun.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolindividual.cpp b/linden/indra/newview/lltoolindividual.cpp
index 219858d..68b0f73 100644
--- a/linden/indra/newview/lltoolindividual.cpp
+++ b/linden/indra/newview/lltoolindividual.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolindividual.h b/linden/indra/newview/lltoolindividual.h
index c0e3116..a73d664 100644
--- a/linden/indra/newview/lltoolindividual.h
+++ b/linden/indra/newview/lltoolindividual.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 89407f7..e454f62 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolmgr.h b/linden/indra/newview/lltoolmgr.h
index 10affff..08b2bd0 100644
--- a/linden/indra/newview/lltoolmgr.h
+++ b/linden/indra/newview/lltoolmgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 2fbf4ae..a23b4ce 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -240,6 +240,7 @@ BOOL LLVisualParamHint::render()
         }
         avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
         gGL.color4f(1,1,1,1);
+        mTexture->setGLTextureCreated(true);
         return TRUE;
 }
 
@@ -251,12 +252,12 @@ void LLVisualParamHint::draw()
 {
         if (!mIsVisible) return;
 
-        bindTexture();
+        gGL.getTexUnit(0)->bind(getTexture());
 
         gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
         LLGLSUIDefault gls_ui;
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 gGL.texCoord2i(0, 1);
                 gGL.vertex2i(0, mHeight);
@@ -269,7 +270,7 @@ void LLVisualParamHint::draw()
         }
         gGL.end();
 
-        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/lltoolmorph.h b/linden/indra/newview/lltoolmorph.h
index dbb2744..cd1c959 100644
--- a/linden/indra/newview/lltoolmorph.h
+++ b/linden/indra/newview/lltoolmorph.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolobjpicker.cpp b/linden/indra/newview/lltoolobjpicker.cpp
index 401c6c6..60278cb 100644
--- a/linden/indra/newview/lltoolobjpicker.cpp
+++ b/linden/indra/newview/lltoolobjpicker.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolobjpicker.h b/linden/indra/newview/lltoolobjpicker.h
index 63e272c..31fe812 100644
--- a/linden/indra/newview/lltoolobjpicker.h
+++ b/linden/indra/newview/lltoolobjpicker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 63b6e34..c0d53b9 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h
index f336001..62e0a7a 100644
--- a/linden/indra/newview/lltoolpie.h
+++ b/linden/indra/newview/lltoolpie.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolpipette.cpp b/linden/indra/newview/lltoolpipette.cpp
index 5bafc0a..b59ee92 100644
--- a/linden/indra/newview/lltoolpipette.cpp
+++ b/linden/indra/newview/lltoolpipette.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolpipette.h b/linden/indra/newview/lltoolpipette.h
index bb50f49..f526796 100644
--- a/linden/indra/newview/lltoolpipette.h
+++ b/linden/indra/newview/lltoolpipette.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 30347be..dda21dd 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -224,8 +224,8 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         // Play creation sound
         if (gAudiop)
         {
-                F32 volume = gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI");
-                gAudiop->triggerSound( LLUUID(gSavedSettings.getString("UISndObjectCreate")), gAgent.getID(), volume);
+                gAudiop->triggerSound( LLUUID(gSavedSettings.getString("UISndObjectCreate")),
+                                                           gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
         }
 
         gMessageSystem->newMessageFast(_PREHASH_ObjectAdd);
diff --git a/linden/indra/newview/lltoolplacer.h b/linden/indra/newview/lltoolplacer.h
index 7c3db8c..f920101 100644
--- a/linden/indra/newview/lltoolplacer.h
+++ b/linden/indra/newview/lltoolplacer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index d2f23ab..b4e9562 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolselect.h b/linden/indra/newview/lltoolselect.h
index d3b86f5..2ce3bf3 100644
--- a/linden/indra/newview/lltoolselect.h
+++ b/linden/indra/newview/lltoolselect.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolselectland.cpp b/linden/indra/newview/lltoolselectland.cpp
index 98d0d02..68850d0 100644
--- a/linden/indra/newview/lltoolselectland.cpp
+++ b/linden/indra/newview/lltoolselectland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolselectland.h b/linden/indra/newview/lltoolselectland.h
index 19a86b7..a8a1dc8 100644
--- a/linden/indra/newview/lltoolselectland.h
+++ b/linden/indra/newview/lltoolselectland.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolselectrect.cpp b/linden/indra/newview/lltoolselectrect.cpp
index 26d9756..942f3dd 100644
--- a/linden/indra/newview/lltoolselectrect.cpp
+++ b/linden/indra/newview/lltoolselectrect.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -175,7 +175,7 @@ void LLToolSelectRect::draw()
                 {
                         gGL.color4f(1.f, 1.f, 0.f, 1.f);
                 }
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gl_rect_2d(
                         llmin(mDragStartX, mDragEndX),
                         llmax(mDragStartY, mDragEndY),
diff --git a/linden/indra/newview/lltoolselectrect.h b/linden/indra/newview/lltoolselectrect.h
index 07310ae..181b16c 100644
--- a/linden/indra/newview/lltoolselectrect.h
+++ b/linden/indra/newview/lltoolselectrect.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolview.cpp b/linden/indra/newview/lltoolview.cpp
index 561147b..e3989cd 100644
--- a/linden/indra/newview/lltoolview.cpp
+++ b/linden/indra/newview/lltoolview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltoolview.h b/linden/indra/newview/lltoolview.h
index 80c9346..c909331 100644
--- a/linden/indra/newview/lltoolview.h
+++ b/linden/indra/newview/lltoolview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 8572283..bd2f659 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -445,7 +445,7 @@ void draw_shockwave(F32 center_z, F32 t, S32 steps, LLColor4 color)
         F32 y = 0.f;
 
         LLColor4 ccol = LLColor4(1,1,1,(1.f-t)*0.25f);
-        gGL.begin(LLVertexBuffer::TRIANGLE_FAN);
+        gGL.begin(LLRender::TRIANGLE_FAN);
         gGL.color4fv(ccol.mV);
         gGL.vertex3f(0.f, 0.f, center_z);
         // make sure circle is complete
@@ -494,7 +494,8 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
 
         LLVector3 pos_agent = gAgent.getPosAgentFromGlobal(pos_global);
 
-        LLGLSTracker gls_tracker; // default - TEXTURE + CULL_FACE + LIGHTING + GL_BLEND + GL_ALPHA_TEST
+        LLGLSTracker gls_tracker; // default+ CULL_FACE + LIGHTING + GL_BLEND + GL_ALPHA_TEST
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDisable cull_face(GL_CULL_FACE);
         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
         
@@ -535,7 +536,7 @@ void LLTracker::renderBeacon(LLVector3d pos_global,
                         an *= 2.f;
                         an += 1.0f+dr;
                 
-                        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                        gGL.begin(LLRender::TRIANGLE_STRIP);
                         gGL.color4fv(col_edge.mV);
                         gGL.vertex3f(-x*a, -y*a, z);
                         gGL.color4fv(col_edge_next.mV);
diff --git a/linden/indra/newview/lltracker.h b/linden/indra/newview/lltracker.h
index 756bc18..025b63e 100644
--- a/linden/indra/newview/lltracker.h
+++ b/linden/indra/newview/lltracker.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltrans.cpp b/linden/indra/newview/lltrans.cpp
index 9a90112..f4daf55 100644
--- a/linden/indra/newview/lltrans.cpp
+++ b/linden/indra/newview/lltrans.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lltrans.h b/linden/indra/newview/lltrans.h
index b127471..f752f1e 100644
--- a/linden/indra/newview/lltrans.h
+++ b/linden/indra/newview/lltrans.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lluiconstants.h b/linden/indra/newview/lluiconstants.h
index b3b9297..14e7a81 100644
--- a/linden/indra/newview/lluiconstants.h
+++ b/linden/indra/newview/lluiconstants.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lluploaddialog.cpp b/linden/indra/newview/lluploaddialog.cpp
index 3cceea8..b046be9 100644
--- a/linden/indra/newview/lluploaddialog.cpp
+++ b/linden/indra/newview/lluploaddialog.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lluploaddialog.h b/linden/indra/newview/lluploaddialog.h
index 130eff5..8b6a216 100644
--- a/linden/indra/newview/lluploaddialog.h
+++ b/linden/indra/newview/lluploaddialog.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurl.cpp b/linden/indra/newview/llurl.cpp
index c4b84c3..e51d80c 100644
--- a/linden/indra/newview/llurl.cpp
+++ b/linden/indra/newview/llurl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurl.h b/linden/indra/newview/llurl.h
index 7aae048..d158e5a 100644
--- a/linden/indra/newview/llurl.h
+++ b/linden/indra/newview/llurl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index d574ea1..bbc5c75 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurldispatcher.h b/linden/indra/newview/llurldispatcher.h
index dd6ffb4..68bd841 100644
--- a/linden/indra/newview/llurldispatcher.h
+++ b/linden/indra/newview/llurldispatcher.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index c10add4..2092b0c 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlhistory.h b/linden/indra/newview/llurlhistory.h
index df97e19..2bffb5a 100644
--- a/linden/indra/newview/llurlhistory.h
+++ b/linden/indra/newview/llurlhistory.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlsimstring.cpp b/linden/indra/newview/llurlsimstring.cpp
index 03c6f84..6f1baed 100644
--- a/linden/indra/newview/llurlsimstring.cpp
+++ b/linden/indra/newview/llurlsimstring.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlsimstring.h b/linden/indra/newview/llurlsimstring.h
index a1c3bfc..606a727 100644
--- a/linden/indra/newview/llurlsimstring.h
+++ b/linden/indra/newview/llurlsimstring.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlwhitelist.cpp b/linden/indra/newview/llurlwhitelist.cpp
index a3d401b..b53f60d 100644
--- a/linden/indra/newview/llurlwhitelist.cpp
+++ b/linden/indra/newview/llurlwhitelist.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llurlwhitelist.h b/linden/indra/newview/llurlwhitelist.h
index 3e796f4..516049a 100644
--- a/linden/indra/newview/llurlwhitelist.h
+++ b/linden/indra/newview/llurlwhitelist.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index a9b00e1..968d489 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -324,17 +324,29 @@ static void parseOptionInto(
                 while(opt)
                 {
                         key.assign(XMLRPC_GetValueID(opt));
-                        //llinfos "option key: " << key << llendl;
+                        //llinfos << "option key: " << key << llendl;
                         type = XMLRPC_GetValueTypeEasy(opt);
                         if(xmlrpc_type_string == type)
                         {
                                 val.assign(XMLRPC_GetValueString(opt));
+                                //llinfos << "string val: " << val << llendl;
                         }
                         else if(xmlrpc_type_int == type)
                         {
                                 val = llformat("%d", XMLRPC_GetValueInt(opt));
+                                //llinfos << "int val: " << val << llendl;
                         }
-                        //llinfos "option val: " << val << llendl;
+                        else if(xmlrpc_type_double == type)
+                        {
+                                val = llformat("%g", XMLRPC_GetValueDouble(opt));
+                                //llinfos << "double val: " << val << llendl;
+                        }
+                        else
+                        {       // Can't understand the type
+                                val = "???";
+                                //llinfos << "unknown value type: " << type << llendl;
+                        }
+
                         responses.insert(LLUserAuth::response_t::value_type(key, val));
                         opt = XMLRPC_VectorNext(row);
                 }
diff --git a/linden/indra/newview/lluserauth.h b/linden/indra/newview/lluserauth.h
index 14321b7..7a15ff6 100644
--- a/linden/indra/newview/lluserauth.h
+++ b/linden/indra/newview/lluserauth.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvectorperfoptions.cpp b/linden/indra/newview/llvectorperfoptions.cpp
index bb2ef99..e212483 100644
--- a/linden/indra/newview/llvectorperfoptions.cpp
+++ b/linden/indra/newview/llvectorperfoptions.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvectorperfoptions.h b/linden/indra/newview/llvectorperfoptions.h
index 623cca6..fa0ae8b 100644
--- a/linden/indra/newview/llvectorperfoptions.h
+++ b/linden/indra/newview/llvectorperfoptions.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvelocitybar.cpp b/linden/indra/newview/llvelocitybar.cpp
index e8b9a74..eacfd78 100644
--- a/linden/indra/newview/llvelocitybar.cpp
+++ b/linden/indra/newview/llvelocitybar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,7 +63,7 @@ void LLVelocityBar::draw()
         //  Set bar color 
         //
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         // draw background box
         // gGL.color4f(0.f, 0.f, 0.f, 0.3f);
diff --git a/linden/indra/newview/llvelocitybar.h b/linden/indra/newview/llvelocitybar.h
index 667ae1c..9c8221f 100644
--- a/linden/indra/newview/llvelocitybar.h
+++ b/linden/indra/newview/llvelocitybar.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewchildren.cpp b/linden/indra/newview/llviewchildren.cpp
index f96915b..2fdf434 100644
--- a/linden/indra/newview/llviewchildren.cpp
+++ b/linden/indra/newview/llviewchildren.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewchildren.h b/linden/indra/newview/llviewchildren.h
index f3d1560..3608a7e 100644
--- a/linden/indra/newview/llviewchildren.h
+++ b/linden/indra/newview/llviewchildren.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp
index 03e5b40..60a67d8 100644
--- a/linden/indra/newview/llviewerassetstorage.cpp
+++ b/linden/indra/newview/llviewerassetstorage.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,9 +29,9 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
 
 #include "linden_common.h"
-#include "llviewerprecompiledheaders.h"
 
 #include "llagent.h"
 #include "llviewerassetstorage.h"
diff --git a/linden/indra/newview/llviewerassetstorage.h b/linden/indra/newview/llviewerassetstorage.h
index f606098..bec72ff 100644
--- a/linden/indra/newview/llviewerassetstorage.h
+++ b/linden/indra/newview/llviewerassetstorage.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index bc25649..fb0c59e 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -141,6 +141,14 @@ void audio_update_volume(bool force_update)
                 {
                         audio_update_wind(true);
                 }
+
+                // handle secondary gains
+                gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_SFX,
+                                                                  gSavedSettings.getBOOL("MuteSounds") ? 0.f : gSavedSettings.getF32("AudioLevelSFX"));
+                gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_UI,
+                                                                  gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI"));
+                gAudiop->setSecondaryGain(LLAudioEngine::AUDIO_TYPE_AMBIENT,
+                                                                  gSavedSettings.getBOOL("MuteAmbient") ? 0.f : gSavedSettings.getF32("AudioLevelAmbient"));
         }
 
         // Streaming Music
diff --git a/linden/indra/newview/llvieweraudio.h b/linden/indra/newview/llvieweraudio.h
index b4a299c..8bb24a7 100644
--- a/linden/indra/newview/llvieweraudio.h
+++ b/linden/indra/newview/llvieweraudio.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerbuild.h b/linden/indra/newview/llviewerbuild.h
index 0d6a6dc..0179dc6 100644
--- a/linden/indra/newview/llviewerbuild.h
+++ b/linden/indra/newview/llviewerbuild.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 32d20a9..36cce35 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewercamera.h b/linden/indra/newview/llviewercamera.h
index 2672a46..d7e8dae 100644
--- a/linden/indra/newview/llviewercamera.h
+++ b/linden/indra/newview/llviewercamera.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index a8a3b16..aa092c7 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -569,9 +569,9 @@ void settings_setup_listeners()
         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));
+        gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
 }
diff --git a/linden/indra/newview/llviewercontrol.h b/linden/indra/newview/llviewercontrol.h
index 7892905..d200bc9 100644
--- a/linden/indra/newview/llviewercontrol.h
+++ b/linden/indra/newview/llviewercontrol.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 627609b..96591a2 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -113,7 +113,6 @@ void render_ui_3d();
 void render_ui_2d();
 void render_disconnected_background();
 void render_hud_elements();
-void process_keystrokes_async();
 
 void display_startup()
 {
@@ -248,10 +247,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 
         gViewerWindow->checkSettings();
         
-        LLAppViewer::instance()->pingMainloopTimeout("Display:Pick");
-        gViewerWindow->performPick();
+        {
+                LLFastTimer ftm(LLFastTimer::FTM_PICK);
+                LLAppViewer::instance()->pingMainloopTimeout("Display:Pick");
+                gViewerWindow->performPick();
+        }
         
-
         LLAppViewer::instance()->pingMainloopTimeout("Display:CheckStates");
         LLGLState::checkStates();
         LLGLState::checkTextureChannels();
@@ -373,6 +374,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         gAgent.setTeleportMessage(
                                 LLAgent::sTeleportProgressMessages["arriving"]);
                         gImageList.mForceResetTextureStats = TRUE;
+                        gAgent.resetView(TRUE, TRUE);
                         break;
 
                 case LLAgent::TELEPORT_ARRIVING:
@@ -680,7 +682,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                 }
 
-                LLAppViewer::instance()->pingMainloopTimeout("Display:Render");
+                LLAppViewer::instance()->pingMainloopTimeout("Display:RenderStart");
                 
                 //// render frontmost floater opaque for occlusion culling purposes
                 //LLFloater* frontmost_floaterp = gFloaterView->getFrontmost();
@@ -690,7 +692,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 //      glMatrixMode(GL_MODELVIEW);
                 //      glPushMatrix();
                 //      {
-                //              LLGLSNoTexture gls_no_texture;
+                //              gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 //              glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
                 //              glLoadIdentity();
@@ -726,10 +728,13 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
                         gGL.setColorMask(true, false);
                 }
-
+                
+                LLAppViewer::instance()->pingMainloopTimeout("Display:RenderGeom");
+                
                 if (!(LLAppViewer::instance()->logoutRequestSent() && LLAppViewer::instance()->hasSavedFinalSnapshot())
                                 && !gRestoreGL)
                 {
+
                         gGL.setColorMask(true, false);
                         LLPipeline::sUnderWaterRender = LLViewerCamera::getInstance()->cameraUnderWater() ? TRUE : FALSE;
                         gPipeline.renderGeom(*LLViewerCamera::getInstance(), TRUE);
@@ -744,9 +749,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         }
                         stop_glerror();
                 }
+
+                LLAppViewer::instance()->pingMainloopTimeout("Display:RenderFlush");            
                 
                 if (to_texture)
                 {
+
                         gPipeline.mScreen.flush();
                 }
 
@@ -755,23 +763,20 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                 /// Using render to texture would be faster/better, but I don't have a 
                 /// grasp of their full display stack just yet.
                 // gPostProcess->apply(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-
+                
+                LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI");
+                
                 if (!for_snapshot)
                 {
+                        gFrameStats.start(LLFrameStats::RENDER_UI);
                         render_ui();
                 }
 
                 LLSpatialGroup::sNoDelete = FALSE;
         }
-        gFrameStats.start(LLFrameStats::RENDER_UI);
-
-        if (gHandleKeysAsync)
-        {
-                LLAppViewer::instance()->pingMainloopTimeout("Display:Keystrokes");
-                process_keystrokes_async();
-                stop_glerror();
-        }
-
+        
+        LLAppViewer::instance()->pingMainloopTimeout("Display:FrameStats");
+        
         gFrameStats.start(LLFrameStats::MISC_END);
         stop_glerror();
 
@@ -997,8 +1002,8 @@ void render_ui()
 
 void renderCoordinateAxes()
 {
-        LLGLSNoTexture gls_no_texture;
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.begin(LLRender::LINES);
                 gGL.color3f(1.0f, 0.0f, 0.0f);   // i direction = X-Axis = red
                 gGL.vertex3f(0.0f, 0.0f, 0.0f);
                 gGL.vertex3f(2.0f, 0.0f, 0.0f);
@@ -1048,10 +1053,10 @@ void renderCoordinateAxes()
 void draw_axes() 
 {
         LLGLSUIDefault gls_ui;
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         // A vertical white line at origin
         LLVector3 v = gAgent.getPositionAgent();
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
                 gGL.color3f(1.0f, 1.0f, 1.0f); 
                 gGL.vertex3f(0.0f, 0.0f, 0.0f);
                 gGL.vertex3f(0.0f, 0.0f, 40.0f);
@@ -1194,7 +1199,7 @@ void render_disconnected_background()
                 raw->expandToPowerOfTwo();
                 gDisconnectedImagep->createGLTexture(0, raw);
                 gStartImageGL = gDisconnectedImagep;
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
 
         // Make sure the progress view always fills the entire window.
@@ -1213,10 +1218,10 @@ void render_disconnected_background()
                         const LLVector2& display_scale = gViewerWindow->getDisplayScale();
                         glScalef(display_scale.mV[VX], display_scale.mV[VY], 1.f);
 
-                        LLViewerImage::bindTexture(gDisconnectedImagep);
+                        gGL.getTexUnit(0)->bind(gDisconnectedImagep);
                         gGL.color4f(1.f, 1.f, 1.f, 1.f);
                         gl_rect_2d_simple_tex(width, height);
-                        LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 }
                 glPopMatrix();
         }
@@ -1227,43 +1232,3 @@ void display_cleanup()
 {
         gDisconnectedImagep = NULL;
 }
-
-void process_keystrokes_async()
-{
-#if LL_WINDOWS
-        MSG                     msg;
-        // look through all input messages, leaving them in the event queue
-        while( PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE | PM_NOYIELD))
-        {
-                // on first mouse message, break out
-                if (msg.message >= WM_MOUSEFIRST && 
-                        msg.message <= WM_MOUSELAST ||
-                        msg.message == WM_QUIT)
-                {
-                        break;
-                }
-
-                // this is a message we want to handle now, so remove it from the event queue
-                PeekMessage(&msg, NULL, msg.message, msg.message, PM_REMOVE | PM_NOYIELD);
-                //              if (msg.message == WM_KEYDOWN)
-                //              {
-                //                      llinfos << "Process async key down " << (U32)msg.wParam << llendl;
-                //              }
-                TranslateMessage(&msg);
-                DispatchMessage(&msg);
-        }
-
-        // Scan keyboard for movement keys.  Command keys and typing
-        // are handled by windows callbacks.  Don't do this until we're
-        // done initializing.  JC
-        if (gViewerWindow->mWindow->getVisible() 
-                && gViewerWindow->getActive()
-                && !gViewerWindow->mWindow->getMinimized()
-                && LLStartUp::getStartupState() == STATE_STARTED
-                && !gViewerWindow->getShowProgress()
-                && !gFocusMgr.focusLocked())
-        {
-                gKeyboard->scanKeyboard();
-        }
-#endif
-}
diff --git a/linden/indra/newview/llviewerdisplay.h b/linden/indra/newview/llviewerdisplay.h
index d4b36aa..3f954fd 100644
--- a/linden/indra/newview/llviewerdisplay.h
+++ b/linden/indra/newview/llviewerdisplay.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index c0c4592..8ee99be 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewergenericmessage.h b/linden/indra/newview/llviewergenericmessage.h
index b190009..27075e3 100644
--- a/linden/indra/newview/llviewergenericmessage.h
+++ b/linden/indra/newview/llviewergenericmessage.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index d99a3a8..6f18b7d 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewergesture.h b/linden/indra/newview/llviewergesture.h
index eccfc2a..9555ffd 100644
--- a/linden/indra/newview/llviewergesture.h
+++ b/linden/indra/newview/llviewergesture.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 0b70f51..33210cf 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -149,23 +149,13 @@ F32 texmem_middle_bound_scale = 0.925f;
 //static
 void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
 {
-        sBoundTextureMemory = LLImageGL::sBoundTextureMemory;
-        sTotalTextureMemory = LLImageGL::sGlobalTextureMemory;
-        sMaxBoundTextureMem = gImageList.getMaxResidentTexMem();
-        
-        sMaxTotalTextureMem = sMaxBoundTextureMem * 2;
-        if (sMaxBoundTextureMem > 64000000)
-        {
-                sMaxTotalTextureMem -= sMaxBoundTextureMem/4;
-        }
-        
-        if ((U32)sMaxTotalTextureMem > gSysMemory.getPhysicalMemoryClamped() - (U32)min_non_tex_system_mem)
-        {
-                sMaxTotalTextureMem = (S32)gSysMemory.getPhysicalMemoryClamped() - min_non_tex_system_mem;
-        }
-        
-        if (sBoundTextureMemory >= sMaxBoundTextureMem ||
-                sTotalTextureMemory >= sMaxTotalTextureMem)
+        sBoundTextureMemory = LLImageGL::sBoundTextureMemory;//in bytes
+        sTotalTextureMemory = LLImageGL::sGlobalTextureMemory;//in bytes
+        sMaxBoundTextureMem = gImageList.getMaxResidentTexMem();//in MB 
+        sMaxTotalTextureMem = gImageList.getMaxTotalTextureMem() ;//in MB
+
+        if ((sBoundTextureMemory >> 20) >= sMaxBoundTextureMem ||
+                (sTotalTextureMemory >> 20) >= sMaxTotalTextureMem)
         {
                 // If we are using more texture memory than we should,
                 // scale up the desired discard level
@@ -176,8 +166,8 @@ void LLViewerImage::updateClass(const F32 velocity, const F32 angular_velocity)
                 }
         }
         else if (sDesiredDiscardBias > 0.0f &&
-                         sBoundTextureMemory < sMaxBoundTextureMem*texmem_lower_bound_scale &&
-                         sTotalTextureMemory < sMaxTotalTextureMem*texmem_lower_bound_scale)
+                         (sBoundTextureMemory >> 20) < sMaxBoundTextureMem*texmem_lower_bound_scale &&
+                         (sTotalTextureMemory >> 20) < sMaxTotalTextureMem*texmem_lower_bound_scale)
         {
                 // If we are using less texture memory than we should,
                 // scale down the desired discard level
@@ -248,7 +238,6 @@ void LLViewerImage::init(bool firstinit)
         mTexelsPerImage = 64.f*64.f;
         mMaxVirtualSize = 0.f;
         mDiscardVirtualSize = 0.f;
-        mMaxCosAngle = -1.f;
         mRequestedDiscardLevel = -1;
         mRequestedDownloadPriority = 0.f;
         mFullyLoaded = FALSE;
@@ -432,20 +421,12 @@ BOOL LLViewerImage::createTexture(S32 usename/*= 0*/)
 
 //============================================================================
 
-void LLViewerImage::addTextureStats(F32 pixel_area,
-                                                                    F32 texel_area_ratio, // = 1.0
-                                                                    F32 cos_center_angle) const // = 1.0
+void LLViewerImage::addTextureStats(F32 virtual_size) const // = 1.0
 {
-        F32 virtual_size = pixel_area / texel_area_ratio;
         if (virtual_size > mMaxVirtualSize)
         {
                 mMaxVirtualSize = virtual_size;
         }
-        cos_center_angle = llclamp(cos_center_angle, -1.f, 1.f);
-        if (cos_center_angle > mMaxCosAngle)
-        {
-                mMaxCosAngle = cos_center_angle;
-        }
 }
 
 void LLViewerImage::resetTextureStats(BOOL zero)
@@ -453,12 +434,10 @@ void LLViewerImage::resetTextureStats(BOOL zero)
         if (zero)
         {
                 mMaxVirtualSize = 0.0f;
-                mMaxCosAngle = -1.0f;
         }
-        else if (getBoostLevel() != LLViewerImage::BOOST_SCULPTED) //don't decay sculpted prim textures
+        else
         {
                 mMaxVirtualSize -= mMaxVirtualSize * .10f; // decay by 5%/update
-                mMaxCosAngle = -1.0f;
         }
 }
 
@@ -477,7 +456,7 @@ void LLViewerImage::processTextureStats()
                 // If the image has not been significantly visible in a while, we don't want it
                 mDesiredDiscardLevel = llmin(mMinDesiredDiscardLevel, (S8)(MAX_DISCARD_LEVEL + 1));
         }
-        else if ((!mFullWidth && !mWidth)  || (!mFullHeight && !mHeight))
+        else if ((!mFullWidth && !getCurrentWidth())  || (!mFullHeight && !getCurrentHeight()))
         {
                 mDesiredDiscardLevel =  mMaxDiscardLevel;
         }
@@ -558,7 +537,7 @@ void LLViewerImage::processTextureStats()
                 if ((sDesiredDiscardBias > 0.0f) &&
                         (current_discard >= 0 && mDesiredDiscardLevel >= current_discard))
                 {
-                        if ( sBoundTextureMemory > sMaxBoundTextureMem*texmem_middle_bound_scale)
+                        if ( (sBoundTextureMemory >> 20) > sMaxBoundTextureMem*texmem_middle_bound_scale)
                         {
                                 // Limit the amount of GL memory bound each frame
                                 if (mDesiredDiscardLevel > current_discard)
@@ -566,7 +545,7 @@ void LLViewerImage::processTextureStats()
                                         increase_discard = TRUE;
                                 }
                         }
-                        if ( sTotalTextureMemory > sMaxTotalTextureMem*texmem_middle_bound_scale)
+                        if ( (sTotalTextureMemory >> 20) > sMaxTotalTextureMem*texmem_middle_bound_scale)
                         {
                                 // Only allow GL to have 2x the video card memory
                                 if (!getBoundRecently())
@@ -608,7 +587,7 @@ F32 LLViewerImage::calcDecodePriority()
         F32 priority;
         S32 cur_discard = getDiscardLevel();
         bool have_all_data = (cur_discard >= 0 && (cur_discard <= mDesiredDiscardLevel));
-        F32 pixel_priority = fsqrtf(mMaxVirtualSize) * (1.f + mMaxCosAngle);
+        F32 pixel_priority = fsqrtf(mMaxVirtualSize);
         const S32 MIN_NOT_VISIBLE_FRAMES = 30; // NOTE: this function is not called every frame
         mDecodeFrame++;
         if (pixel_priority > 0.f)
@@ -648,17 +627,12 @@ F32 LLViewerImage::calcDecodePriority()
                         return mDecodePriority;
                 }
         }
-        else if ((mBoostLevel == LLViewerImage::BOOST_SCULPTED) && !have_all_data)
-        {
-                // Sculpted images are small, treat them like they always have no data.
-                priority = 900000.f;
-        }
         else if (cur_discard < 0)
         {
-                // We don't have any data yet, so we don't know the size of the image, treat as 1024x1024
+                // We don't have any data yet, so we don't know the size of the image, treat as 32x32
 //              priority = 900000.f;
                 static const F64 log_2 = log(2.0);
-                F32 desired = (F32)(log(1024.0/pixel_priority) / log_2);
+                F32 desired = (F32)(log(32.0/pixel_priority) / log_2);
                 S32 ddiscard = MAX_DISCARD_LEVEL - (S32)desired + 1;
                 ddiscard = llclamp(ddiscard, 1, 9);
                 priority = ddiscard*100000.f;
@@ -712,14 +686,7 @@ F32 LLViewerImage::maxDecodePriority()
 void LLViewerImage::setDecodePriority(F32 priority)
 {
         llassert(!mInImageList);
-        if (priority < 0.0f)
-        {
-                mDecodePriority = calcDecodePriority();
-        }
-        else
-        {
-                mDecodePriority = priority;
-        }
+        mDecodePriority = priority;
 }
 
 void LLViewerImage::setBoostLevel(S32 level)
@@ -776,6 +743,7 @@ bool LLViewerImage::updateFetch()
         S32 current_discard = getDiscardLevel();
         S32 desired_discard = getDesiredDiscardLevel();
         F32 decode_priority = getDecodePriority();
+        decode_priority = llmax(decode_priority, 0.0f);
         
         if (mIsFetching)
         {
@@ -793,7 +761,7 @@ bool LLViewerImage::updateFetch()
                 else
                 {
                         mFetchState = LLAppViewer::getTextureFetch()->getFetchState(mID, mDownloadProgress, mRequestedDownloadPriority,
-                                                                                                           mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
+                                                                                                                                                mFetchPriority, mFetchDeltaTime, mRequestDeltaTime);
                 }
                 
                 // We may have data ready regardless of whether or not we are finished (e.g. waiting on write)
@@ -827,7 +795,7 @@ bool LLViewerImage::updateFetch()
                 
                 if (!mIsFetching)
                 {
-                        if (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL)
+                        if ((decode_priority > 0) && (mRawDiscardLevel < 0 || mRawDiscardLevel == INVALID_DISCARD_LEVEL))
                         {
                                 // We finished but received no data
                                 if (current_discard < 0)
@@ -850,9 +818,9 @@ bool LLViewerImage::updateFetch()
                                 destroyRawImage();
                         }
                 }
-                else if (mDecodePriority >= 0.f)
+                else
                 {
-                        LLAppViewer::getTextureFetch()->updateRequestPriority(mID, mDecodePriority);
+                        LLAppViewer::getTextureFetch()->updateRequestPriority(mID, decode_priority);
                 }
         }
 
@@ -1210,45 +1178,58 @@ void LLViewerImage::setKnownDrawSize(S32 width, S32 height)
 }
 
 // virtual
-BOOL LLViewerImage::bind(S32 stage) const
+bool LLViewerImage::bindError(S32 stage) const
 {
-        if (stage == -1)
+        if (stage < 0) return false;
+        
+        if (gNoRender)
         {
-                return TRUE;
+                return false;
         }
+
+        bool res = true;
         
-        if (gNoRender)
+        // On failure to bind, what should we set the currently bound texture to?
+        if (mIsMissingAsset && !sMissingAssetImagep.isNull() && (this != (LLImageGL *)sMissingAssetImagep))
         {
-                return true;
+                res = gGL.getTexUnit(stage)->bind(sMissingAssetImagep.get());
         }
-        BOOL res = bindTextureInternal(stage);
-        if (res)
+        if (!res && !sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
         {
-                //llassert_always(mIsMissingAsset == FALSE);
-                
+                // use default if we've got it
+                res = gGL.getTexUnit(stage)->bind(sDefaultImagep.get());
         }
-        else
+        if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
         {
-                // On failure to bind, what should we set the currently bound texture to?
-                if (mIsMissingAsset && !sMissingAssetImagep.isNull() && (this != (LLImageGL *)sMissingAssetImagep))
-                {
-                        res = sMissingAssetImagep->bind( stage );
-                }
-                if (!res && !sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
-                {
-                        // use default if we've got it
-                        res = sDefaultImagep->bind(stage);
-                }
-                if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
-                {
-                        res = sNullImagep->bind(stage);
-                }
-                if (!res)
-                {
-                        llwarns << "LLViewerImage::bindTexture failed." << llendl;
-                }
-                stop_glerror();
+                res = gGL.getTexUnit(stage)->bind(sNullImagep.get());
         }
+        if (!res)
+        {
+                llwarns << "LLViewerImage::bindError failed." << llendl;
+        }
+        stop_glerror();
+        return res;
+}
+
+bool LLViewerImage::bindDefaultImage(S32 stage) const
+{
+        if (stage < 0) return false;
+
+        bool res = true;
+        if (!sDefaultImagep.isNull() && (this != (LLImageGL *)sDefaultImagep))
+        {
+                // use default if we've got it
+                res = gGL.getTexUnit(stage)->bind(sDefaultImagep.get());
+        }
+        if (!res && !sNullImagep.isNull() && (this != (LLImageGL *)sNullImagep))
+        {
+                res = gGL.getTexUnit(stage)->bind(sNullImagep.get());
+        }
+        if (!res)
+        {
+                llwarns << "LLViewerImage::bindError failed." << llendl;
+        }
+        stop_glerror();
         return res;
 }
 
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index 60d9fb8..c735cb0 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -86,17 +86,6 @@ public:
         static LLViewerImage * getImage(const LLUUID &image_id);
                 // lightweight wrapper for gImageList.getImage()
 
-        static BOOL bindTexture(LLImageGL* image, const U32 stage = 0)
-        {
-                if (image)
-                {
-                        return image->bind(stage);
-                }
-                else
-                {
-                        return sDefaultImagep->bind(stage);
-                }
-        }
 
         struct Compare
         {
@@ -189,7 +178,8 @@ public:
 
         /*virtual*/ void dump();        // debug info to llinfos
 
-        /*virtual*/ BOOL bind(const S32 stage = 0) const;
+        /*virtual*/ bool bindError(const S32 stage = 0) const;
+        /*virtual*/ bool bindDefaultImage(const S32 stage = 0) const;
         
         void reinit(BOOL usemipmaps = TRUE);
 
@@ -197,27 +187,7 @@ public:
 
         // New methods for determining image quality/priority
         // texel_area_ratio is ("scaled" texel area)/(original texel area), approximately.
-        void addTextureStats(F32 pixel_area) const
-        {
-                mMaxCosAngle = 1.0f;
-                if (pixel_area > mMaxVirtualSize)
-                {
-                        mMaxVirtualSize = pixel_area;
-                }
-        }
-        void addTextureStats(F32 pixel_area,
-                                                 F32 texel_area_ratio) const
-        {
-                mMaxCosAngle = 1.0f;
-                F32 virtual_size = pixel_area / texel_area_ratio;
-                if (virtual_size > mMaxVirtualSize)
-                {
-                        mMaxVirtualSize = virtual_size;
-                }
-        }
-        void addTextureStats(F32 pixel_area,
-                                                 F32 texel_area_ratio,
-                                                 F32 cos_center_angle) const;
+        void addTextureStats(F32 virtual_size) const;
         void resetTextureStats(BOOL zero = FALSE);
 
         // Process image stats to determine priority/quality requirements.
@@ -314,7 +284,6 @@ public:
 
         // Data used for calculating required image priority/quality level/decimation
         mutable F32 mMaxVirtualSize;    // The largest virtual size of the image, in pixels - how much data to we need?
-        mutable F32 mMaxCosAngle;               // The largest cos of the angle between camera X vector and the object
 
         F32 mTexelsPerImage;                    // Texels per image.
         F32 mDiscardVirtualSize;                // Virtual size used to calculate desired discard
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index a79a76a..f6b1688 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -89,7 +89,8 @@ LLStat LLViewerImageList::sFormattedMemStat(32, TRUE);
 LLViewerImageList::LLViewerImageList() 
         : mForceResetTextureStats(FALSE),
         mUpdateStats(FALSE),
-        mMaxResidentTexMem(0)
+        mMaxResidentTexMem(0),
+        mMaxTotalTextureMem(0)
 {
 }
 
@@ -97,6 +98,7 @@ void LLViewerImageList::init()
 {
         sNumImages = 0;
         mMaxResidentTexMem = 0;
+        mMaxTotalTextureMem = 0 ;
         
         if (gNoRender)
         {
@@ -498,10 +500,10 @@ void LLViewerImageList::updateImages(F32 max_time)
 {
         sNumImagesStat.addValue(sNumImages);
         sNumRawImagesStat.addValue(LLImageRaw::sRawImageCount);
-        sGLTexMemStat.addValue(LLImageGL::sGlobalTextureMemory/(1024.f*1024.f));
-        sGLBoundMemStat.addValue(LLImageGL::sBoundTextureMemory/(1024.f*1024.f));
-        sRawMemStat.addValue(LLImageRaw::sGlobalRawMemory/(1024.f*1024.f));
-        sFormattedMemStat.addValue(LLImageFormatted::sGlobalFormattedMemory/(1024.f*1024.f));
+        sGLTexMemStat.addValue((F32)(LLImageGL::sGlobalTextureMemory >> 20));
+        sGLBoundMemStat.addValue((F32)(LLImageGL::sBoundTextureMemory >> 20));
+        sRawMemStat.addValue((F32)(LLImageRaw::sGlobalRawMemory >> 20));
+        sFormattedMemStat.addValue((F32)(LLImageFormatted::sGlobalFormattedMemory >> 20));
         
         updateImagesDecodePriorities();
         max_time -= updateImagesFetchTextures(max_time);
@@ -586,9 +588,12 @@ void LLViewerImageList::updateImagesDecodePriorities()
                         
                         imagep->processTextureStats();
                         F32 old_priority = imagep->getDecodePriority();
+                        F32 old_priority_test = llmax(old_priority, 0.0f);
                         F32 decode_priority = imagep->calcDecodePriority();
+                        F32 decode_priority_test = llmax(decode_priority, 0.0f);
                         // Ignore < 20% difference
-                        if ((decode_priority < old_priority * .8f || decode_priority > old_priority * 1.25f))
+                        if ((decode_priority_test < old_priority_test * .8f) ||
+                                (decode_priority_test > old_priority_test * 1.25f))
                         {
                                 removeImageFromList(imagep);
                                 imagep->setDecodePriority(decode_priority);
@@ -918,12 +923,14 @@ LLPointer<LLImageJ2C> LLViewerImageList::convertToUploadFile(LLPointer<LLImageRa
 }
 
 const S32 MIN_VIDEO_RAM = 32;
-const S32 MAX_VIDEO_RAM = 2048;
+const S32 MAX_VIDEO_RAM = 512; // 512MB max for performance reasons.
         
 // Returns min setting for TextureMemory (in MB)
 S32 LLViewerImageList::getMinVideoRamSetting()
 {
-        return MIN_VIDEO_RAM;
+        S32 system_ram = (S32)(gSysMemory.getPhysicalMemoryClamped() >> 20);
+        //min texture mem sets to 64M if total physical mem is more than 1.5GB
+        return (system_ram > 1500) ? 64 : MIN_VIDEO_RAM;
 }
 
 //static
@@ -956,8 +963,8 @@ S32 LLViewerImageList::getMaxVideoRamSetting(bool get_recommended)
                 max_texmem = llmin(max_texmem, (S32)(system_ram/2));
         else
                 max_texmem = llmin(max_texmem, (S32)(system_ram));
-        
-        max_texmem = llclamp(max_texmem, MIN_VIDEO_RAM, MAX_VIDEO_RAM);
+                
+        max_texmem = llclamp(max_texmem, getMinVideoRamSetting(), MAX_VIDEO_RAM); 
         
         return max_texmem;
 }
@@ -994,7 +1001,18 @@ void LLViewerImageList::updateMaxResidentTexMem(S32 mem)
         
         S32 vb_mem = mem;
         S32 fb_mem = llmax(VIDEO_CARD_FRAMEBUFFER_MEM, vb_mem/4);
-        mMaxResidentTexMem = (vb_mem - fb_mem)<<20;
+        mMaxResidentTexMem = (vb_mem - fb_mem) ; //in MB
+        
+        mMaxTotalTextureMem = mMaxResidentTexMem * 2;
+        if (mMaxResidentTexMem > 640)
+        {
+                mMaxTotalTextureMem -= (mMaxResidentTexMem >> 2);
+        }
+        
+        if (mMaxTotalTextureMem > (S32)(gSysMemory.getPhysicalMemoryClamped() >> 20) - 128)
+        {
+                mMaxTotalTextureMem = (gSysMemory.getPhysicalMemoryClamped() >> 20) - 128 ;
+        }
         
         llinfos << "Total Video Memory set to: " << vb_mem << " MB" << llendl;
         llinfos << "Available Texture Memory set to: " << (vb_mem - fb_mem) << " MB" << llendl;
diff --git a/linden/indra/newview/llviewerimagelist.h b/linden/indra/newview/llviewerimagelist.h
index 8aa9913..818c3ae 100644
--- a/linden/indra/newview/llviewerimagelist.h
+++ b/linden/indra/newview/llviewerimagelist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -129,6 +129,7 @@ public:
         void setUpdateStats(BOOL b)                     { mUpdateStats = b; }
 
         S32     getMaxResidentTexMem() const    { return mMaxResidentTexMem; }
+        S32 getMaxTotalTextureMem() const   { return mMaxTotalTextureMem;}
         S32 getNumImages()                                      { return mImageList.size(); }
 
         void updateMaxResidentTexMem(S32 mem);
@@ -170,6 +171,7 @@ private:
 
         BOOL mUpdateStats;
         S32     mMaxResidentTexMem;
+        S32 mMaxTotalTextureMem;
         LLFrameTimer mForceDecodeTimer;
         
 public:
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 0323bb7..bff310e 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index b39545b..a818f91 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjoint.cpp b/linden/indra/newview/llviewerjoint.cpp
index 914448e..31def8f 100644
--- a/linden/indra/newview/llviewerjoint.cpp
+++ b/linden/indra/newview/llviewerjoint.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -149,7 +149,7 @@ void LLViewerJoint::setValid( BOOL valid, BOOL recursive )
 //      //----------------------------------------------------------------
 //      if (mComponents & SC_AXES)
 //      {
-//              gGL.begin(LLVertexBuffer::LINES);
+//              gGL.begin(LLRender::LINES);
 //              gGL.color3f( 1.0f, 0.0f, 0.0f );
 //              gGL.vertex3f( 0.0f,            0.0f, 0.0f );
 //              gGL.vertex3f( 0.1f, 0.0f, 0.0f );
@@ -171,7 +171,7 @@ void LLViewerJoint::setValid( BOOL valid, BOOL recursive )
 //      {
 //              gGL.color3f( 1.0f, 1.0f, 0.0f );
 
-//              gGL.begin(LLVertexBuffer::TRIANGLES);
+//              gGL.begin(LLRender::TRIANGLES);
 
 //              // joint top half
 //              glNormal3f(nc, nc, nc);
@@ -362,7 +362,7 @@ U32 LLViewerJoint::render( F32 pixelArea, BOOL first_pass )
 //      // render the bone
 //      gGL.color3f( 0.5f, 0.5f, 0.0f );
 
-//      gGL.begin(LLVertexBuffer::TRIANGLES);
+//      gGL.begin(LLRender::TRIANGLES);
 
 //      gGL.vertex3f( length,     0.0f,       0.0f);
 //      gGL.vertex3f( 0.0f,       boneSize,  0.0f);
@@ -524,14 +524,69 @@ LLViewerJointCollisionVolume::LLViewerJointCollisionVolume(const std::string &na
 void LLViewerJointCollisionVolume::renderCollision()
 {
         updateWorldMatrix();
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
+        
+        gGL.pushMatrix();
         glMultMatrixf( &mXform.getWorldMatrix().mMatrix[0][0] );
 
-        glColor3f( 0.f, 0.f, 1.f );
-        gSphere.render();
+        gGL.color3f( 0.f, 0.f, 1.f );
+        
+        gGL.begin(LLRender::LINES);
+        
+        LLVector3 v[] = 
+        {
+                LLVector3(1,0,0),
+                LLVector3(-1,0,0),
+                LLVector3(0,1,0),
+                LLVector3(0,-1,0),
+
+                LLVector3(0,0,-1),
+                LLVector3(0,0,1),
+        };
+
+        //sides
+        gGL.vertex3fv(v[0].mV); 
+        gGL.vertex3fv(v[2].mV);
+
+        gGL.vertex3fv(v[0].mV); 
+        gGL.vertex3fv(v[3].mV);
+
+        gGL.vertex3fv(v[1].mV); 
+        gGL.vertex3fv(v[2].mV);
+
+        gGL.vertex3fv(v[1].mV); 
+        gGL.vertex3fv(v[3].mV);
+
+
+        //top
+        gGL.vertex3fv(v[0].mV); 
+        gGL.vertex3fv(v[4].mV);
+
+        gGL.vertex3fv(v[1].mV); 
+        gGL.vertex3fv(v[4].mV);
+
+        gGL.vertex3fv(v[2].mV); 
+        gGL.vertex3fv(v[4].mV);
+
+        gGL.vertex3fv(v[3].mV); 
+        gGL.vertex3fv(v[4].mV);
+
+
+        //bottom
+        gGL.vertex3fv(v[0].mV); 
+        gGL.vertex3fv(v[5].mV);
+
+        gGL.vertex3fv(v[1].mV); 
+        gGL.vertex3fv(v[5].mV);
+
+        gGL.vertex3fv(v[2].mV); 
+        gGL.vertex3fv(v[5].mV);
+
+        gGL.vertex3fv(v[3].mV); 
+        gGL.vertex3fv(v[5].mV);
+
+        gGL.end();
 
-        glPopMatrix();
+        gGL.popMatrix();
 }
 
 LLVector3 LLViewerJointCollisionVolume::getVolumePos(LLVector3 &offset)
diff --git a/linden/indra/newview/llviewerjoint.h b/linden/indra/newview/llviewerjoint.h
index f73e705..ac63180 100644
--- a/linden/indra/newview/llviewerjoint.h
+++ b/linden/indra/newview/llviewerjoint.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjointattachment.cpp b/linden/indra/newview/llviewerjointattachment.cpp
index 4b58361..2517250 100644
--- a/linden/indra/newview/llviewerjointattachment.cpp
+++ b/linden/indra/newview/llviewerjointattachment.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -91,7 +91,7 @@ U32 LLViewerJointAttachment::drawShape( F32 pixelArea, BOOL first_pass )
                 LLGLDisable cull_face(GL_CULL_FACE);
                 
                 gGL.color4f(1.f, 1.f, 1.f, 1.f);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.vertex3f(-0.1f, 0.1f, 0.f);
                         gGL.vertex3f(-0.1f, -0.1f, 0.f);
@@ -138,6 +138,8 @@ void LLViewerJointAttachment::setupDrawable(LLDrawable* drawablep)
                 {
                         childp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
                         gPipeline.markTextured(childp->mDrawable); // face may need to change draw pool to/from POOL_HUD
+                        gPipeline.markMoved(childp->mDrawable);
+
                         if(mIsHUDAttachment)
                         {
                                 for (S32 face_num = 0; face_num < childp->mDrawable->getNumFaces(); face_num++)
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index a69c10c..dd63bfd 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index b590907..be24386 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -537,7 +537,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
 
         if (mTestImageName)
         {
-                LLImageGL::bindExternalTexture( mTestImageName, 0, GL_TEXTURE_2D ); 
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mTestImageName);
 
                 if (mIsTransparent)
                 {
@@ -553,12 +553,12 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
         {
                 if(     mLayerSet->hasComposite() )
                 {
-                        mLayerSet->getComposite()->bindTexture();
+                        gGL.getTexUnit(0)->bind(mLayerSet->getComposite()->getTexture());
                 }
                 else
                 {
                         llwarns << "Layerset without composite" << llendl;
-                        gImageList.getImage(IMG_DEFAULT)->bind();
+                        gGL.getTexUnit(0)->bind(gImageList.getImage(IMG_DEFAULT));
                 }
         }
         else
@@ -566,13 +566,13 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
         {
                 if (!mTexture->getClampS() || !mTexture->getClampT())
                 {
-                        mTexture->bind();
+                        gGL.getTexUnit(0)->bind(mTexture.get());
                         mTexture->overrideClamp (TRUE, TRUE);
                 }
         }
         else
         {
-                gImageList.getImage(IMG_DEFAULT_AVATAR)->bind();
+                gGL.getTexUnit(0)->bind(gImageList.getImage(IMG_DEFAULT_AVATAR));
         }
         
         if (gRenderForSelect)
@@ -584,7 +584,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
                 }
                 else
                 {
-                        LLImageGL::unbindTexture(0);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 }
         }
         
@@ -605,14 +605,14 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
                         }
                 }
                 
-                mFace->mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, start, end, count, offset);
+                mFace->mVertexBuffer->drawRange(LLRender::TRIANGLES, start, end, count, offset);
         }
         else
         {
                 glPushMatrix();
                 LLMatrix4 jointToWorld = getWorldMatrix();
                 glMultMatrixf((GLfloat*)jointToWorld.mMatrix);
-                mFace->mVertexBuffer->drawRange(LLVertexBuffer::TRIANGLES, start, end, count, offset);
+                mFace->mVertexBuffer->drawRange(LLRender::TRIANGLES, start, end, count, offset);
                 glPopMatrix();
         }
         gPipeline.addTrianglesDrawn(count/3);
@@ -626,7 +626,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass)
 
         if (mTexture.notNull())
         {
-                mTexture->bind();
+                gGL.getTexUnit(0)->bind(mTexture.get());
                 mTexture->restoreClamp();
         }
 
diff --git a/linden/indra/newview/llviewerjointmesh.h b/linden/indra/newview/llviewerjointmesh.h
index fd7f550..8fdb4e5 100644
--- a/linden/indra/newview/llviewerjointmesh.h
+++ b/linden/indra/newview/llviewerjointmesh.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjointmesh_sse.cpp b/linden/indra/newview/llviewerjointmesh_sse.cpp
index 262be47..a837bba 100644
--- a/linden/indra/newview/llviewerjointmesh_sse.cpp
+++ b/linden/indra/newview/llviewerjointmesh_sse.cpp
@@ -7,7 +7,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjointmesh_sse2.cpp b/linden/indra/newview/llviewerjointmesh_sse2.cpp
index ebefdba..91a8196 100644
--- a/linden/indra/newview/llviewerjointmesh_sse2.cpp
+++ b/linden/indra/newview/llviewerjointmesh_sse2.cpp
@@ -7,7 +7,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjointmesh_vec.cpp b/linden/indra/newview/llviewerjointmesh_vec.cpp
index 12fe597..4d0f667 100644
--- a/linden/indra/newview/llviewerjointmesh_vec.cpp
+++ b/linden/indra/newview/llviewerjointmesh_vec.cpp
@@ -7,7 +7,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjoystick.cpp b/linden/indra/newview/llviewerjoystick.cpp
index 2e4ce0b..721e02d 100644
--- a/linden/indra/newview/llviewerjoystick.cpp
+++ b/linden/indra/newview/llviewerjoystick.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerjoystick.h b/linden/indra/newview/llviewerjoystick.h
index 44d0dca..2c4be2a 100644
--- a/linden/indra/newview/llviewerjoystick.h
+++ b/linden/indra/newview/llviewerjoystick.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index 3c2fb88..f31f48f 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerkeyboard.h b/linden/indra/newview/llviewerkeyboard.h
index 115bd69..4a776fc 100644
--- a/linden/indra/newview/llviewerkeyboard.h
+++ b/linden/indra/newview/llviewerkeyboard.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerlayer.cpp b/linden/indra/newview/llviewerlayer.cpp
index 0402a22..d7cad00 100644
--- a/linden/indra/newview/llviewerlayer.cpp
+++ b/linden/indra/newview/llviewerlayer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerlayer.h b/linden/indra/newview/llviewerlayer.h
index c0fbde5..908a733 100644
--- a/linden/indra/newview/llviewerlayer.h
+++ b/linden/indra/newview/llviewerlayer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index d8fcdcb..b791786 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -559,6 +559,7 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
 // static
 void LLViewerMedia::cleanupClass()
 {
+        stop() ;
         LLMediaManager::cleanupClass();
 }
 
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h
index 2a78585..d1d8d99 100644
--- a/linden/indra/newview/llviewermedia.h
+++ b/linden/indra/newview/llviewermedia.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 486e4f1..864c6f5 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -85,6 +85,7 @@
 #include "llfloateranimpreview.h"
 #include "llfloateravatarinfo.h"
 #include "llfloateravatartextures.h"
+#include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
@@ -323,13 +324,6 @@ void handle_talk_to(void *userdata);
 // Debug menu
 void show_permissions_control(void*);
 void toggle_build_options(void* user_data);
-#if 0 // Unused
-void handle_audio_status_1(void*);
-void handle_audio_status_2(void*);
-void handle_audio_status_3(void*);
-void handle_audio_status_4(void*);
-#endif
-void manage_landmarks(void*);
 void reload_ui(void*);
 void handle_agent_stop_moving(void*);
 void print_packets_lost(void*);
@@ -409,6 +403,7 @@ void force_error_llerror(void *);
 void force_error_bad_memory_access(void *);
 void force_error_infinite_loop(void *);
 void force_error_software_exception(void *);
+void force_error_driver_crash(void *);
 
 void handle_stopall(void*);
 //void handle_hinge(void*);
@@ -935,6 +930,8 @@ void init_client_menu(LLMenuGL* menu)
                 sub->append(new LLMenuItemCallGL("Force LLError And Crash", &force_error_llerror));
         sub->append(new LLMenuItemCallGL("Force Bad Memory Access", &force_error_bad_memory_access));
                 sub->append(new LLMenuItemCallGL("Force Infinite Loop", &force_error_infinite_loop));
+                sub->append(new LLMenuItemCallGL("Force Driver Crash", &force_error_driver_crash));
+                sub->append(new LLMenuItemCallGL("Force Disconnect Viewer", &handle_disconnect_viewer));
                 // *NOTE:Mani this isn't handled yet... sub->append(new LLMenuItemCallGL("Force Software Exception", &force_error_unhandled_exception)); 
                 sub->createJumpKeys();
                 menu->appendMenu(sub);
@@ -1018,7 +1015,6 @@ void init_debug_ui_menu(LLMenuGL* menu)
 {
         menu->append(new LLMenuItemCallGL("SLURL Test", &handle_slurl_test));
         menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
-        menu->append(new LLMenuItemToggleGL("Async Keystrokes", &gHandleKeysAsync));
         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));
@@ -1149,10 +1145,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
                                                                                         &LLPipeline::toggleRenderDebugFeature, NULL,
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
                                                                                         (void*)LLPipeline::RENDER_DEBUG_FEATURE_FOG, KEY_F6, MASK_ALT|MASK_CONTROL));
-        sub_menu->append(new LLMenuItemCheckGL("Palletized Textures",
-                                                                                        &LLPipeline::toggleRenderDebugFeature, NULL,
-                                                                                        &LLPipeline::toggleRenderDebugFeatureControl,
-                                                                                        (void*)LLPipeline::RENDER_DEBUG_FEATURE_PALETTE, KEY_F7, MASK_ALT|MASK_CONTROL));
         sub_menu->append(new LLMenuItemCheckGL("Test FRInfo",
                                                                                         &LLPipeline::toggleRenderDebugFeature, NULL,
                                                                                         &LLPipeline::toggleRenderDebugFeatureControl,
@@ -1203,9 +1195,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Face Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_FACE_AREA));
-        sub_menu->append(new LLMenuItemCheckGL("Pick Render",   &LLPipeline::toggleRenderDebug, NULL,
-                                                                                                        &LLPipeline::toggleRenderDebugControl,
-                                                                                                        (void*)LLPipeline::RENDER_DEBUG_PICKING));
         sub_menu->append(new LLMenuItemCheckGL("Lights",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_LIGHTS));
@@ -1224,9 +1213,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Sculpt",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_SCULPTED));
-        
-        sub_menu->append(new LLMenuItemToggleGL("Show Select Buffer", &gDebugSelect));
-
+                
         sub_menu->append(new LLMenuItemCallGL("Vectorize Perf Test", &run_vectorize_perf_test));
 
         sub_menu = new LLMenuGL("Render Tests");
@@ -1771,6 +1758,23 @@ class LLViewCheckJoystickFlycam : public view_listener_t
         }
 };
 
+class LLViewCommunicate : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
+                {
+                        LLFloaterMyFriends::toggleInstance();
+                }
+                else
+                {
+                        LLFloaterChatterBox::toggleInstance();
+                }
+                return true;
+        }
+};
+
+
 void handle_toggle_flycam()
 {
         LLViewerJoystick::getInstance()->toggleFlycam();
@@ -2239,37 +2243,71 @@ class LLAvatarDebug : public view_listener_t
         }
 };
 
+struct MenuCallbackData
+{
+        bool ban_enabled;
+        LLUUID avatar_id;
+};
+
 void callback_eject(S32 option, void* data)
 {
-        LLUUID* avatar_id = (LLUUID*) data;
+        MenuCallbackData *callback_data = (MenuCallbackData*)data;
+        if (!callback_data)
+        {
+                return;
+        }
+        if (2 == option)
+        {
+                // Cancle button.
+                return;
+        }
+        LLUUID avatar_id = callback_data->avatar_id;
+        bool ban_enabled = callback_data->ban_enabled;
 
-        if (0 == option || 1 == option)
+        if (0 == option)
         {
+                // Eject button
                 LLMessageSystem* msg = gMessageSystem;
-                LLViewerObject* avatar = gObjectList.findObject(*avatar_id);
+                LLViewerObject* avatar = gObjectList.findObject(avatar_id);
 
                 if (avatar)
                 {
                         U32 flags = 0x0;
-                        if (1 == option)
-                        {
-                                // eject and add to ban list
-                                flags |= 0x1;
-                        }
+                        msg->newMessage("EjectUser");
+                        msg->nextBlock("AgentData");
+                        msg->addUUID("AgentID", gAgent.getID() );
+                        msg->addUUID("SessionID", gAgent.getSessionID() );
+                        msg->nextBlock("Data");
+                        msg->addUUID("TargetID", avatar_id );
+                        msg->addU32("Flags", flags );
+                        msg->sendReliable( avatar->getRegion()->getHost() );
+                }
+        }
+        else if (ban_enabled)
+        {
+                // This is tricky. It is similar to say if it is not an 'Eject' button,
+                // and it is also not an 'Cancle' button, and ban_enabled==ture, 
+                // it should be the 'Eject and Ban' button.
+                LLMessageSystem* msg = gMessageSystem;
+                LLViewerObject* avatar = gObjectList.findObject(avatar_id);
 
+                if (avatar)
+                {
+                        U32 flags = 0x1;
                         msg->newMessage("EjectUser");
                         msg->nextBlock("AgentData");
                         msg->addUUID("AgentID", gAgent.getID() );
                         msg->addUUID("SessionID", gAgent.getSessionID() );
                         msg->nextBlock("Data");
-                        msg->addUUID("TargetID", *avatar_id );
+                        msg->addUUID("TargetID", avatar_id );
                         msg->addU32("Flags", flags );
                         msg->sendReliable( avatar->getRegion()->getHost() );
                 }
         }
 
-        delete avatar_id;
-        avatar_id = NULL;
+
+        delete callback_data;
+        callback_data = NULL;
 }
 
 class LLAvatarEject : public view_listener_t
@@ -2279,23 +2317,50 @@ class LLAvatarEject : public view_listener_t
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
-                        LLUUID* avatar_id = new LLUUID( avatar->getID() );
+                        MenuCallbackData *data = new MenuCallbackData;
+                        (*data).avatar_id = avatar->getID();
                         std::string fullname = avatar->getFullname();
 
-                        if (!fullname.empty())
+                        const LLVector3d& pos = avatar->getPositionGlobal();
+                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos)->getParcel();
+                        
+                        if (LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_MANAGE_BANNED))
                         {
-                                LLStringUtil::format_map_t args;
-                                args["[AVATAR_NAME]"] = fullname;
-                                gViewerWindow->alertXml("EjectAvatarFullname",
-                                                        args,
-                                                        callback_eject,
-                                                        (void*)avatar_id);
+                                (*data).ban_enabled = true;
+                                if (!fullname.empty())
+                                {
+                                        LLStringUtil::format_map_t args;
+                                        args["[AVATAR_NAME]"] = fullname;
+                                        gViewerWindow->alertXml("EjectAvatarFullname",
+                                                args,
+                                                callback_eject,
+                                                (void*)data);
+                                }
+                                else
+                                {
+                                        gViewerWindow->alertXml("EjectAvatar",
+                                                callback_eject,
+                                                (void*)data);
+                                }
                         }
                         else
                         {
-                                gViewerWindow->alertXml("EjectAvatar",
-                                                        callback_eject,
-                                                        (void*)avatar_id);
+                                (*data).ban_enabled = false;
+                                if (!fullname.empty())
+                                {
+                                        LLStringUtil::format_map_t args;
+                                        args["[AVATAR_NAME]"] = fullname;
+                                        gViewerWindow->alertXml("EjectAvatarFullnameNoBan",
+                                                args,
+                                                callback_eject,
+                                                (void*)data);
+                                }
+                                else
+                                {
+                                        gViewerWindow->alertXml("EjectAvatarNoBan",
+                                                callback_eject,
+                                                (void*)data);
+                                }
                         }
                 }
                 return true;
@@ -2312,12 +2377,18 @@ class LLAvatarEnableFreezeEject : public view_listener_t
                 if (new_value)
                 {
                         const LLVector3& pos = avatar->getPositionRegion();
+                        const LLVector3d& pos_global = avatar->getPositionGlobal();
+                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
                         LLViewerRegion* region = avatar->getRegion();
                         new_value = (region != NULL);
-
+                                                
                         if (new_value)
                         {
-                                new_value = (region->isOwnedSelf(pos) || region->isOwnedGroup(pos));
+                                new_value = region->isOwnedSelf(pos);
+                                if (!new_value || region->isOwnedGroup(pos))
+                                {
+                                        new_value = LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_ADMIN);
+                                }
                         }
                 }
 
@@ -2688,33 +2759,6 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
         }
 }
 
-void load_url_local_file(const std::string& file_name)
-{
-        if( gAgent.cameraMouselook() )
-        {
-                gAgent.changeCameraToDefault();
-        }
-
-#if LL_DARWIN || LL_LINUX || LL_SOLARIS
-        // MBW -- If the Mac client is in fullscreen mode, it needs to go windowed so the browser will be visible.
-        if(gViewerWindow->mWindow->getFullscreen())
-        {
-                gViewerWindow->toggleFullscreen(TRUE);
-        }
-#endif
-
-        // JC - system() blocks until IE has launched.
-        // spawn() runs asynchronously, but opens a command prompt.
-        // ShellExecute() just opens the damn file with the default
-        // web browser.
-        std::string full_path = "file:///";
-        full_path.append(gDirUtilp->getAppRODataDir());
-        full_path.append(gDirUtilp->getDirDelimiter());
-        full_path.append(file_name);
-
-        LLWeb::loadURL(full_path);
-}
-
 /*
 class LLHaveCallingcard : public LLInventoryCollectFunctor
 {
@@ -2922,63 +2966,16 @@ void show_permissions_control(void*)
         floaterp->mPermissions->addPermissionsData("foo3", LLUUID::null, 0);
 }
 
-#if 0 // Unused (these just modify AudioInfoPage which is not used anywhere in the code
-void handle_audio_status_1(void*)
-{
-        S32 page = gSavedSettings.getS32("AudioInfoPage");
-        if (1 == page)
-        {
-                page = 0;
-        }
-        else
-        {
-                page = 1;
-        }
-        gSavedSettings.setS32("AudioInfoPage", page);   
-}
-
-void handle_audio_status_2(void*)
-{
-        S32 page = gSavedSettings.getS32("AudioInfoPage");
-        if (2 == page)
-        {
-                page = 0;
-        }
-        else
-        {
-                page = 2;
-        }
-        gSavedSettings.setS32("AudioInfoPage", page);   
-}
 
-void handle_audio_status_3(void*)
+class LLCreateLandmarkCallback : public LLInventoryCallback
 {
-        S32 page = gSavedSettings.getS32("AudioInfoPage");
-        if (3 == page)
-        {
-                page = 0;
-        }
-        else
-        {
-                page = 3;
-        }
-        gSavedSettings.setS32("AudioInfoPage", page);   
-}
-
-void handle_audio_status_4(void*)
-{
-        S32 page = gSavedSettings.getS32("AudioInfoPage");
-        if (4 == page)
-        {
-                page = 0;
-        }
-        else
+public:
+        /*virtual*/ void fire(const LLUUID& inv_item)
         {
-                page = 4;
+                llinfos << "Created landmark with inventory id " << inv_item
+                        << llendl;
         }
-        gSavedSettings.setS32("AudioInfoPage", page);   
-}
-#endif
+};
 
 void reload_ui(void *)
 {
@@ -3211,26 +3208,7 @@ void reset_view_final( BOOL proceed, void* )
                 return;
         }
 
-        gAgent.changeCameraToDefault();
-        
-        if (LLViewerJoystick::getInstance()->getOverrideCamera())
-        {
-                handle_toggle_flycam();
-        }
-
-        // reset avatar mode from eventual residual motion
-        if (LLToolMgr::getInstance()->inBuildMode())
-        {
-                LLViewerJoystick::getInstance()->moveAvatar(true);
-        }
-
-        gAgent.resetView(!gFloaterTools->getVisible());
-        gFloaterTools->close();
-        
-        gViewerWindow->showCursor();
-
-        // Switch back to basic toolset
-        LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
+        gAgent.resetView(TRUE, TRUE);
 }
 
 class LLViewLookAtLastChatter : public view_listener_t
@@ -4800,7 +4778,7 @@ class LLWorldCreateLandmark : public view_listener_t
                                                           LLAssetType::AT_LANDMARK,
                                                           LLInventoryType::IT_LANDMARK,
                                                           NOT_WEARABLE, PERM_ALL, 
-                                                          NULL);
+                                                          new LLCreateLandmarkCallback);
                 return true;
         }
 };
@@ -5224,6 +5202,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterMediaBrowser::toggle();
                 }
+                else if (floater_name == "beacons")
+                {
+                        LLFloaterBeacons::toggleInstance(LLSD());
+                }
                 return true;
         }
 };
@@ -5239,6 +5221,10 @@ class LLFloaterVisible : public view_listener_t
                 {
                         new_value = LLFloaterMyFriends::instanceVisible(0);
                 }
+                else if (floater_name == "communicate")
+                {
+                        new_value = LLFloaterChatterBox::instanceVisible();
+                }
                 else if (floater_name == "toolbar")
                 {
                         new_value = LLToolBar::visible(NULL);
@@ -5271,6 +5257,15 @@ class LLFloaterVisible : public view_listener_t
                 {
                         new_value = LLFloaterActiveSpeakers::instanceVisible(LLSD());
                 }
+                else if (floater_name == "beacons")
+                {
+                        new_value = LLFloaterBeacons::instanceVisible(LLSD());
+                }
+                else if (floater_name == "inventory")
+                {
+                        LLInventoryView* iv = LLInventoryView::getActiveInventory(); 
+                        new_value = (NULL != iv && TRUE == iv->getVisible());
+                }
                 gMenuHolder->findControl(control_name)->setValue(new_value);
                 return true;
         }
@@ -5307,37 +5302,6 @@ class LLPromptShowURL : public view_listener_t
         }
 };
 
-void callback_show_file(S32 option, void* data)
-{
-        std::string* filenamep = (std::string*)data;
-        if (0 == option)
-        {
-                load_url_local_file(*filenamep);
-        }
-        delete filenamep;
-}
-
-class LLPromptShowFile : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                std::string param = userdata.asString();
-                std::string::size_type offset = param.find(",");
-                if (offset != param.npos)
-                {
-                        std::string alert = param.substr(0, offset);
-                        std::string file = param.substr(offset+1);
-                        std::string* file_copy = new std::string(file);
-                        gViewerWindow->alertXml(alert, callback_show_file, file_copy);
-                }
-                else
-                {
-                        llinfos << "PromptShowFile invalid parameters! Expecting \"ALERT,FILE\"." << llendl;
-                }
-                return true;
-        }
-};
-
 class LLShowAgentProfile : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5961,7 +5925,6 @@ namespace
 
 void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, const std::string& nomodmsg)
 {
-        // Apply until an object fails
         QueueObjects func(q);
         LLSelectMgr *mgr = LLSelectMgr::getInstance();
         LLObjectSelectionHandle selectHandle = mgr->getSelection();
@@ -5990,7 +5953,6 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
         }
 }
 
-
 class LLToolsSetBulkPerms : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -6001,62 +5963,67 @@ class LLToolsSetBulkPerms : public view_listener_t
         }
 };
 
+void handle_compile_queue(std::string to_lang)
+{
+        LLFloaterCompileQueue* queue;
+        if (to_lang == "mono")
+        {
+                queue = LLFloaterCompileQueue::create(TRUE);
+        }
+        else
+        {
+                queue = LLFloaterCompileQueue::create(FALSE);
+        }
+        queue_actions(queue, "CannotRecompileSelectObjectsNoScripts", "CannotRecompileSelectObjectsNoPermission");
+}
+
+void handle_reset_selection(void)
+{
+        LLFloaterResetQueue* queue = LLFloaterResetQueue::create();
+        queue_actions(queue, "CannotResetSelectObjectsNoScripts", "CannotResetSelectObjectsNoPermission");
+}
+
+void handle_set_run_selection(void)
+{
+        LLFloaterRunQueue* queue = LLFloaterRunQueue::create();
+        queue_actions(queue, "CannotSetRunningSelectObjectsNoScripts", "CannotSerRunningSelectObjectsNoPermission");
+}
+
+void handle_set_not_run_selection(void)
+{
+        LLFloaterNotRunQueue* queue = LLFloaterNotRunQueue::create();
+        queue_actions(queue, "CannotSetRunningNotSelectObjectsNoScripts", "CannotSerRunningNotSelectObjectsNoPermission");
+}
 
 class LLToolsSelectedScriptAction : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 std::string action = userdata.asString();
-                LLFloaterScriptQueue* queue = NULL;
                 if (action == "compile mono")
                 {
-                        queue = LLFloaterCompileQueue::create(TRUE);
+                        handle_compile_queue("mono");
                 }
                 if (action == "compile lsl")
                 {
-                        queue = LLFloaterCompileQueue::create(FALSE);
+                        handle_compile_queue("lsl");
                 }
                 else if (action == "reset")
                 {
-                        queue = LLFloaterResetQueue::create();
+                        handle_reset_selection();
                 }
                 else if (action == "start")
                 {
-                        queue = LLFloaterRunQueue::create();
+                        handle_set_run_selection();
                 }
                 else if (action == "stop")
                 {
-                        queue = LLFloaterNotRunQueue::create();
+                        handle_set_not_run_selection();
                 }
-                if (!queue)
-                {
-                        return true;
-                }
-
-                queue_actions(queue, "CannotRecompileSelectObjectsNoScripts", "CannotRecompileSelectObjectsNoPermission");
-
                 return true;
         }
 };
 
-void handle_reset_selection(void*)
-{
-        LLFloaterResetQueue* queue = LLFloaterResetQueue::create();
-        queue_actions(queue, "CannotResetSelectObjectsNoScripts", "CannotResetSelectObjectsNoPermission");
-}
-
-void handle_set_run_selection(void*)
-{
-        LLFloaterRunQueue* queue = LLFloaterRunQueue::create();
-        queue_actions(queue, "CannotSetRunningSelectObjectsNoScripts", "CannotSerRunningSelectObjectsNoPermission");
-}
-
-void handle_set_not_run_selection(void*)
-{
-        LLFloaterNotRunQueue* queue = LLFloaterNotRunQueue::create();
-        queue_actions(queue, "CannotSetRunningNotSelectObjectsNoScripts", "CannotSerRunningNotSelectObjectsNoPermission");
-}
-
 void handle_selected_texture_info(void*)
 {
         for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
@@ -6897,6 +6864,11 @@ void force_error_software_exception(void *)
     LLAppViewer::instance()->forceErrorSoftwareException();
 }
 
+void force_error_driver_crash(void *)
+{
+    LLAppViewer::instance()->forceErrorDriverCrash();
+}
+
 class LLToolsUseSelectionForGrid : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7072,148 +7044,6 @@ class LLViewCheckHighlightTransparent : public view_listener_t
         }
 };
 
-class LLViewBeaconWidth : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                std::string width = userdata.asString();
-                if(width == "1")
-                {
-                        gSavedSettings.setS32("DebugBeaconLineWidth", 1);
-                }
-                else if(width == "4")
-                {
-                        gSavedSettings.setS32("DebugBeaconLineWidth", 4);
-                }
-                else if(width == "16")
-                {
-                        gSavedSettings.setS32("DebugBeaconLineWidth", 16);
-                }
-                else if(width == "32")
-                {
-                        gSavedSettings.setS32("DebugBeaconLineWidth", 32);
-                }
-
-                return true;
-        }
-};
-
-
-class LLViewToggleBeacon : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                std::string beacon = userdata.asString();
-                if (beacon == "scriptsbeacon")
-                {
-                        LLPipeline::toggleRenderScriptedBeacons(NULL);
-                        gSavedSettings.setBOOL( "scriptsbeacon", LLPipeline::getRenderScriptedBeacons(NULL) );
-                        // toggle the other one off if it's on
-                        if (LLPipeline::getRenderScriptedBeacons(NULL) && LLPipeline::getRenderScriptedTouchBeacons(NULL))
-                        {
-                                LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
-                                gSavedSettings.setBOOL( "scripttouchbeacon", LLPipeline::getRenderScriptedTouchBeacons(NULL) );
-                        }
-                }
-                else if (beacon == "physicalbeacon")
-                {
-                        LLPipeline::toggleRenderPhysicalBeacons(NULL);
-                        gSavedSettings.setBOOL( "physicalbeacon", LLPipeline::getRenderPhysicalBeacons(NULL) );
-                }
-                else if (beacon == "soundsbeacon")
-                {
-                        LLPipeline::toggleRenderSoundBeacons(NULL);
-                        gSavedSettings.setBOOL( "soundsbeacon", LLPipeline::getRenderSoundBeacons(NULL) );
-                }
-                else if (beacon == "particlesbeacon")
-                {
-                        LLPipeline::toggleRenderParticleBeacons(NULL);
-                        gSavedSettings.setBOOL( "particlesbeacon", LLPipeline::getRenderParticleBeacons(NULL) );
-                }
-                else if (beacon == "scripttouchbeacon")
-                {
-                        LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
-                        gSavedSettings.setBOOL( "scripttouchbeacon", LLPipeline::getRenderScriptedTouchBeacons(NULL) );
-                        // toggle the other one off if it's on
-                        if (LLPipeline::getRenderScriptedBeacons(NULL) && LLPipeline::getRenderScriptedTouchBeacons(NULL))
-                        {
-                                LLPipeline::toggleRenderScriptedBeacons(NULL);
-                                gSavedSettings.setBOOL( "scriptsbeacon", LLPipeline::getRenderScriptedBeacons(NULL) );
-                        }
-                }
-                else if (beacon == "renderbeacons")
-                {
-                        LLPipeline::toggleRenderBeacons(NULL);
-                        gSavedSettings.setBOOL( "renderbeacons", LLPipeline::getRenderBeacons(NULL) );
-                        // toggle the other one on if it's not
-                        if (!LLPipeline::getRenderBeacons(NULL) && !LLPipeline::getRenderHighlights(NULL))
-                        {
-                                LLPipeline::toggleRenderHighlights(NULL);
-                                gSavedSettings.setBOOL( "renderhighlights", LLPipeline::getRenderHighlights(NULL) );
-                        }
-                }
-                else if (beacon == "renderhighlights")
-                {
-                        LLPipeline::toggleRenderHighlights(NULL);
-                        gSavedSettings.setBOOL( "renderhighlights", LLPipeline::getRenderHighlights(NULL) );
-                        // toggle the other one on if it's not
-                        if (!LLPipeline::getRenderBeacons(NULL) && !LLPipeline::getRenderHighlights(NULL))
-                        {
-                                LLPipeline::toggleRenderBeacons(NULL);
-                                gSavedSettings.setBOOL( "renderbeacons", LLPipeline::getRenderBeacons(NULL) );
-                        }
-                }
-                        
-                return true;
-        }
-};
-
-class LLViewCheckBeaconEnabled : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                std::string beacon = userdata["data"].asString();
-                bool new_value = false;
-                if (beacon == "scriptsbeacon")
-                {
-                        new_value = gSavedSettings.getBOOL( "scriptsbeacon");
-                        LLPipeline::setRenderScriptedBeacons(new_value);
-                }
-                else if (beacon == "physicalbeacon")
-                {
-                        new_value = gSavedSettings.getBOOL( "physicalbeacon");
-                        LLPipeline::setRenderPhysicalBeacons(new_value);
-                }
-                else if (beacon == "soundsbeacon")
-                {
-                        new_value = gSavedSettings.getBOOL( "soundsbeacon");
-                        LLPipeline::setRenderSoundBeacons(new_value);
-                }
-                else if (beacon == "particlesbeacon")
-                {
-                        new_value = gSavedSettings.getBOOL( "particlesbeacon");
-                        LLPipeline::setRenderParticleBeacons(new_value);
-                }
-                else if (beacon == "scripttouchbeacon")
-                {
-                        new_value = gSavedSettings.getBOOL( "scripttouchbeacon");
-                        LLPipeline::setRenderScriptedTouchBeacons(new_value);
-                }
-                else if (beacon == "renderbeacons")
-                {
-                        new_value = gSavedSettings.getBOOL( "renderbeacons");
-                        LLPipeline::setRenderBeacons(new_value);
-                }
-                else if (beacon == "renderhighlights")
-                {
-                        new_value = gSavedSettings.getBOOL( "renderhighlights");
-                        LLPipeline::setRenderHighlights(new_value);
-                }
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
-
 class LLViewToggleRenderType : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7590,7 +7420,6 @@ class LLAdvancedCheckConsole : public view_listener_t
 
 
 
-
 //////////////////////////
 // DUMP INFO TO CONSOLE //
 //////////////////////////
@@ -7845,10 +7674,6 @@ U32 feature_from_string(std::string feature)
         {
                 return LLPipeline::RENDER_DEBUG_FEATURE_FOG;
         }
-        else if ("palette" == feature)
-        {
-                return LLPipeline::RENDER_DEBUG_FEATURE_PALETTE;
-        }
         else if ("fr info" == feature)
         {
                 return LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO;
@@ -8314,33 +8139,6 @@ class LLAdvancedToggleEditableUI : public view_listener_t
 
 
 
-//////////////////////
-// ASYNC KEYSTROKES //
-//////////////////////
-
-
-class LLAdvancedToggleAsyncKeystrokes : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                gHandleKeysAsync = !(gHandleKeysAsync);
-                return true;
-        }
-};
-
-class LLAdvancedCheckAsyncKeystrokes : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = gHandleKeysAsync;
-                std::string control_name = userdata["control"].asString();
-                gMenuHolder->findControl(control_name)->setValue(new_value);
-                return true;
-        }
-};
-
-
-
 /////////////////////
 // DUMP SELECT MGR //
 /////////////////////
@@ -9712,8 +9510,6 @@ void initialize_menus()
         addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
         addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
         addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
-        addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
-        addMenu(new LLViewBeaconWidth(), "View.BeaconWidth");
         addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
         addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
         addMenu(new LLViewZoomOut(), "View.ZoomOut");
@@ -9728,7 +9524,6 @@ void initialize_menus()
         addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
         addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
         addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
-        addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
         addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
         addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
 
@@ -9867,7 +9662,6 @@ void initialize_menus()
         // Generic actions
         addMenu(new LLShowFloater(), "ShowFloater");
         addMenu(new LLPromptShowURL(), "PromptShowURL");
-        addMenu(new LLPromptShowFile(), "PromptShowFile");
         addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
         addMenu(new LLShowAgentGroups(), "ShowAgentGroups");
         addMenu(new LLToggleControl(), "ToggleControl");
@@ -9936,8 +9730,6 @@ void initialize_menus()
         addMenu(new LLAdvancedSLURLTest(), "Advanced.SLURLTest");
         addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
         //addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI");
-        addMenu(new LLAdvancedToggleAsyncKeystrokes(), "Advanced.ToggleAsyncKeystrokes");
-        addMenu(new LLAdvancedCheckAsyncKeystrokes(), "Advanced.CheckAsyncKeystrokes");
         addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
         addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");
         addMenu(new LLAdvancedDumpFocusHolder(), "Advanced.DumpFocusHolder");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index c2f880e..c4a88a2 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -50,7 +50,6 @@ void cleanup_menus();
 void show_debug_menus(); // checks for if menus should be shown first.
 void show_context_menu( S32 x, S32 y, MASK mask );
 void show_build_mode_context_menu(S32 x, S32 y, MASK mask);
-void load_url_local_file(const std::string& file_name);
 BOOL enable_save_into_inventory(void*);
 void handle_reset_view();
 void handle_cut(void*);
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 5dd760e..c998ba6 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -349,7 +349,8 @@ class LLFileEnableCloseWindow : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+                bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
+
                 // horrendously opaque, this code
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
@@ -503,7 +504,7 @@ void handle_compress_image(void*)
                         }
                         else
                         {
-                                llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
+                                llinfos << "Compression failed: " << LLImage::getLastError() << llendl;
                         }
 
                         infile = picker.getNextFile();
@@ -554,9 +555,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                                                                                                  IMG_CODEC_BMP ))
                 {
                         error_message = llformat( "Problem with file %s:\n\n%s\n",
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                                         src_filename.c_str(), LLImage::getLastError().c_str());
                         args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
+                        args["[ERROR]"] = LLImage::getLastError();
                         upload_error(error_message, "ProblemWithFile", filename, args);
                         return;
                 }
@@ -569,9 +570,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                                                                                                  IMG_CODEC_TGA ))
                 {
                         error_message = llformat("Problem with file %s:\n\n%s\n",
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                                        src_filename.c_str(), LLImage::getLastError().c_str());
                         args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
+                        args["[ERROR]"] = LLImage::getLastError();
                         upload_error(error_message, "ProblemWithFile", filename, args);
                         return;
                 }
@@ -584,9 +585,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                                                                                                  IMG_CODEC_JPEG ))
                 {
                         error_message = llformat("Problem with file %s:\n\n%s\n",
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                                        src_filename.c_str(), LLImage::getLastError().c_str());
                         args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
+                        args["[ERROR]"] = LLImage::getLastError();
                         upload_error(error_message, "ProblemWithFile", filename, args);
                         return;
                 }
@@ -599,9 +600,9 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                                                                                                  IMG_CODEC_PNG ))
                 {
                         error_message = llformat("Problem with file %s:\n\n%s\n",
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                                        src_filename.c_str(), LLImage::getLastError().c_str());
                         args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
+                        args["[ERROR]"] = LLImage::getLastError();
                         upload_error(error_message, "ProblemWithFile", filename, args);
                         return;
                 }
@@ -930,6 +931,11 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
                                                  LLAssetStorage::LLStoreAssetCallback callback,
                                                  void *userdata)
 {
+        if(gDisconnected)
+        {
+                return ;
+        }
+
         LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
         
         if( LLAssetType::AT_SOUND == asset_type )
diff --git a/linden/indra/newview/llviewermenufile.h b/linden/indra/newview/llviewermenufile.h
index 3ac6202..1f1d5a1 100644
--- a/linden/indra/newview/llviewermenufile.h
+++ b/linden/indra/newview/llviewermenufile.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 221de59..9aa44fc 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -204,7 +204,7 @@ struct LLFriendshipOffer
 void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group,
                                 S32 trx_type, const std::string& desc)
 {
-        if(0 == amount) return;
+        if(0 == amount || !region) return;
         amount = abs(amount);
         LL_INFOS("Messaging") << "give_money(" << uuid << "," << amount << ")"<< LL_ENDL;
         if(can_afford_transaction(amount))
@@ -357,7 +357,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //              size_t nread = fread(buffer, 1, length, fXML);
 //              if (nread < (size_t) length)
 //              {
-//                      llwarns << "Short read" << llendl;
+//                      LL_WARNS("Messaging") << "Short read" << LL_ENDL;
 //              }
 //              buffer[nread] = '\0';
 //              fclose(fXML);
@@ -3516,6 +3516,15 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
                 case LL_SIM_STAT_SIMPHYSICSMEMORY:
                         LLViewerStats::getInstance()->mPhysicsMemoryAllocated.addValue(stat_value);
                         break;
+                case LL_SIM_STAT_SIMSPARETIME:
+                        LLViewerStats::getInstance()->mSimSpareMsec.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_SIMSLEEPTIME:
+                        LLViewerStats::getInstance()->mSimSleepMsec.addValue(stat_value);
+                        break;
+                case LL_SIM_STAT_IOPUMPTIME:
+                        LLViewerStats::getInstance()->mSimPumpIOMsec.addValue(stat_value);
+                        break;
                 default:
                         // Used to be a commented out warning.
                         LL_DEBUGS("Messaging") << "Unknown stat id" << stat_id << LL_ENDL;
@@ -4728,7 +4737,7 @@ void process_teleport_local(LLMessageSystem *msg,void**)
         gAgent.slamLookAt(look_at);
 
         // likewise make sure the camera is behind the avatar
-        gAgent.resetView(TRUE);
+        gAgent.resetView(TRUE, TRUE);
 
         // send camera update to new region
         gAgent.updateCamera();
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index a4bae57..be825ed 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 9019b88..8f7cf7c 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 970e2ce..6c5823c 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index cb3afc5..b33b2bb 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -150,6 +150,8 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
           res = new LLVOGround(id, pcode, regionp); break;
         case LL_VO_PART_GROUP:
           res = new LLVOPartGroup(id, pcode, regionp); break;
+        case LL_VO_HUD_PART_GROUP:
+          res = new LLVOHUDPartGroup(id, pcode, regionp); break;
         case LL_VO_WL_SKY:
           res = new LLVOWLSky(id, pcode, regionp); break;
         default:
@@ -159,7 +161,7 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
         return res;
 }
 
-LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
+LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp, BOOL is_global)
 :       LLPrimitive(),
         mChildList(),
         mID(id),
@@ -201,7 +203,10 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mMedia(NULL),
         mClickAction(0)
 {
-        llassert(mRegionp);
+        if(!is_global)
+        {
+                llassert(mRegionp);
+        }
 
         LLPrimitive::init_primitive(pcode);
 
@@ -209,7 +214,11 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
         mLastInterpUpdateSecs = LLFrameTimer::getElapsedSeconds();
 
         mPositionRegion = LLVector3(0.f, 0.f, 0.f);
-        mPositionAgent = mRegionp->getOriginAgent();
+
+        if(!is_global)
+        {
+                mPositionAgent = mRegionp->getOriginAgent();
+        }
 
         LLViewerObject::sNumObjects++;
 }
@@ -2763,12 +2772,6 @@ void LLViewerObject::setPixelAreaAndAngle(LLAgent &agent)
 
 BOOL LLViewerObject::updateLOD()
 {
-        // Update volume of looping sounds
-        if (mAudioSourcep && mAudioSourcep->isLoop())
-        {
-                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
-                mAudioSourcep->setGain(volume);
-        }
         return FALSE;
 }
 
@@ -3055,28 +3058,38 @@ LLNameValue *LLViewerObject::getNVPair(const std::string& name) const
 
 void LLViewerObject::updatePositionCaches() const
 {
-        if (!isRoot())
-        {
-                mPositionRegion = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
-                mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
-        }
-        else
+        if(mRegionp)
         {
-                mPositionRegion = getPosition();
-                mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+                if (!isRoot())
+                {
+                        mPositionRegion = ((LLViewerObject *)getParent())->getPositionRegion() + getPosition() * getParent()->getRotation();
+                        mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+                }
+                else
+                {
+                        mPositionRegion = getPosition();
+                        mPositionAgent = mRegionp->getPosAgentFromRegion(mPositionRegion);
+                }
         }
 }
 
 const LLVector3d LLViewerObject::getPositionGlobal() const
-{
-        LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
-
-        if (isAttachment())
+{       
+        if(mRegionp)
         {
-                position_global = gAgent.getPosGlobalFromAgent(getRenderPosition());
-        }
+                LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
 
-        return position_global;
+                if (isAttachment())
+                {
+                        position_global = gAgent.getPosGlobalFromAgent(getRenderPosition());
+                }               
+                return position_global;
+        }
+        else
+        {
+                LLVector3d position_global(getPosition());
+                return position_global;
+        }       
 }
 
 const LLVector3 &LLViewerObject::getPositionAgent() const
@@ -3398,6 +3411,7 @@ LLViewerObject* LLViewerObject::getRootEdit() const
 
 BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
                                                                                   S32 face,
+                                                                                  BOOL pick_transparent,
                                                                                   S32* face_hit,
                                                                                   LLVector3* intersection,
                                                                                   LLVector2* tex_coord,
@@ -3407,6 +3421,20 @@ BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector
         return false;
 }
 
+BOOL LLViewerObject::lineSegmentBoundingBox(const LLVector3& start, const LLVector3& end)
+{
+        if (mDrawable.isNull() || mDrawable->isDead())
+        {
+                return FALSE;
+        }
+
+        const LLVector3* ext = mDrawable->getSpatialExtents();
+
+        LLVector3 center = (ext[1]+ext[0])*0.5f;
+        LLVector3 size = (ext[1]-ext[0])*0.5f;
+
+        return LLLineSegmentBoxIntersect(start, end, center, size);
+}
 
 U8 LLViewerObject::getMediaType() const
 {
@@ -4331,8 +4359,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
         {
                 BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
                 mAudioGain = gain;
-                F32 volume = gain * gSavedSettings.getF32("AudioLevelSFX");
-                mAudioSourcep->setGain(volume);
+                mAudioSourcep->setGain(gain);
                 mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
                 mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
                 mAudioSourcep->setSyncSlave(flags & LL_SOUND_FLAG_SYNC_SLAVE);
@@ -4370,8 +4397,7 @@ void LLViewerObject::adjustAudioGain(const F32 gain)
         if (mAudioSourcep)
         {
                 mAudioGain = gain;
-                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
-                mAudioSourcep->setGain(volume);
+                mAudioSourcep->setGain(mAudioGain);
         }
 }
 
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 06d385c..340f279 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -132,7 +132,7 @@ public:
         typedef std::list<LLPointer<LLViewerObject> > child_list_t;
         typedef const child_list_t const_child_list_t;
 
-        LLViewerObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp);
+        LLViewerObject(const LLUUID &id, const LLPCode type, LLViewerRegion *regionp, BOOL is_global = FALSE);
         MEM_TYPE_NEW(LLMemType::MTYPE_OBJECT);
 
         virtual void markDead();                                // Mark this object as dead, and clean up its references
@@ -248,6 +248,7 @@ public:
         //returns TRUE if intersection detected and returns information about intersection
         virtual BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
                                                                           S32 face = -1,                          // which face to check, -1 = ALL_SIDES
+                                                                          BOOL pick_transparent = FALSE,
                                                                           S32* face_hit = NULL,                   // which face was hit
                                                                           LLVector3* intersection = NULL,         // return the intersection point
                                                                           LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -255,6 +256,8 @@ public:
                                                                           LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
                 );
         
+        virtual BOOL lineSegmentBoundingBox(const LLVector3& start, const LLVector3& end);
+
         virtual const LLVector3d getPositionGlobal() const;
         virtual const LLVector3 &getPositionRegion() const;
         virtual const LLVector3 getPositionEdit() const;
@@ -507,6 +510,7 @@ public:
                 LL_VO_PART_GROUP =                      LL_PCODE_APP | 0x90,
                 LL_VO_TRIANGLE_TORUS =          LL_PCODE_APP | 0xa0,
                 LL_VO_WL_SKY =                          LL_PCODE_APP | 0xb0, // should this be moved to 0x40?
+                LL_VO_HUD_PART_GROUP =          LL_PCODE_APP | 0xc0,
         } EVOType;
 
         LLUUID                  mID;
@@ -705,8 +709,8 @@ public:
 class LLStaticViewerObject : public LLViewerObject
 {
 public:
-        LLStaticViewerObject(const LLUUID& id, const LLPCode type, LLViewerRegion* regionp)
-                : LLViewerObject(id,type,regionp)
+        LLStaticViewerObject(const LLUUID& id, const LLPCode type, LLViewerRegion* regionp, BOOL is_global = FALSE)
+                : LLViewerObject(id,type,regionp, is_global)
         { }
 
         virtual void updateDrawable(BOOL force_damped);
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 4fac9bc..9b85fec 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -163,15 +163,20 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
-        U32 local_id = object.mLocalID;
-        LLHost region_host = object.getRegion()->getHost();
-        U32 ip = region_host.getAddress();
-        U32 port = region_host.getPort();
-        U64 ipport = (((U64)ip) << 32) | (U64)port;
-        U32 index = sIPAndPortToIndex[ipport];
+        if(object.getRegion())
+        {
+                U32 local_id = object.mLocalID;
+                LLHost region_host = object.getRegion()->getHost();
+                U32 ip = region_host.getAddress();
+                U32 port = region_host.getPort();
+                U64 ipport = (((U64)ip) << 32) | (U64)port;
+                U32 index = sIPAndPortToIndex[ipport];
+
+                U64     indexid = (((U64)index) << 32) | (U64)local_id;
+                return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
+        }
 
-        U64     indexid = (((U64)index) << 32) | (U64)local_id;
-        return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
+        return FALSE ;
 }
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
@@ -822,8 +827,15 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
         for (S32 i = 0; i < drawablep->getNumFaces(); i++)
         {
-                LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
-                mSelectPickList.erase(objectp);
+                LLFace* facep = drawablep->getFace(i) ;
+                if(facep)
+                {
+                           LLViewerObject* objectp = facep->getViewerObject();
+                           if(objectp)
+                           {
+                                           mSelectPickList.erase(objectp);
+                           }
+                }
         }
 }
 
@@ -902,7 +914,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mActiveObjects.clear();
+                mMapObjects.clear();
         }
 }
 
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index ee34381..0d0fd85 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 94f6d84..5b255ea 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -344,7 +344,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
         media_url = media_url_buffer;
         msg->getU8("DataBlock", "MediaAutoScale", media_auto_scale);
 
-        if (msg->getNumberOfBlocks("DataBlockExtended")) // do we have the extended data?
+        if (msg->has("DataBlockExtended")) // do we have the extended data?
         {
                 char media_type_buffer[257];
                 msg->getString("DataBlockExtended", "MediaType", 255, media_type_buffer);
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 70888ab..389c7e5 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparcelmediaautoplay.cpp b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
index 3b50060..1a1dbd1 100644
--- a/linden/indra/newview/llviewerparcelmediaautoplay.cpp
+++ b/linden/indra/newview/llviewerparcelmediaautoplay.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparcelmediaautoplay.h b/linden/indra/newview/llviewerparcelmediaautoplay.h
index 48d3a36..a8250a1 100644
--- a/linden/indra/newview/llviewerparcelmediaautoplay.h
+++ b/linden/indra/newview/llviewerparcelmediaautoplay.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 2dee2bf..c4f1f31 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index dfd0bb1..0825d10 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index b50ddb6..dc2e0db 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -72,7 +72,7 @@ LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_
         mImageRaw = new LLImageRaw(mParcelGridsPerEdge, mParcelGridsPerEdge, OVERLAY_IMG_COMPONENTS);
         mTexture->createGLTexture(0, mImageRaw);
         gGL.getTexUnit(0)->activate();
-        mTexture->bind(0);
+        gGL.getTexUnit(0)->bind(mTexture);
         mTexture->setClamp(TRUE, TRUE);
         mTexture->setMipFilterNearest(TRUE);
 
@@ -748,7 +748,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
         LLSurface& land = mRegion->getLand();
 
         LLGLSUIDefault gls_ui; // called from pipeline
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest mDepthTest(GL_TRUE);
 
         // Find camera height off the ground (not from zero)
@@ -826,7 +826,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
                         continue;
                 }
 
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
 
                 for (j = 0; j < vertex_per_edge; j++)
                 {
@@ -848,7 +848,7 @@ S32 LLViewerParcelOverlay::renderPropertyLines	()
                         colorp  = mColorArray  + BYTES_PER_COLOR   * i;
                         vertexp = mVertexArray + FLOATS_PER_VERTEX * i;
 
-                        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                        gGL.begin(LLRender::TRIANGLE_STRIP);
 
                         for (j = 0; j < vertex_per_edge; j++)
                         {
diff --git a/linden/indra/newview/llviewerparceloverlay.h b/linden/indra/newview/llviewerparceloverlay.h
index 8d1d3d2..627f36c 100644
--- a/linden/indra/newview/llviewerparceloverlay.h
+++ b/linden/indra/newview/llviewerparceloverlay.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerpartsim.cpp b/linden/indra/newview/llviewerpartsim.cpp
index d27e0df..c303fc5 100644
--- a/linden/indra/newview/llviewerpartsim.cpp
+++ b/linden/indra/newview/llviewerpartsim.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -53,6 +53,7 @@ const F32 PART_SIM_BOX_RAD = 0.5f*F_SQRT3*PART_SIM_BOX_SIDE;
 //static
 S32 LLViewerPartSim::sMaxParticleCount = 0;
 S32 LLViewerPartSim::sParticleCount = 0;
+S32 LLViewerPartSim::sParticleCount2 = 0;
 // This controls how greedy individual particle burst sources are allowed to be, and adapts according to how near the particle-count limit we are.
 F32 LLViewerPartSim::sParticleAdaptiveRate = 0.0625f;
 F32 LLViewerPartSim::sParticleBurstRate = 0.5f;
@@ -84,12 +85,16 @@ LLViewerPart::LLViewerPart() :
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartSourcep = NULL;
+
+        ++LLViewerPartSim::sParticleCount2 ;
 }
 
 LLViewerPart::~LLViewerPart()
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mPartSourcep = NULL;
+
+        --LLViewerPartSim::sParticleCount2 ;
 }
 
 void LLViewerPart::init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *imagep, LLVPCallback cb)
@@ -116,7 +121,8 @@ void LLViewerPart::init(LLPointer<LLViewerPartSource> sourcep, LLViewerImage *im
 //
 
 
-LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 box_side)
+LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 box_side, bool hud)
+ : mHud(hud)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         mVOPartGroupp = NULL;
@@ -133,7 +139,14 @@ LLViewerPartGroup::LLViewerPartGroup(const LLVector3 &center_agent, const F32 bo
         mCenterAgent = center_agent;
         mBoxRadius = F_SQRT3*box_side*0.5f;
 
+        if (mHud)
+        {
+                mVOPartGroupp = (LLVOPartGroup *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_HUD_PART_GROUP, getRegion());
+        }
+        else
+        {
         mVOPartGroupp = (LLVOPartGroup *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_PART_GROUP, getRegion());
+        }
         mVOPartGroupp->setViewerPartGroup(this);
         mVOPartGroupp->setPositionAgent(getCenterAgent());
         F32 scale = box_side * 0.5f;
@@ -223,6 +236,12 @@ BOOL LLViewerPartGroup::posInGroup(const LLVector3 &pos, const F32 desired_size)
 BOOL LLViewerPartGroup::addPart(LLViewerPart* part, F32 desired_size)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
+
+        if (part->mFlags & LLPartData::LL_PART_HUD && !mHud)
+        {
+                return FALSE;
+        }
+
         BOOL uniform_part = part->mScale.mV[0] == part->mScale.mV[1] && 
                                         !(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK);
 
@@ -249,6 +268,8 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
         
         LLVector3 gravity(0.f, 0.f, GRAVITY);
 
+        LLViewerPartSim::checkParticleCount(mParticles.size());
+
         LLViewerRegion *regionp = getRegion();
         S32 end = (S32) mParticles.size();
         for (S32 i = 0 ; i < (S32)mParticles.size();)
@@ -402,6 +423,8 @@ void LLViewerPartGroup::updateParticles(const F32 lastdt)
                 gObjectList.killObject(mVOPartGroupp);
                 mVOPartGroupp = NULL;
         }
+
+        LLViewerPartSim::checkParticleCount() ;
 }
 
 
@@ -437,6 +460,19 @@ void LLViewerPartGroup::removeParticlesByID(const U32 source_id)
 //
 //
 
+//static
+void LLViewerPartSim::checkParticleCount(U32 size)
+{
+        if(LLViewerPartSim::sParticleCount2 != LLViewerPartSim::sParticleCount)
+        {
+                llerrs << "sParticleCount: " << LLViewerPartSim::sParticleCount << " ; sParticleCount2: " << LLViewerPartSim::sParticleCount2 << llendl ;
+        }
+
+        if(size > (U32)LLViewerPartSim::sParticleCount2)
+        {
+                llerrs << "curren particle size: " << LLViewerPartSim::sParticleCount2 << " array size: " << size << llendl ;
+        }
+}
 
 LLViewerPartSim::LLViewerPartSim()
 {
@@ -495,6 +531,12 @@ void LLViewerPartSim::addPart(LLViewerPart* part)
         {
                 put(part);
         }
+        else
+        {
+                //delete the particle if can not add it in
+                delete part ;
+                part = NULL ;
+        }
 }
 
 
@@ -530,7 +572,7 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
                 if(!return_group)
                 {
                         llassert_always(part->mPosAgent.isFinite());
-                        LLViewerPartGroup *groupp = createViewerPartGroup(part->mPosAgent, desired_size);
+                        LLViewerPartGroup *groupp = createViewerPartGroup(part->mPosAgent, desired_size, part->mFlags & LLPartData::LL_PART_HUD);
                         groupp->mUniformParticles = (part->mScale.mV[0] == part->mScale.mV[1] && 
                                                                         !(part->mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK));
                         if (!groupp->addPart(part))
@@ -555,12 +597,12 @@ LLViewerPartGroup *LLViewerPartSim::put(LLViewerPart* part)
         return return_group ;
 }
 
-LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size)
+LLViewerPartGroup *LLViewerPartSim::createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size, bool hud)
 {
         LLMemType mt(LLMemType::MTYPE_PARTICLES);
         //find a box that has a center position divisible by PART_SIM_BOX_SIDE that encompasses
         //pos_agent
-        LLViewerPartGroup *groupp = new LLViewerPartGroup(pos_agent, desired_size);
+        LLViewerPartGroup *groupp = new LLViewerPartGroup(pos_agent, desired_size, hud);
         mViewerPartGroups.push_back(groupp);
         return groupp;
 }
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h
index 0f51240..81394e6 100644
--- a/linden/indra/newview/llviewerpartsim.h
+++ b/linden/indra/newview/llviewerpartsim.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,7 +87,8 @@ class LLViewerPartGroup
 {
 public:
         LLViewerPartGroup(const LLVector3 &center,
-                                          const F32 box_radius);
+                                          const F32 box_radius,
+                                          bool hud);
         virtual ~LLViewerPartGroup();
 
         void cleanup();
@@ -115,6 +116,7 @@ public:
         U32 mID;
 
         F32 mSkippedTime;
+        bool mHud;
 
 protected:
         LLVector3 mCenterAgent;
@@ -178,7 +180,7 @@ public:
         U32 mID;
 
 protected:
-        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size);
+        LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size, bool hud);
         LLViewerPartGroup *put(LLViewerPart* part);
 
         group_list_t mViewerPartGroups;
@@ -195,6 +197,12 @@ protected:
         static const F32 PART_THROTTLE_RESCALE;
         static const F32 PART_ADAPT_RATE_MULT;
         static const F32 PART_ADAPT_RATE_MULT_RECIP;
+
+//debug use only
+public:
+        static S32 sParticleCount2;
+
+        static void checkParticleCount(U32 size = 0) ;
 };
 
 #endif // LL_LLVIEWERPARTSIM_H
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp
index dcef8c2..efeca42 100644
--- a/linden/indra/newview/llviewerpartsource.cpp
+++ b/linden/indra/newview/llviewerpartsource.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -33,6 +33,7 @@
 #include "llviewerpartsource.h"
 
 #include "llviewercontrol.h"
+#include "llrender.h"
 
 #include "llagent.h"
 #include "lldrawable.h"
@@ -69,7 +70,7 @@ void LLViewerPartSource::updatePart(LLViewerPart &part, const F32 dt)
 {
 }
 
-void LLViewerPartSource::update(const F32 dt)
+void LLViewerPartSource::update(const F32 dt) 
 {
         llerrs << "Creating default part source!" << llendl;
 }
@@ -99,7 +100,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp)
         mSourceObjectp = source_objp;
         mPosAgent = mSourceObjectp->getPositionAgent();
         mImagep = gImageList.getImageFromFile("pixiesmall.j2c");
-        mImagep->bind();
+        gGL.getTexUnit(0)->bind(mImagep.get());
         mImagep->setClamp(TRUE, TRUE);
 }
 
@@ -282,6 +283,10 @@ void LLViewerPartSourceScript::update(const F32 dt)
 
                         part->init(this, mImagep, NULL);
                         part->mFlags = mPartSysData.mPartData.mFlags;
+                        if (!mSourceObjectp.isNull() && mSourceObjectp->isHUDAttachment())
+                        {
+                                part->mFlags |= LLPartData::LL_PART_HUD;
+                        }
                         part->mMaxAge = mPartSysData.mPartData.mMaxAge;
                         part->mStartColor = mPartSysData.mPartData.mStartColor;
                         part->mEndColor = mPartSysData.mPartData.mEndColor;
diff --git a/linden/indra/newview/llviewerpartsource.h b/linden/indra/newview/llviewerpartsource.h
index 8b6fb2c..61a5c97 100644
--- a/linden/indra/newview/llviewerpartsource.h
+++ b/linden/indra/newview/llviewerpartsource.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerprecompiledheaders.cpp b/linden/indra/newview/llviewerprecompiledheaders.cpp
index f7d84a5..74ee2a5 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.cpp
+++ b/linden/indra/newview/llviewerprecompiledheaders.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerprecompiledheaders.h b/linden/indra/newview/llviewerprecompiledheaders.h
index 6779d84..d113101 100644
--- a/linden/indra/newview/llviewerprecompiledheaders.h
+++ b/linden/indra/newview/llviewerprecompiledheaders.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 19e5117..0018323 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -215,6 +215,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
         mObjectPartition.push_back(new LLGrassPartition());             //PARTITION_GRASS
         mObjectPartition.push_back(new LLVolumePartition());    //PARTITION_VOLUME
         mObjectPartition.push_back(new LLBridgePartition());    //PARTITION_BRIDGE
+        mObjectPartition.push_back(new LLHUDParticlePartition());//PARTITION_HUD_PARTICLE
         mObjectPartition.push_back(NULL);                                               //PARTITION_NONE
         
 }
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h
index d65ad23..58ebf60 100644
--- a/linden/indra/newview/llviewerregion.h
+++ b/linden/indra/newview/llviewerregion.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -81,6 +81,7 @@ public:
                 PARTITION_GRASS,
                 PARTITION_VOLUME,
                 PARTITION_BRIDGE,
+                PARTITION_HUD_PARTICLE,
                 PARTITION_NONE,
                 NUM_PARTITIONS
         } eObjectPartitions;
diff --git a/linden/indra/newview/llviewershadermgr.cpp b/linden/indra/newview/llviewershadermgr.cpp
index a654120..dab9e82 100644
--- a/linden/indra/newview/llviewershadermgr.cpp
+++ b/linden/indra/newview/llviewershadermgr.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -108,7 +108,7 @@ GLint				gAvatarMatrixParam;
 LLViewerShaderMgr::LLViewerShaderMgr() :
         mVertexShaderLevel(SHADER_COUNT, 0)
 {       
-/// Make sure WL Sky is the first program
+        /// Make sure WL Sky is the first program
         mShaderList.push_back(&gWLSkyProgram);
         mShaderList.push_back(&gWLCloudProgram);
         mShaderList.push_back(&gAvatarProgram);
@@ -139,28 +139,28 @@ LLViewerShaderMgr * LLViewerShaderMgr::instance()
         if(NULL == sInstance)
         {
                 sInstance = new LLViewerShaderMgr();
-        }       
-        
-        return static_cast<LLViewerShaderMgr*>(sInstance);
         }
 
+        return static_cast<LLViewerShaderMgr*>(sInstance);
+}
+
 void LLViewerShaderMgr::initAttribsAndUniforms(void)
-        {
+{
         if (mReservedAttribs.empty())
-                {
+        {
                 mReservedAttribs.push_back("materialColor");
                 mReservedAttribs.push_back("specularColor");
                 mReservedAttribs.push_back("binormal");
-                
+
                 mAvatarAttribs.reserve(5);
                 mAvatarAttribs.push_back("weight");
                 mAvatarAttribs.push_back("clothing");
                 mAvatarAttribs.push_back("gWindDir");
                 mAvatarAttribs.push_back("gSinWaveParams");
                 mAvatarAttribs.push_back("gGravity");
-                        
+
                 mAvatarUniforms.push_back("matrixPalette");
-                        
+
                 mReservedUniforms.reserve(24);
                 mReservedUniforms.push_back("diffuseMap");
                 mReservedUniforms.push_back("specularMap");
@@ -186,16 +186,16 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
                 mReservedUniforms.push_back("cloud_scale");
                 mReservedUniforms.push_back("gamma");
                 mReservedUniforms.push_back("scene_light_strength");
-                        
+
                 mWLUniforms.push_back("camPosLocal");
-                        
+
                 mTerrainUniforms.reserve(5);
                 mTerrainUniforms.push_back("detail_0");
                 mTerrainUniforms.push_back("detail_1");
                 mTerrainUniforms.push_back("detail_2");
                 mTerrainUniforms.push_back("detail_3");
                 mTerrainUniforms.push_back("alpha_ramp");
-        
+
                 mGlowUniforms.push_back("glowDelta");
                 mGlowUniforms.push_back("glowStrength");
 
@@ -204,7 +204,7 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
                 mGlowExtractUniforms.push_back("lumWeights");
                 mGlowExtractUniforms.push_back("warmthWeights");
                 mGlowExtractUniforms.push_back("warmthAmount");
-        
+
                 mShinyUniforms.push_back("origin");
 
                 mWaterUniforms.reserve(12);
@@ -222,9 +222,9 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void)
                 mWaterUniforms.push_back("kd");
                 mWaterUniforms.push_back("refScale");
                 mWaterUniforms.push_back("waterHeight");
-                }
-        }
-
+        }       
+}
+        
 
 //============================================================================
 // Set Levels
@@ -1087,12 +1087,12 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
 }
 
 std::string LLViewerShaderMgr::getShaderDirPrefix(void)
-        {
+{
         return gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "shaders/class");
-        }
+}
 
 void LLViewerShaderMgr::updateShaderUniforms(LLGLSLShader * shader)
-                        {
+{
         LLWLParamManager::instance()->updateShaderUniforms(shader);
         LLWaterParamManager::instance()->updateShaderUniforms(shader);
 }
diff --git a/linden/indra/newview/llviewershadermgr.h b/linden/indra/newview/llviewershadermgr.h
index 3894cd5..5e81887 100644
--- a/linden/indra/newview/llviewershadermgr.h
+++ b/linden/indra/newview/llviewershadermgr.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp
index edefb57..c429e90 100644
--- a/linden/indra/newview/llviewerstats.cpp
+++ b/linden/indra/newview/llviewerstats.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -40,6 +40,7 @@
 #include "llappviewer.h"
 
 #include "pipeline.h" 
+#include "lltexturefetch.h" 
 #include "llviewerobjectlist.h" 
 #include "llviewerimagelist.h" 
 #include "lltexlayer.h"
@@ -561,15 +562,12 @@ void update_statistics(U32 frame_count)
         LLViewerStats::getInstance()->mAssetKBitStat.addValue(gTransferManager.getTransferBitsIn(LLTCT_ASSET)/1024.f);
         gTransferManager.resetTransferBitsIn(LLTCT_ASSET);
 
-        static S32 tex_bits_idle_count = 0;
-        if (LLViewerImageList::sTextureBits == 0)
+        if (LLAppViewer::getTextureFetch()->getNumRequests() == 0)
         {
-                if (++tex_bits_idle_count >= 30)
-                        gDebugTimers[0].pause();
+                gDebugTimers[0].pause();
         }
         else
         {
-                tex_bits_idle_count = 0;
                 gDebugTimers[0].unpause();
         }
         
@@ -679,8 +677,7 @@ void send_stats()
         // send fps only for time app spends in foreground
         agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
         agent["version"] = gCurrentVersion;
-        std::string language(gSavedSettings.getString("Language"));
-        if(language == "default") language = gSavedSettings.getString("SystemLanguage");        
+        std::string language = LLUI::getLanguage();
         agent["language"] = language;
         
         agent["sim_fps"] = ((F32) gFrameCount - gSimFrames) /
@@ -759,10 +756,17 @@ void send_stats()
         // misc["string_2"] = 
 //      misc["int_1"] = LLFloaterDirectory::sOldSearchCount; // Steve: 1.18.6
 //      misc["int_2"] = LLFloaterDirectory::sNewSearchCount; // Steve: 1.18.6
-        misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
-        misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
+//      misc["int_1"] = LLSD::Integer(gSavedSettings.getU32("RenderQualityPerformance")); // Steve: 1.21
+//      misc["int_2"] = LLSD::Integer(gFrameStalls); // Steve: 1.21
+
+        F32 unbaked_time = LLVOAvatar::sUnbakedTime * 1000.f / gFrameTimeSeconds;
+        misc["int_1"] = LLSD::Integer(unbaked_time); // Steve: 1.22
+        F32 grey_time = LLVOAvatar::sGreyTime * 1000.f / gFrameTimeSeconds;
+        misc["int_2"] = LLSD::Integer(grey_time); // Steve: 1.22
+
+        llinfos << "Misc Stats: int_1: " << misc["int_1"] << " int_2: " << misc["int_2"] << llendl;
+        llinfos << "Misc Stats: string_1: " << misc["string_1"] << " string_2: " << misc["string_2"] << llendl;
         
         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 f33ad02..3169794 100644
--- a/linden/indra/newview/llviewerstats.h
+++ b/linden/indra/newview/llviewerstats.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -77,6 +77,9 @@ public:
         LLStat mSimAgentMsec;
         LLStat mSimImagesMsec;
         LLStat mSimScriptMsec;
+        LLStat mSimSpareMsec;
+        LLStat mSimSleepMsec;
+        LLStat mSimPumpIOMsec;
 
         LLStat mSimMainAgents;
         LLStat mSimChildAgents;
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 1dda1ca..3e2cc19 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -616,7 +616,10 @@ BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* s
                 LLView *viewp = *child_iter;
                 S32 local_x = x - viewp->getRect().mLeft;
                 S32 local_y = y - viewp->getRect().mBottom;
-                if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
+                if( viewp->pointInView(local_x, local_y) 
+                        && viewp->getVisible() 
+                        && viewp->getEnabled()
+                        && viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
                 {
                         return TRUE;
                 }
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index 26fd9b3..4cd5850 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewertextureanim.cpp b/linden/indra/newview/llviewertextureanim.cpp
index bfa999c..4936bd2 100644
--- a/linden/indra/newview/llviewertextureanim.cpp
+++ b/linden/indra/newview/llviewertextureanim.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewertextureanim.h b/linden/indra/newview/llviewertextureanim.h
index a12c241..01c5864 100644
--- a/linden/indra/newview/llviewertextureanim.h
+++ b/linden/indra/newview/llviewertextureanim.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index 311dff3..72a8a80 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerthrottle.h b/linden/indra/newview/llviewerthrottle.h
index 48dc9ee..a6cc9d6 100644
--- a/linden/indra/newview/llviewerthrottle.h
+++ b/linden/indra/newview/llviewerthrottle.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewervisualparam.cpp b/linden/indra/newview/llviewervisualparam.cpp
index 8358991..ec6345a 100644
--- a/linden/indra/newview/llviewervisualparam.cpp
+++ b/linden/indra/newview/llviewervisualparam.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewervisualparam.h b/linden/indra/newview/llviewervisualparam.h
index 5eb750f..b078a72 100644
--- a/linden/indra/newview/llviewervisualparam.h
+++ b/linden/indra/newview/llviewervisualparam.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 854d757..017c225 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,13 +29,13 @@
  * $/LicenseInfo$
  */
 
+#include "llviewerprecompiledheaders.h"
+
 // system library includes
 #include <stdio.h>
 #include <iostream>
 #include <fstream>
 
-#include "llviewerprecompiledheaders.h"
-
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
 #include "llviewerwindow.h"
@@ -168,6 +168,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llviewershadermgr.h"
 #include "llviewerstats.h"
 #include "llvoavatar.h"
 #include "llvovolume.h"
@@ -180,9 +181,9 @@
 #include "llspatialpartition.h"
 #include "llviewerjoystick.h"
 #include "llviewernetwork.h"
+#include "llpostprocess.h"
 
 #if LL_WINDOWS
-#include "llwindebug.h"
 #include <tchar.h> // For Unicode conversion methods
 #endif
 
@@ -218,6 +219,7 @@ LLVector3       gDebugRaycastIntersection;
 LLVector2       gDebugRaycastTexCoord;
 LLVector3       gDebugRaycastNormal;
 LLVector3       gDebugRaycastBinormal;
+S32                             gDebugRaycastFaceHit;
 
 // HUD display lines in lower right
 BOOL                            gDisplayWindInfo = FALSE;
@@ -916,7 +918,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 
         // *HACK: this should be rolled into the composite tool logic, not
         // hardcoded at the top level.
-        if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode())
+        if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance())
         {
                 // 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
@@ -1102,6 +1104,7 @@ void LLViewerWindow::handleQuit(LLWindow *window)
 void LLViewerWindow::handleResize(LLWindow *window,  S32 width,  S32 height)
 {
         reshape(width, height);
+        mResDirty = true;
 }
 
 // The top-level window has gained focus (e.g. via ALT-TAB)
@@ -1258,6 +1261,8 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
 
 BOOL LLViewerWindow::handleActivateApp(LLWindow *window, BOOL activating)
 {
+        //if (!activating) gAgent.changeCameraToDefault();
+
         LLViewerJoystick::getInstance()->setNeedsReset(true);
         return FALSE;
 }
@@ -1410,7 +1415,11 @@ LLViewerWindow::LLViewerWindow(
         mHideCursorPermanent( FALSE ),
         mCursorHidden(FALSE),
         mIgnoreActivate( FALSE ),
-        mHoverPick()
+        mHoverPick(),
+        mResDirty(false),
+        mStatesDirty(false),
+        mIsFullscreenChecked(false),
+        mCurrResolutionIndex(0)
 {
         // Default to application directory.
         LLViewerWindow::sSnapshotBaseName = "Snapshot";
@@ -1426,12 +1435,12 @@ LLViewerWindow::LLViewerWindow(
                 !gNoRender,
                 ignore_pixel_depth,
                 gSavedSettings.getU32("RenderFSAASamples"));
-#if LL_WINDOWS
-        if (!LLWinDebug::checkExceptionHandler())
+
+        if (!LLAppViewer::instance()->restoreErrorTrap())
         {
-                LL_WARNS("Window") << " Someone took over my exception handler (post createWindow)!" << LL_ENDL;
+                LL_WARNS("Window") << " Someone took over my signal/exception handler (post createWindow)!" << LL_ENDL;
         }
-#endif
+
 
         if (NULL == mWindow)
         {
@@ -1545,7 +1554,7 @@ void LLViewerWindow::initGLDefaults()
         glPixelStorei(GL_PACK_ALIGNMENT,1);
         glPixelStorei(GL_UNPACK_ALIGNMENT,1);
 
-        glEnable(GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
         // lights for objects
         glShadeModel( GL_SMOOTH );
@@ -2089,12 +2098,7 @@ void LLViewerWindow::reshape(S32 width, S32 height)
                 gSavedSettings.setBOOL("FullScreen", mWantFullscreen);
 
                 // store new settings for the mode we are in, regardless
-                if (mWindow->getFullscreen())
-                {
-                        gSavedSettings.setS32("FullScreenWidth", width);
-                        gSavedSettings.setS32("FullScreenHeight", height);
-                }
-                else
+                if (!mWindow->getFullscreen())
                 {
                         // Only save size if not maximized
                         BOOL maximized = mWindow->getMaximized();
@@ -3042,8 +3046,9 @@ BOOL LLViewerWindow::handlePerFrameHover()
 
         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
         {
-                gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1,
-                                                                                          NULL,
+                gDebugRaycastFaceHit = -1;
+                gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE,
+                                                                                          &gDebugRaycastFaceHit,
                                                                                           &gDebugRaycastIntersection,
                                                                                           &gDebugRaycastTexCoord,
                                                                                           &gDebugRaycastNormal,
@@ -3184,7 +3189,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                 // Render light for editing
                 if (LLSelectMgr::sRenderLightRadius && LLToolMgr::getInstance()->inEdit())
                 {
-                        LLImageGL::unbindTexture(0);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLGLEnable gls_blend(GL_BLEND);
                         LLGLEnable gls_cull(GL_CULL_FACE);
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
@@ -3398,7 +3403,7 @@ void LLViewerWindow::schedulePick(LLPickInfo& pick_info)
         llassert_always(pick_info.mScreenRegion.notNull());
         mPicks.push_back(pick_info);
         
-        S32 scaled_x = llround((F32)pick_info.mMousePt.mX * mDisplayScale.mV[VX]);
+        /*S32 scaled_x = llround((F32)pick_info.mMousePt.mX * mDisplayScale.mV[VX]);
         S32 scaled_y = llround((F32)pick_info.mMousePt.mY * mDisplayScale.mV[VY]);
 
         // Default to not hitting anything
@@ -3467,7 +3472,7 @@ void LLViewerWindow::schedulePick(LLPickInfo& pick_info)
 
         setup3DRender();
         setup2DRender();
-        setupViewport();
+        setupViewport();*/
 
         // delay further event processing until we receive results of pick
         mWindow->delayInputProcessing();
@@ -3526,9 +3531,33 @@ LLPickInfo LLViewerWindow::pickImmediate(S32 x, S32 y_from_bot,  BOOL pick_trans
         return mLastPick;
 }
 
+LLHUDIcon* LLViewerWindow::cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
+                                                                                   LLVector3* intersection)
+{
+        S32 x = mouse_x;
+        S32 y = mouse_y;
+
+        if ((mouse_x == -1) && (mouse_y == -1)) // use current mouse position
+        {
+                x = getCurrentMouseX();
+                y = getCurrentMouseY();
+        }
+
+        // world coordinates of mouse
+        LLVector3 mouse_direction_global = mouseDirectionGlobal(x,y);
+        LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin();
+        LLVector3 mouse_world_start = mouse_point_global;
+        LLVector3 mouse_world_end   = mouse_point_global + mouse_direction_global * depth;
+
+        return LLHUDIcon::lineSegmentIntersectAll(mouse_world_start, mouse_world_end, intersection);
+
+        
+}
+
 LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 depth,
                                                                                                 LLViewerObject *this_object,
                                                                                                 S32 this_face,
+                                                                                                BOOL pick_transparent,
                                                                                                 S32* face_hit,
                                                                                                 LLVector3 *intersection,
                                                                                                 LLVector2 *uv,
@@ -3550,8 +3579,18 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
         LLVector3 mouse_hud_end   = mouse_point_hud + LLVector3(depth, 0, 0);
         
         // world coordinates of mouse
-        LLVector3               mouse_direction_global = mouseDirectionGlobal(x,y);
+        LLVector3 mouse_direction_global = mouseDirectionGlobal(x,y);
         LLVector3 mouse_point_global = LLViewerCamera::getInstance()->getOrigin();
+        
+        //get near clip plane
+        LLVector3 n = LLViewerCamera::getInstance()->getAtAxis();
+        LLVector3 p = mouse_point_global + n * LLViewerCamera::getInstance()->getNear();
+
+        //project mouse point onto plane
+        LLVector3 pos;
+        line_plane(mouse_point_global, mouse_direction_global, p, n, pos);
+        mouse_point_global = pos;
+
         LLVector3 mouse_world_start = mouse_point_global;
         LLVector3 mouse_world_end   = mouse_point_global + mouse_direction_global * depth;
 
@@ -3562,7 +3601,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
         {
                 if (this_object->isHUDAttachment()) // is a HUD object?
                 {
-                        if (this_object->lineSegmentIntersect(mouse_hud_start, mouse_hud_end, this_face,
+                        if (this_object->lineSegmentIntersect(mouse_hud_start, mouse_hud_end, this_face, pick_transparent,
                                                                                                   face_hit, intersection, uv, normal, binormal))
                         {
                                 found = this_object;
@@ -3571,7 +3610,7 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
                 
                 else // is a world object
                 {
-                        if (this_object->lineSegmentIntersect(mouse_world_start, mouse_world_end, this_face,
+                        if (this_object->lineSegmentIntersect(mouse_world_start, mouse_world_end, this_face, pick_transparent,
                                                                                                   face_hit, intersection, uv, normal, binormal))
                         {
                                 found = this_object;
@@ -3581,13 +3620,13 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
 
         else // check ALL objects
                         {
-                found = gPipeline.lineSegmentIntersectInHUD(mouse_hud_start, mouse_hud_end,
+                found = gPipeline.lineSegmentIntersectInHUD(mouse_hud_start, mouse_hud_end, pick_transparent,
                                                                                                         face_hit, intersection, uv, normal, binormal);
 
                 if (!found) // if not found in HUD, look in world:
 
                         {
-                        found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end,
+                        found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end, pick_transparent,
                                                                                                                   face_hit, intersection, uv, normal, binormal);
                         }
 
@@ -3634,7 +3673,7 @@ LLVector3 LLViewerWindow::mousePointHUD(const S32 x, const S32 y) const
         F32 hud_x = -((F32)x - (F32)width/2.f)  / height;
         F32 hud_y = ((F32)y - (F32)height/2.f) / height;
 
-        return LLVector3(0.f, hud_x, hud_y);
+        return LLVector3(0.f, hud_x/gAgent.mHUDCurZoom, hud_y/gAgent.mHUDCurZoom);
 }
 
 // Returns unit vector relative to camera in camera space
@@ -3811,9 +3850,8 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image)
                 return FALSE;
         }
 
-        std::string extension("." + image->getExtension());
-
         LLFilePicker::ESaveFilter pick_type;
+        std::string extension("." + image->getExtension());
         if (extension == ".j2c")
                 pick_type = LLFilePicker::FFSAVE_J2C;
         else if (extension == ".bmp")
@@ -3831,7 +3869,8 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image)
         if ( ! isSnapshotLocSet())              
         {
                 std::string proposed_name( sSnapshotBaseName );
-                proposed_name.append( extension );
+
+                // getSaveFile will append an appropriate extension to the proposed name, based on the ESaveFilter constant passed in.
 
                 // pick a directory in which to save
                 LLFilePicker& picker = LLFilePicker::instance();
@@ -4148,7 +4187,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
                                         
                                         snapshot_width = image_width;
                                         snapshot_height = image_height;
-                                        target.allocate(snapshot_width, snapshot_height, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB, TRUE);
+                                        target.allocate(snapshot_width, snapshot_height, GL_RGBA, TRUE, LLTexUnit::TT_RECT_TEXTURE, TRUE);
                                         window_width = snapshot_width;
                                         window_height = snapshot_height;
                                         scale_factor = 1.f;
@@ -4376,7 +4415,7 @@ void LLViewerWindow::drawMouselookInstructions()
                 llround(font->getLineHeight() + 2 * INSTRUCTIONS_PAD));
 
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4f( 0.9f, 0.9f, 0.9f, 1.0f );
                 gl_rect_2d( instructions_rect );
         }
@@ -4502,6 +4541,10 @@ void LLViewerWindow::dumpState()
 
 void LLViewerWindow::stopGL(BOOL save_state)
 {
+        //Note: --bao
+        //if not necessary, do not change the order of the function calls in this function.
+        //if change something, make sure it will not break anything.
+        //especially be careful to put anything behind gImageList.destroyGL(save_state);
         if (!gGLManager.mIsDisabled)
         {
                 llinfos << "Shutting down GL..." << llendl;
@@ -4510,12 +4553,12 @@ void LLViewerWindow::stopGL(BOOL save_state)
                 LLAppViewer::getTextureCache()->pause();
                 LLAppViewer::getImageDecodeThread()->pause();
                 LLAppViewer::getTextureFetch()->pause();
-                
+                                
                 gSky.destroyGL();
-                stop_glerror();
-        
-                gImageList.destroyGL(save_state);
-                stop_glerror();
+                stop_glerror();         
+
+                LLManipTranslate::destroyGL() ;
+                stop_glerror();         
 
                 gBumpImageList.destroyGL();
                 stop_glerror();
@@ -4539,6 +4582,14 @@ void LLViewerWindow::stopGL(BOOL save_state)
                 gSphere.cleanupGL();
                 gCylinder.cleanupGL();
                 
+                if(gPostProcess)
+                {
+                        gPostProcess->invalidate();
+                }
+
+                gImageList.destroyGL(save_state);
+                stop_glerror();
+
                 gGLManager.mIsDisabled = TRUE;
                 stop_glerror();
                 
@@ -4548,25 +4599,32 @@ void LLViewerWindow::stopGL(BOOL save_state)
 
 void LLViewerWindow::restoreGL(const std::string& progress_message)
 {
+        //Note: --bao
+        //if not necessary, do not change the order of the function calls in this function.
+        //if change something, make sure it will not break anything. 
+        //especially, be careful to put something before gImageList.restoreGL();
         if (gGLManager.mIsDisabled)
         {
                 llinfos << "Restoring GL..." << llendl;
                 gGLManager.mIsDisabled = FALSE;
+                
+                initGLDefaults();
+                LLGLState::restoreGL();
+                gImageList.restoreGL();
 
                 // for future support of non-square pixels, and fonts that are properly stretched
                 //LLFontGL::destroyDefaultFonts();
                 initFonts();
-                initGLDefaults();
-                LLGLState::restoreGL();
+                                
                 gSky.restoreGL();
                 gPipeline.restoreGL();
                 LLDrawPoolWater::restoreGL();
                 LLManipTranslate::restoreGL();
-                gImageList.restoreGL();
+                
                 gBumpImageList.restoreGL();
                 LLDynamicTexture::restoreGL();
                 LLVOAvatar::restoreGL();
-
+                
                 gResizeScreenTexture = TRUE;
 
                 if (gFloaterCustomize && gFloaterCustomize->getVisible())
@@ -4582,12 +4640,10 @@ void LLViewerWindow::restoreGL(const std::string& progress_message)
                         setProgressString(progress_message);
                 }
                 llinfos << "...Restoring GL done" << llendl;
-#if LL_WINDOWS
-                if(!LLWinDebug::checkExceptionHandler())
+                if(!LLAppViewer::instance()->restoreErrorTrap())
                 {
-                        llwarns << " Someone took over my exception handler (post restoreGL)!" << llendl;
+                        llwarns << " Someone took over my signal/exception handler (post restoreGL)!" << llendl;
                 }
-#endif
 
         }
 }
@@ -4617,6 +4673,7 @@ void LLViewerWindow::toggleFullscreen(BOOL show_progress)
         if (mWindow)
         {
                 mWantFullscreen = mWindow->getFullscreen() ? FALSE : TRUE;
+                mIsFullscreenChecked =  mWindow->getFullscreen() ? FALSE : TRUE;
                 mShowFullscreenProgress = show_progress;
         }
 }
@@ -4643,37 +4700,89 @@ void LLViewerWindow::getTargetWindow(BOOL& fullscreen, S32& width, S32& height)
         }
 }
 
+void LLViewerWindow::requestResolutionUpdate(bool fullscreen_checked)
+{
+        mResDirty = true;
+        mWantFullscreen = fullscreen_checked;
+        mIsFullscreenChecked = fullscreen_checked;
+}
 
 BOOL LLViewerWindow::checkSettings()
 {
-        BOOL is_fullscreen = mWindow->getFullscreen();
-        if (is_fullscreen && !mWantFullscreen)
+        if (mStatesDirty)
         {
-                changeDisplaySettings(FALSE, 
-                                                          LLCoordScreen(gSavedSettings.getS32("WindowWidth"),
-                                                                                        gSavedSettings.getS32("WindowHeight")),
-                                                          TRUE,
-                                                          mShowFullscreenProgress);
-                return TRUE;
+                gGL.refreshState();
+                LLViewerShaderMgr::instance()->setShaders();
+                mStatesDirty = false;
         }
-        else if (!is_fullscreen && mWantFullscreen)
+        
+        // We want to update the resolution AFTER the states getting refreshed not before.
+        if (mResDirty)
         {
-                if (!LLStartUp::canGoFullscreen())
+                if (gSavedSettings.getBOOL("FullScreenAutoDetectAspectRatio"))
                 {
-                        return FALSE;
+                        getWindow()->setNativeAspectRatio(0.f);
+                }
+                else
+                {
+                        getWindow()->setNativeAspectRatio(gSavedSettings.getF32("FullScreenAspectRatio"));
                 }
                 
-                LLGLState::checkStates();
-                LLGLState::checkTextureChannels();
-                changeDisplaySettings(TRUE, 
-                                                          LLCoordScreen(gSavedSettings.getS32("FullScreenWidth"),
-                                                                                        gSavedSettings.getS32("FullScreenHeight")),
-                                                          gSavedSettings.getBOOL("DisableVerticalSync"),
-                                                          mShowFullscreenProgress);
-
-                LLGLState::checkStates();
-                LLGLState::checkTextureChannels();
-                return TRUE;
+                reshape(getWindowDisplayWidth(), getWindowDisplayHeight());
+
+                // force aspect ratio
+                if (mIsFullscreenChecked)
+                {
+                        LLViewerCamera::getInstance()->setAspect( getDisplayAspectRatio() );
+                }
+
+                mResDirty = false;
+                // This will force a state update the next frame.
+                mStatesDirty = true;
+        }
+                
+        BOOL is_fullscreen = mWindow->getFullscreen();
+        if(mWantFullscreen)
+        {
+                LLCoordScreen screen_size;
+                LLCoordScreen desired_screen_size(gSavedSettings.getS32("FullScreenWidth"),
+                                                                   gSavedSettings.getS32("FullScreenHeight"));
+                getWindow()->getSize(&screen_size);
+                if(!is_fullscreen || 
+                    screen_size.mX != desired_screen_size.mX 
+                        || screen_size.mY != desired_screen_size.mY)
+                {
+                        if (!LLStartUp::canGoFullscreen())
+                        {
+                                return FALSE;
+                        }
+                        
+                        LLGLState::checkStates();
+                        LLGLState::checkTextureChannels();
+                        changeDisplaySettings(TRUE, 
+                                                                  desired_screen_size,
+                                                                  gSavedSettings.getBOOL("DisableVerticalSync"),
+                                                                  mShowFullscreenProgress);
+
+                        LLGLState::checkStates();
+                        LLGLState::checkTextureChannels();
+                        mStatesDirty = true;
+                        return TRUE;
+                }
+        }
+        else
+        {
+                if(is_fullscreen)
+                {
+                        // Changing to windowed mode.
+                        changeDisplaySettings(FALSE, 
+                                                                  LLCoordScreen(gSavedSettings.getS32("WindowWidth"),
+                                                                                                gSavedSettings.getS32("WindowHeight")),
+                                                                  TRUE,
+                                                                  mShowFullscreenProgress);
+                        mStatesDirty = true;
+                        return TRUE;
+                }
         }
         return FALSE;
 }
@@ -4704,13 +4813,9 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
         BOOL old_fullscreen = mWindow->getFullscreen();
         if (!old_fullscreen && fullscreen && !LLStartUp::canGoFullscreen())
         {
-                // we can't do this now, so do it later
-                
-                gSavedSettings.setS32("FullScreenWidth", size.mX);
-                gSavedSettings.setS32("FullScreenHeight", size.mY);
-                //gSavedSettings.setBOOL("DisableVerticalSync", disable_vsync);
-                
-                return TRUE;    // a lie..., because we'll get to it later
+                // Not allowed to switch to fullscreen now, so exit early.
+                // *NOTE: This case should never be reached, but just-in-case.
+                return TRUE;
         }
 
         U32 fsaa = gSavedSettings.getU32("RenderFSAASamples");
@@ -4797,7 +4902,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
 #if LL_WINDOWS
                 // Only trigger a reshape after switching to fullscreen; otherwise rely on the windows callback
                 // (otherwise size is wrong; this is the entire window size, reshape wants the visible window size)
-                if (fullscreen)
+                if (fullscreen && result_first_try)
 #endif
                 {
                         reshape(size.mX, size.mY);
@@ -5099,25 +5204,41 @@ LLPickInfo::~LLPickInfo()
 
 void LLPickInfo::fetchResults()
 {
+
+        S32 face_hit = -1;
+        LLVector3 intersection, normal, binormal;
+        LLVector2 uv;
+
+        LLHUDIcon* hit_icon = gViewerWindow->cursorIntersectIcon(mMousePt.mX, mMousePt.mY, 512.f, &intersection);
+        
+        F32 icon_dist = 0.f;
+        if (hit_icon)
+        {
+                icon_dist = (LLViewerCamera::getInstance()->getOrigin()-intersection).magVec();
+        }
+        LLViewerObject* hit_object = gViewerWindow->cursorIntersect(mMousePt.mX, mMousePt.mY, 512.f,
+                                                                        NULL, -1, mPickTransparent, &face_hit,
+                                                                        &intersection, &uv, &normal, &binormal);
+        
         // read back colors and depth values from buffer
-        glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
-        glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_DEPTH_COMPONENT, GL_FLOAT, mPickDepthBuffer );
+        //glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_RGBA, GL_UNSIGNED_BYTE, mPickBuffer);
+        //glReadPixels(mScreenRegion.mLeft, mScreenRegion.mBottom, mScreenRegion.getWidth(), mScreenRegion.getHeight(), GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, mPickDepthBuffer );
 
         // find pick region that is fully onscreen
         LLCoordGL scaled_pick_point;;
         scaled_pick_point.mX = llclamp(llround((F32)mMousePt.mX * gViewerWindow->getDisplayScale().mV[VX]), PICK_HALF_WIDTH, gViewerWindow->getWindowDisplayWidth() - PICK_HALF_WIDTH);
         scaled_pick_point.mY = llclamp(llround((F32)mMousePt.mY * gViewerWindow->getDisplayScale().mV[VY]), PICK_HALF_WIDTH, gViewerWindow->getWindowDisplayHeight() - PICK_HALF_WIDTH);
-        S32 pixel_index = PICK_HALF_WIDTH * PICK_DIAMETER + PICK_HALF_WIDTH;
-        S32 pick_id = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
-        F32 depth = mPickDepthBuffer[pixel_index];
+        //S32 pixel_index = PICK_HALF_WIDTH * PICK_DIAMETER + PICK_HALF_WIDTH;
+        //S32 pick_id = (U32)mPickBuffer[(pixel_index * 4) + 0] << 16 | (U32)mPickBuffer[(pixel_index * 4) + 1] << 8 | (U32)mPickBuffer[(pixel_index * 4) + 2];
+        //F32 depth = mPickDepthBuffer[pixel_index];
 
-        S32 x_offset = mMousePt.mX - llround((F32)scaled_pick_point.mX / gViewerWindow->getDisplayScale().mV[VX]);
-        S32 y_offset = mMousePt.mY - llround((F32)scaled_pick_point.mY / gViewerWindow->getDisplayScale().mV[VY]);
+        //S32 x_offset = mMousePt.mX - llround((F32)scaled_pick_point.mX / gViewerWindow->getDisplayScale().mV[VX]);
+        //S32 y_offset = mMousePt.mY - llround((F32)scaled_pick_point.mY / gViewerWindow->getDisplayScale().mV[VY]);
 
         mPickPt = mMousePt;
 
         // we hit nothing, scan surrounding pixels for something useful
-        if (!pick_id)
+        /*if (!pick_id)
         {
                 S32 closest_distance = 10000;
                 //S32 closest_pick_name = 0;
@@ -5138,23 +5259,28 @@ void LLPickInfo::fetchResults()
                                 }
                         }
                 }
-        }
+        }*/
 
-        U32 te_offset = ((U32)pick_id >> 20);
-        pick_id &= 0x000fffff;
 
-        //unproject relative clicked coordinate from window coordinate using GL
-        GLint viewport[4];
-        GLdouble modelview[16];
-        GLdouble projection[16];
-        GLfloat winX, winY;
-        GLdouble posX, posY, posZ;
+        U32 te_offset = face_hit > -1 ? face_hit : 0;
+        //pick_id &= 0x000fffff;
 
-        LLViewerObject* objectp = gObjectList.getSelectedObject(pick_id);
+        //unproject relative clicked coordinate from window coordinate using GL
+        
+        LLViewerObject* objectp = hit_object;
 
-        if (pick_id == (S32)GL_NAME_PARCEL_WALL)
+        //if (pick_id == (S32)GL_NAME_PARCEL_WALL)
+        //{
+        //      mPickType = PICK_PARCEL_WALL;
+        //}
+        if (hit_icon && 
+                (!objectp || 
+                icon_dist < (LLViewerCamera::getInstance()->getOrigin()-intersection).magVec()))
         {
-                mPickType = PICK_PARCEL_WALL;
+                // was this name referring to a hud icon?
+                mHUDIcon = hit_icon;
+                mPickType = PICK_ICON;
+                mPosGlobal = mHUDIcon->getPositionGlobal();
         }
         else if (objectp)
         {
@@ -5182,11 +5308,11 @@ void LLPickInfo::fetchResults()
                         {
                                 mPickType = PICK_OBJECT;
                         }
-                        mObjectOffset = gAgent.calcFocusOffset(objectp, mPickPt.mX, mPickPt.mY);
+                        mObjectOffset = gAgent.calcFocusOffset(objectp, intersection, mPickPt.mX, mPickPt.mY);
                         mObjectID = objectp->mID;
                         mObjectFace = (te_offset == NO_FACE) ? -1 : (S32)te_offset;
 
-                        glh::matrix4f newModel((F32*)LLViewerCamera::getInstance()->getModelview().mMatrix);
+                        /*glh::matrix4f newModel((F32*)LLViewerCamera::getInstance()->getModelview().mMatrix);
 
                         for(U32 i = 0; i < 16; ++i)
                         {
@@ -5198,9 +5324,9 @@ void LLPickInfo::fetchResults()
                         winX = ((F32)mPickPt.mX) * gViewerWindow->getDisplayScale().mV[VX];
                         winY = ((F32)mPickPt.mY) * gViewerWindow->getDisplayScale().mV[VY];
 
-                        gluUnProject( winX, winY, depth, modelview, projection, viewport, &posX, &posY, &posZ);
+                        gluUnProject( winX, winY, depth, modelview, projection, viewport, &posX, &posY, &posZ);*/
 
-                        mPosGlobal = gAgent.getPosGlobalFromAgent(LLVector3(posX, posY, posZ));
+                        mPosGlobal = gAgent.getPosGlobalFromAgent(intersection);
                         
                         if (mWantSurfaceInfo)
                         {
@@ -5208,17 +5334,7 @@ void LLPickInfo::fetchResults()
                         }
                 }
         }
-        else
-        {
-                // was this name referring to a hud icon?
-                mHUDIcon = LLHUDIcon::handlePick(pick_id);
-                if (mHUDIcon)
-                {
-                        mPickType = PICK_ICON;
-                        mPosGlobal = mHUDIcon->getPositionGlobal();
-                }
-        }
-
+        
         if (mPickCallback)
         {
                 mPickCallback(*this);
@@ -5232,16 +5348,19 @@ LLPointer<LLViewerObject> LLPickInfo::getObject() const
 
 void LLPickInfo::updateXYCoords()
 {
-        const LLTextureEntry* tep = getObject()->getTE(mObjectFace);
-        LLPointer<LLViewerImage> imagep = gImageList.getImage(tep->getID());
-        if(mUVCoords.mV[VX] >= 0.f && mUVCoords.mV[VY] >= 0.f && imagep.notNull())
+        if (mObjectFace > -1)
         {
-                LLCoordGL coords;
-                
-                coords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
-                coords.mY = llround(mUVCoords.mV[VY] * (F32)imagep->getHeight());
+                const LLTextureEntry* tep = getObject()->getTE(mObjectFace);
+                LLPointer<LLViewerImage> imagep = gImageList.getImage(tep->getID());
+                if(mUVCoords.mV[VX] >= 0.f && mUVCoords.mV[VY] >= 0.f && imagep.notNull())
+                {
+                        LLCoordGL coords;
+                        
+                        coords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
+                        coords.mY = llround(mUVCoords.mV[VY] * (F32)imagep->getHeight());
 
-                gViewerWindow->getWindow()->convertCoords(coords, &mXYCoords);
+                        gViewerWindow->getWindow()->convertCoords(coords, &mXYCoords);
+                }
         }
 }
 
@@ -5252,7 +5371,7 @@ void LLPickInfo::drawPickBuffer() const
                 gGL.pushMatrix();
                 LLGLDisable no_blend(GL_BLEND);
                 LLGLDisable no_alpha_test(GL_ALPHA_TEST);
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 glPixelZoom(10.f, 10.f);
                 LLVector2 display_scale = gViewerWindow->getDisplayScale();
                 glRasterPos2f(((F32)mMousePt.mX * display_scale.mV[VX] + 10.f), 
@@ -5304,7 +5423,7 @@ void LLPickInfo::getSurfaceInfo()
         if (objectp)
         {
                 if (gViewerWindow->cursorIntersect(llround((F32)mMousePt.mX), llround((F32)mMousePt.mY), 1024.f,
-                                                                                   objectp, -1,
+                                                                                   objectp, -1, mPickTransparent,
                                                                                    &mObjectFace,
                                                                                    &mIntersection,
                                                                                    &mSTCoords,
@@ -5313,7 +5432,7 @@ void LLPickInfo::getSurfaceInfo()
                 {
                         // if we succeeded with the intersect above, compute the texture coordinates:
 
-                        if (objectp->mDrawable.notNull())
+                        if (objectp->mDrawable.notNull() && mObjectFace > -1)
                         {
                                 LLFace* facep = objectp->mDrawable->getFace(mObjectFace);
 
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 21df0d5..c83c57b 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -310,9 +310,13 @@ public:
         LLPickInfo              pickImmediate(S32 x, S32 y, BOOL pick_transparent);
         static void     hoverPickCallback(const LLPickInfo& pick_info);
         
+        LLHUDIcon* cursorIntersectIcon(S32 mouse_x, S32 mouse_y, F32 depth,
+                                                                                   LLVector3* intersection);
+
         LLViewerObject* cursorIntersect(S32 mouse_x = -1, S32 mouse_y = -1, F32 depth = 512.f,
                                                                         LLViewerObject *this_object = NULL,
                                                                         S32 this_face = -1,
+                                                                        BOOL pick_transparent = FALSE,
                                                                         S32* face_hit = NULL,
                                                                         LLVector3 *intersection = NULL,
                                                                         LLVector2 *uv = NULL,
@@ -340,6 +344,7 @@ public:
         void                    toggleFullscreen(BOOL show_progress);
 
         // handle shutting down GL and bringing it back up
+        void                    requestResolutionUpdate(bool fullscreen_checked);
         BOOL                    checkSettings();
         void                    restartDisplay(BOOL show_progress_bar);
         BOOL                    changeDisplaySettings(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync, BOOL show_progress_bar);
@@ -421,6 +426,11 @@ protected:
         std::string             mInitAlert;                     // Window / GL initialization requires an alert
         
         class LLDebugText* mDebugText; // Internal class for debug text
+        
+        bool                    mResDirty;
+        bool                    mStatesDirty;
+        bool                    mIsFullscreenChecked; // Did the user check the fullscreen checkbox in the display settings
+        U32                     mCurrResolutionIndex;
 
 protected:
         static std::string sSnapshotBaseName;
@@ -473,6 +483,7 @@ extern LLVector3        gDebugRaycastIntersection;
 extern LLVector2        gDebugRaycastTexCoord;
 extern LLVector3        gDebugRaycastNormal;
 extern LLVector3        gDebugRaycastBinormal;
+extern S32                              gDebugRaycastFaceHit;
 
 extern S32 CHAT_BAR_HEIGHT; 
 
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index b60b07e..bc7a2f4 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvlcomposition.h b/linden/indra/newview/llvlcomposition.h
index 0ff9df4..9c467ad 100644
--- a/linden/indra/newview/llvlcomposition.h
+++ b/linden/indra/newview/llvlcomposition.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp
index f4dade5..c556961 100644
--- a/linden/indra/newview/llvlmanager.cpp
+++ b/linden/indra/newview/llvlmanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvlmanager.h b/linden/indra/newview/llvlmanager.h
index f6c138c..7d2cd09 100644
--- a/linden/indra/newview/llvlmanager.h
+++ b/linden/indra/newview/llvlmanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 7d70dd2..3d2523e 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -244,6 +244,11 @@ static F32 calc_bouncy_animation(F32 x)
         return -(cosf(x * F_PI * 2.5f - F_PI_BY_TWO))*(0.4f + x * -0.1f) + x * 1.3f;
 }
 
+BOOL LLLineSegmentCapsuleIntersect(const LLVector3& start, const LLVector3& end, const LLVector3& p1, const LLVector3& p2, const F32& radius, LLVector3& result)
+{
+        return FALSE;
+}
+
 //-----------------------------------------------------------------------------
 // Static Data
 //-----------------------------------------------------------------------------
@@ -267,6 +272,7 @@ LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] =
         LLUUID(SND_RUBBER_RUBBER)
 };
 
+// static
 S32 LLVOAvatar::sRenderName = RENDER_NAME_ALWAYS;
 BOOL LLVOAvatar::sRenderGroupTitles = TRUE;
 S32 LLVOAvatar::sNumVisibleChatBubbles = 0;
@@ -279,9 +285,12 @@ BOOL LLVOAvatar::sVisibleInFirstPerson = FALSE;
 F32 LLVOAvatar::sLODFactor = 1.f;
 BOOL LLVOAvatar::sUseImpostors = FALSE;
 BOOL LLVOAvatar::sJointDebug = FALSE;
-
 S32 LLVOAvatar::sCurJoint = 0;
 S32 LLVOAvatar::sCurVolume = 0;
+F32 LLVOAvatar::sUnbakedTime = 0.f;
+F32 LLVOAvatar::sUnbakedUpdateTime = 0.f;
+F32 LLVOAvatar::sGreyTime = 0.f;
+F32 LLVOAvatar::sGreyUpdateTime = 0.f;
 
 struct LLAvatarTexData
 {
@@ -753,7 +762,7 @@ LLVOAvatar::LLVOAvatar(
         mRippleTimeLast = 0.f;
 
         mShadowImagep = gImageList.getImageFromFile("foot_shadow.j2c");
-        mShadowImagep->bind();
+        gGL.getTexUnit(0)->bind(mShadowImagep.get());
         mShadowImagep->setClamp(TRUE, TRUE);
         
         mInAir = FALSE;
@@ -1062,11 +1071,29 @@ void LLVOAvatar::deleteLayerSetCaches()
         if( mLowerBodyLayerSet )        mLowerBodyLayerSet->deleteCaches();
         if( mEyesLayerSet )                     mEyesLayerSet->deleteCaches();
         if( mSkirtLayerSet )            mSkirtLayerSet->deleteCaches();
+
+        if(mUpperMaskTexName)
+        {
+                glDeleteTextures(1, (GLuint*)&mUpperMaskTexName);
+                mUpperMaskTexName = 0 ;
+        }
+        if(mHeadMaskTexName)
+        {
+                glDeleteTextures(1, (GLuint*)&mHeadMaskTexName);
+                mHeadMaskTexName = 0 ;
+        }
+        if(mLowerMaskTexName)
+        {
+                glDeleteTextures(1, (GLuint*)&mLowerMaskTexName);
+                mLowerMaskTexName = 0 ;
+        }
 }
 
 // static 
-BOOL LLVOAvatar::areAllNearbyInstancesBaked()
+BOOL LLVOAvatar::areAllNearbyInstancesBaked(S32& grey_avatars)
 {
+        BOOL res = TRUE;
+        grey_avatars = 0;
         for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
                 iter != LLCharacter::sInstances.end(); ++iter)
         {
@@ -1075,18 +1102,22 @@ BOOL LLVOAvatar::areAllNearbyInstancesBaked()
                 {
                         continue;
                 }
-                else
-                if( inst->getPixelArea() < MIN_PIXEL_AREA_FOR_COMPOSITE )
-                {
-                        return TRUE;  // Assumes sInstances is sorted by pixel area.
-                }
+//              else
+//              if( inst->getPixelArea() < MIN_PIXEL_AREA_FOR_COMPOSITE )
+//              {
+//                      return res;  // Assumes sInstances is sorted by pixel area.
+//              }
                 else
                 if( !inst->isFullyBaked() )
                 {
-                        return FALSE;
+                        res = FALSE;
+                        if (inst->mHasGrey)
+                        {
+                                ++grey_avatars;
+                        }
                 }
         }
-        return TRUE;
+        return res;
 }
 
 // static 
@@ -1131,7 +1162,7 @@ void LLVOAvatar::dumpBakedStatus()
                 }
 
 
-                F64 dist_to_camera = (inst->getPositionGlobal() - camera_pos_global).magVec();
+                F64 dist_to_camera = (inst->getPositionGlobal() - camera_pos_global).length();
                 llcont << " " << dist_to_camera << "m ";
 
                 llcont << " " << inst->mPixelArea << " pixels";
@@ -1569,6 +1600,96 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
         newMax += buffer;
 }
 
+//-----------------------------------------------------------------------------
+// renderCollisionVolumes()
+//-----------------------------------------------------------------------------
+void LLVOAvatar::renderCollisionVolumes()
+{
+        for (S32 i = 0; i < mNumCollisionVolumes; i++)
+        {
+                mCollisionVolumes[i].renderCollision();
+        }
+
+        if (mNameText.notNull())
+        {
+                LLVector3 unused;
+                mNameText->lineSegmentIntersect(LLVector3(0,0,0), LLVector3(0,0,1), unused, TRUE);
+        }
+}
+
+BOOL LLVOAvatar::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                          S32 face,
+                                                                          BOOL pick_transparent,
+                                                                          S32* face_hit,
+                                                                          LLVector3* intersection,
+                                                                          LLVector2* tex_coord,
+                                                                          LLVector3* normal,
+                                                                          LLVector3* bi_normal
+                )
+{
+
+        if (mIsSelf && !gAgent.needsRenderAvatar() || !LLPipeline::sPickAvatar)
+        {
+                return FALSE;
+        }
+
+        if (lineSegmentBoundingBox(start, end))
+        {
+                for (S32 i = 0; i < mNumCollisionVolumes; ++i)
+                {
+                        mCollisionVolumes[i].updateWorldMatrix();
+
+                        glh::matrix4f mat((F32*) mCollisionVolumes[i].getXform()->getWorldMatrix().mMatrix);
+                        glh::matrix4f inverse = mat.inverse();
+                        glh::matrix4f norm_mat = inverse.transpose();
+
+                        glh::vec3f p1(start.mV);
+                        glh::vec3f p2(end.mV);
+
+                        inverse.mult_matrix_vec(p1);
+                        inverse.mult_matrix_vec(p2);
+
+                        LLVector3 position;
+                        LLVector3 norm;
+
+                        if (linesegment_sphere(LLVector3(p1.v), LLVector3(p2.v), LLVector3(0,0,0), 1.f, position, norm))
+                        {
+                                glh::vec3f res_pos(position.mV);
+                                mat.mult_matrix_vec(res_pos);
+                                
+                                norm.normalize();
+                                glh::vec3f res_norm(norm.mV);
+                                norm_mat.mult_matrix_dir(res_norm);
+
+                                if (intersection)
+                                {
+                                        *intersection = LLVector3(res_pos.v);
+                                }
+
+                                if (normal)
+                                {
+                                        *normal = LLVector3(res_norm.v);
+                                }
+
+                                return TRUE;
+                        }
+                }
+        }
+        
+        LLVector3 position;
+        if (mNameText.notNull() && mNameText->lineSegmentIntersect(start, end, position))
+        {
+                if (intersection)
+                {
+                        *intersection = position;
+                }
+
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
 
 //-----------------------------------------------------------------------------
 // parseSkeletonFile()
@@ -2737,8 +2858,8 @@ void LLVOAvatar::idleUpdateMisc(bool detailed_update)
                         else
                         {
                                 getSpatialExtents(ext[0], ext[1]);
-                                if ((ext[1]-mImpostorExtents[1]).magVec() > 0.05f ||
-                                        (ext[0]-mImpostorExtents[0]).magVec() > 0.05f)
+                                if ((ext[1]-mImpostorExtents[1]).length() > 0.05f ||
+                                        (ext[0]-mImpostorExtents[0]).length() > 0.05f)
                                 {
                                         mNeedsImpostorUpdate = TRUE;
                                 }
@@ -2905,7 +3026,7 @@ void LLVOAvatar::idleUpdateWindEffect()
                 F32 time_delta = mRippleTimer.getElapsedTimeF32() - mRippleTimeLast;
                 mRippleTimeLast = mRippleTimer.getElapsedTimeF32();
                 LLVector3 velocity = getVelocity();
-                F32 speed = velocity.magVec();
+                F32 speed = velocity.length();
                 //RN: velocity varies too much frame to frame for this to work
                 mRippleAccel.clearVec();//lerp(mRippleAccel, (velocity - mLastVel) * time_delta, LLCriticalDamp::getInterpolant(0.02f));
                 mLastVel = velocity;
@@ -2924,7 +3045,7 @@ void LLVOAvatar::idleUpdateWindEffect()
                 }
 
                 wind.mV[VZ] += hover_strength;
-                wind.normVec();
+                wind.normalize();
 
                 wind.mV[VW] = llmin(0.025f + (speed * 0.015f) + hover_strength, 0.5f);
                 F32 interp;
@@ -3047,10 +3168,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 LLVector3 pixel_up_vec;
                                 LLViewerCamera::getInstance()->getPixelVectors(root_pos_last, pixel_up_vec, pixel_right_vec);
                                 LLVector3 camera_to_av = root_pos_last - LLViewerCamera::getInstance()->getOrigin();
-                                camera_to_av.normVec();
+                                camera_to_av.normalize();
                                 LLVector3 local_camera_at = camera_to_av * ~root_rot;
                                 LLVector3 local_camera_up = camera_to_av % LLViewerCamera::getInstance()->getLeftAxis();
-                                local_camera_up.normVec();
+                                local_camera_up.normalize();
                                 local_camera_up = local_camera_up * ~root_rot;
                         
                                 local_camera_up.scaleVec(mBodySize * 0.5f);
@@ -3502,7 +3623,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 
         LLVector3 xyVel = getVelocity();
         xyVel.mV[VZ] = 0.0f;
-        speed = xyVel.magVec();
+        speed = xyVel.length();
 
         BOOL throttle = TRUE;
 
@@ -3587,14 +3708,14 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                         if (mIsSelf)
                         {
                                 primDir = agent.getAtAxis() - projected_vec(agent.getAtAxis(), agent.getReferenceUpVector());
-                                primDir.normVec();
+                                primDir.normalize();
                         }
                         else
                         {
                                 primDir = getRotation().getMatrix3().getFwdRow();
                         }
                         LLVector3 velDir = getVelocity();
-                        velDir.normVec();
+                        velDir.normalize();
                         if ( mSignaledAnimations.find(ANIM_AGENT_WALK) != mSignaledAnimations.end())
                         {
                                 F32 vpD = velDir * primDir;
@@ -3616,13 +3737,13 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                                         LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                         LLVector3 up_vector = gAgent.getReferenceUpVector();
                                         at_axis -= up_vector * (at_axis * up_vector);
-                                        at_axis.normVec();
+                                        at_axis.normalize();
                                         
                                         F32 dot = fwdDir * at_axis;
                                         if (dot < 0.f)
                                         {
                                                 fwdDir -= 2.f * at_axis * dot;
-                                                fwdDir.normVec();
+                                                fwdDir.normalize();
                                         }
                                 }
                                 
@@ -3690,7 +3811,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 
                         // Now compute the full world space rotation for the whole body (wQv)
                         LLVector3 leftDir = upDir % fwdDir;
-                        leftDir.normVec();
+                        leftDir.normalize();
                         fwdDir = leftDir % upDir;
                         LLQuaternion wQv( fwdDir, leftDir, upDir );
 
@@ -4131,7 +4252,7 @@ U32 LLVOAvatar::renderSkinned(EAvatarRenderPass pass)
                 LLVector3 collide_point = slaved_pos;
                 collide_point.mV[VZ] -= foot_plane_normal.mV[VZ] * (dist_from_plane + COLLISION_TOLERANCE - FOOT_COLLIDE_FUDGE);
 
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
                 {
                         F32 SQUARE_SIZE = 0.2f;
                         gGL.color4f(1.f, 0.f, 0.f, 1.f);
@@ -4278,7 +4399,7 @@ U32 LLVOAvatar::renderFootShadows()
         LLGLDepthTest test(GL_TRUE, GL_FALSE);
         //render foot shadows
         LLGLEnable blend(GL_BLEND);
-        mShadowImagep->bind();
+        gGL.getTexUnit(0)->bind(mShadowImagep.get());
         glColor4fv(mShadow0Facep->getRenderColor().mV);
         mShadow0Facep->renderIndexed(foot_mask);
         glColor4fv(mShadow1Facep->getRenderColor().mV);
@@ -4296,7 +4417,7 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
 
         LLVector3 pos(getRenderPosition()+mImpostorOffset);
         LLVector3 at = (pos - LLViewerCamera::getInstance()->getOrigin());
-        at.normVec();
+        at.normalize();
         LLVector3 left = LLViewerCamera::getInstance()->getUpAxis() % at;
         LLVector3 up = at%left;
 
@@ -4324,8 +4445,8 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
         color.mV[3] = (U8) (alpha*255);
         
         gGL.color4ubv(color.mV);
-        mImpostor.bindTexture();
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.getTexUnit(0)->bind(&mImpostor);
+        gGL.begin(LLRender::QUADS);
         gGL.texCoord2f(0,0);
         gGL.vertex3fv((pos+left-up).mV);
         gGL.texCoord2f(1,0);
@@ -4340,17 +4461,6 @@ U32 LLVOAvatar::renderImpostor(LLColor4U color)
         return 6;
 }
 
-//-----------------------------------------------------------------------------
-// renderCollisionVolumes()
-//-----------------------------------------------------------------------------
-void LLVOAvatar::renderCollisionVolumes()
-{
-        for (S32 i = 0; i < mNumCollisionVolumes; i++)
-        {
-                mCollisionVolumes[i].renderCollision();
-        }
-}
-
 //------------------------------------------------------------------------
 // LLVOAvatar::updateTextures()
 //------------------------------------------------------------------------
@@ -4385,23 +4495,23 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
         {
                 if( head_baked && ! mHeadBakedLoaded )
                 {
-                        getTEImage( TEX_HEAD_BAKED )->bind();
+                        gGL.getTexUnit(0)->bind(getTEImage( TEX_HEAD_BAKED ));
                 }
                 if( upper_baked && ! mUpperBakedLoaded )
                 {
-                        getTEImage( TEX_UPPER_BAKED )->bind();
+                        gGL.getTexUnit(0)->bind(getTEImage( TEX_UPPER_BAKED ));
                 }
                 if( lower_baked && ! mLowerBakedLoaded )
                 {
-                        getTEImage( TEX_LOWER_BAKED )->bind();
+                        gGL.getTexUnit(0)->bind(getTEImage( TEX_LOWER_BAKED ));
                 }
                 if( eyes_baked && ! mEyesBakedLoaded )
                 {
-                        getTEImage( TEX_EYES_BAKED )->bind();
+                        gGL.getTexUnit(0)->bind(getTEImage( TEX_EYES_BAKED ));
                 }
                 if( skirt_baked && ! mSkirtBakedLoaded )
                 {
-                        getTEImage( TEX_SKIRT_BAKED )->bind();
+                        gGL.getTexUnit(0)->bind(getTEImage( TEX_SKIRT_BAKED ));
                 }
         }
 
@@ -4432,6 +4542,7 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 
         mMaxPixelArea = 0.f;
         mMinPixelArea = 99999999.f;
+        mHasGrey = FALSE; // debug
         for (U32 i = 0; i < getNumTEs(); i++)
         {
                 LLViewerImage *imagep = getTEImage(i);
@@ -4590,22 +4701,35 @@ void LLVOAvatar::updateTextures(LLAgent &agent)
 void LLVOAvatar::addLocalTextureStats( LLVOAvatar::ELocTexIndex idx, LLViewerImage* imagep,
                                                                            F32 texel_area_ratio, BOOL render_avatar, BOOL covered_by_baked )
 {
-        if (!covered_by_baked &&
-                render_avatar && // always true if mIsSelf
-                mLocalTexture[ idx ].notNull() && mLocalTexture[idx]->getID() != IMG_DEFAULT_AVATAR)
-        {       
-                F32 desired_pixels;
-                if( mIsSelf )
+        if (!covered_by_baked && render_avatar) // render_avatar is always true if mIsSelf
+        {
+                if (mLocalTexture[ idx ].notNull() && mLocalTexture[idx]->getID() != IMG_DEFAULT_AVATAR)
                 {
-                        desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_SELF );
-                        imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR_SELF);
+                        F32 desired_pixels;
+                        if( mIsSelf )
+                        {
+                                desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_SELF );
+                                imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR_SELF);
+                        }
+                        else
+                        {
+                                desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_OTHER );
+                                imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR);
+                        }
+                        imagep->addTextureStats( desired_pixels / texel_area_ratio );
+                        if (imagep->getDiscardLevel() < 0)
+                        {
+                                mHasGrey = TRUE; // for statistics gathering
+                        }
                 }
                 else
                 {
-                        desired_pixels = llmin(mPixelArea, (F32)LOCTEX_IMAGE_AREA_OTHER );
-                        imagep->setBoostLevel(LLViewerImage::BOOST_AVATAR);
+                        if (mLocalTexture[idx]->getID() == IMG_DEFAULT_AVATAR)
+                        {
+                                // texture asset is missing
+                                mHasGrey = TRUE; // for statistics gathering
+                        }
                 }
-                imagep->addTextureStats( desired_pixels, texel_area_ratio );
         }
 }
 
@@ -4614,7 +4738,7 @@ void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F3
 {
         mMaxPixelArea = llmax(pixel_area, mMaxPixelArea);
         mMinPixelArea = llmin(pixel_area, mMinPixelArea);
-        imagep->addTextureStats(pixel_area, texel_area_ratio);
+        imagep->addTextureStats(pixel_area / texel_area_ratio);
         imagep->setBoostLevel(boost_level);
 }
 
@@ -4803,12 +4927,13 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                                         // to support both spatialized and non-spatialized instances of the same sound
                                         //if (mIsSelf)
                                         //{
-                                        //  F32 volume = gain * gSavedSettings.getF32("AudioLevelUI")
-                                        //      gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), volume);
+                                        //      gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
                                         //}
                                         //else
-                                        LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
-                                        gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
+                                        {
+                                                LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
+                                                gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
+                                        }
                                 }
                         }
                 }
@@ -5826,7 +5951,7 @@ void LLVOAvatar::setPixelAreaAndAngle(LLAgent &agent)
         }
         else
         {
-                F32 radius = size.magVec();
+                F32 radius = size.length();
                 mAppAngle = (F32) atan2( radius, range) * RAD_TO_DEG;
         }
 
@@ -5998,7 +6123,7 @@ void LLVOAvatar::updateShadowFaces()
                         sprite.setPosition(shadow_pos_agent);
 
                         LLVector3 foot_to_knee = mKneeLeftp->getWorldPosition() - joint_world_pos;
-                        //foot_to_knee.normVec();
+                        //foot_to_knee.normalize();
                         foot_to_knee -= projected_vec(foot_to_knee, sun_vec);
                         sprite.setYaw(azimuth(sun_vec - foot_to_knee));
                 
@@ -6031,7 +6156,7 @@ void LLVOAvatar::updateShadowFaces()
                         sprite.setPosition(shadow_pos_agent);
 
                         LLVector3 foot_to_knee = mKneeRightp->getWorldPosition() - joint_world_pos;
-                        //foot_to_knee.normVec();
+                        //foot_to_knee.normalize();
                         foot_to_knee -= projected_vec(foot_to_knee, sun_vec);
                         sprite.setYaw(azimuth(sun_vec - foot_to_knee));
         
@@ -6392,7 +6517,7 @@ void LLVOAvatar::getOffObject()
                 LLVector3 at_axis = LLVector3::x_axis;
                 at_axis = at_axis * av_rot;
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 gAgent.resetAxes(at_axis);
 
                 //reset orientation
@@ -6946,7 +7071,7 @@ BOOL LLVOAvatar::bindScratchTexture( LLGLenum format )
         GLuint gl_name = getScratchTexName( format, &texture_bytes );
         if( gl_name )
         {
-                LLImageGL::bindExternalTexture( gl_name, 0, GL_TEXTURE_2D );
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, gl_name);
                 stop_glerror();
 
                 F32* last_bind_time = LLVOAvatar::sScratchTexLastBindTime.getIfThere( format );
@@ -7004,7 +7129,7 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
                 glGenTextures(1, &name );
                 stop_glerror();
 
-                LLImageGL::bindExternalTexture( name, 0, GL_TEXTURE_2D ); 
+                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, name);
                 stop_glerror();
 
                 glTexImage2D(
@@ -7019,7 +7144,7 @@ LLGLuint LLVOAvatar::getScratchTexName( LLGLenum format, U32* texture_bytes )
                 glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
                 stop_glerror();
 
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D); 
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 stop_glerror();
 
                 LLVOAvatar::sScratchTexNames.addData( format, new LLGLuint( name ) );
@@ -8628,7 +8753,7 @@ void LLVOAvatar::onBakedTextureMasksLoaded( BOOL success, LLViewerImage *src_vi,
                         glGenTextures(1, (GLuint*) &gl_name );
                         stop_glerror();
 
-                        LLImageGL::bindExternalTexture( gl_name, 0, GL_TEXTURE_2D ); 
+                        gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, gl_name);
                         stop_glerror();
 
                         glTexImage2D(
@@ -9034,10 +9159,27 @@ void LLVOAvatar::cullAvatarsByPixelArea()
                 }
         }
 
-        if( LLVOAvatar::areAllNearbyInstancesBaked() )
+        S32 grey_avatars = 0;
+        if( LLVOAvatar::areAllNearbyInstancesBaked(grey_avatars) )
         {
                 LLVOAvatar::deleteCachedImages();
         }
+        else
+        {
+                if (gFrameTimeSeconds != sUnbakedUpdateTime) // only update once per frame
+                {
+                        sUnbakedUpdateTime = gFrameTimeSeconds;
+                        sUnbakedTime += gFrameIntervalSeconds;
+                }
+                if (grey_avatars > 0)
+                {
+                        if (gFrameTimeSeconds != sGreyUpdateTime) // only update once per frame
+                        {
+                                sGreyUpdateTime = gFrameTimeSeconds;
+                                sGreyTime += gFrameIntervalSeconds;
+                        }
+                }
+        }
 }
 
 const LLUUID& LLVOAvatar::grabLocalTexture(ETextureIndex index)
@@ -9903,7 +10045,7 @@ void LLVOAvatar::getImpostorValues(LLVector3* extents, LLVector3& angle, F32& di
         extents[1] = ext[1];
 
         LLVector3 at = LLViewerCamera::getInstance()->getOrigin()-(getRenderPosition()+mImpostorOffset);
-        distance = at.normVec();
+        distance = at.normalize();
         F32 da = 1.f - (at*LLViewerCamera::getInstance()->getAtAxis());
         angle.mV[0] = LLViewerCamera::getInstance()->getYaw()*da;
         angle.mV[1] = LLViewerCamera::getInstance()->getPitch()*da;
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index d66ddfc..9806ceb 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -308,6 +308,16 @@ public:
         U32 renderTransparent();
         void renderCollisionVolumes();
         
+        /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                          S32 face = -1,                          // which face to check, -1 = ALL_SIDES
+                                                                          BOOL pick_transparent = FALSE,
+                                                                          S32* face_hit = NULL,                   // which face was hit
+                                                                          LLVector3* intersection = NULL,         // return the intersection point
+                                                                          LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+                                                                          LLVector3* normal = NULL,               // return the surface normal at the intersection point
+                                                                          LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+                );
+
         /*virtual*/ void updateTextures(LLAgent &agent);
         // If setting a baked texture, need to request it from a non-local sim.
         /*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid);
@@ -903,6 +913,11 @@ public:
         static BOOL             sJointDebug;
         static ETextureIndex sBakedTextureIndices[BAKED_TEXTURE_COUNT];
 
+        static F32              sUnbakedTime; // Total seconds with >=1 unbaked avatars
+        static F32              sUnbakedUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 
+        static F32              sGreyTime; // Total seconds with >=1 grey avatars
+        static F32              sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 
+        
         //--------------------------------------------------------------------
         // Texture Layer Sets and Global Colors
         //--------------------------------------------------------------------  
@@ -967,6 +982,7 @@ protected:
         F32                                     mLastFadeDistance;
         F32                                     mMinPixelArea; // debug
         F32                                     mMaxPixelArea; // debug
+        BOOL                            mHasGrey; // debug
         
         //--------------------------------------------------------------------
         // Global Colors
@@ -1002,7 +1018,7 @@ protected:
         
         BOOL                    isFullyBaked();
         void                    deleteLayerSetCaches();
-        static BOOL             areAllNearbyInstancesBaked();
+        static BOOL             areAllNearbyInstancesBaked(S32& grey_avatars);
 
         static void             onBakedTextureMasksLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
 
diff --git a/linden/indra/newview/llvocache.cpp b/linden/indra/newview/llvocache.cpp
index 45b7782..a07b5c2 100644
--- a/linden/indra/newview/llvocache.cpp
+++ b/linden/indra/newview/llvocache.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvocache.h b/linden/indra/newview/llvocache.h
index 2432f22..c09254a 100644
--- a/linden/indra/newview/llvocache.h
+++ b/linden/indra/newview/llvocache.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoclouds.cpp b/linden/indra/newview/llvoclouds.cpp
index f50468d..a90a0d4 100644
--- a/linden/indra/newview/llvoclouds.cpp
+++ b/linden/indra/newview/llvoclouds.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoclouds.h b/linden/indra/newview/llvoclouds.h
index 670922d..18036e9 100644
--- a/linden/indra/newview/llvoclouds.h
+++ b/linden/indra/newview/llvoclouds.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index a028a63..4e7816c 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -273,9 +273,9 @@ U32 LLVOGrass::processUpdateMessage(LLMessageSystem *mesgsys,
 
         updateSpecies();
 
-        if (  (getVelocity().magVecSquared() > 0.f)
-                ||(getAcceleration().magVecSquared() > 0.f)
-                ||(getAngularVelocity().magVecSquared() > 0.f))
+        if (  (getVelocity().lengthSquared() > 0.f)
+                ||(getAcceleration().lengthSquared() > 0.f)
+                ||(getAngularVelocity().lengthSquared() > 0.f))
         {
                 llinfos << "ACK! Moving grass!" << llendl;
                 setVelocity(LLVector3::zero);
@@ -322,7 +322,7 @@ void LLVOGrass::setPixelAreaAndAngle(LLAgent &agent)
 {
         // This should be the camera's center, as soon as we move to all region-local.
         LLVector3 relative_position = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 range = relative_position.magVec();
+        F32 range = relative_position.length();
 
         F32 max_scale = getMaxScale();
 
@@ -501,7 +501,7 @@ void LLVOGrass::getGeometry(S32 idx,
 
                 LLVector3 normal1 = (v1-v2) % (v2-v3);
                 normal1.mV[VZ] = 0.75f;
-                normal1.normVec();
+                normal1.normalize();
                 LLVector3 normal2 = -normal1;
                 normal2.mV[VZ] = -normal2.mV[VZ];
 
@@ -578,3 +578,146 @@ void LLVOGrass::updateDrawable(BOOL force_damped)
         }
         clearChanged(SHIFTED);
 }
+
+// virtual 
+BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
+                                                                          LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
+        
+{
+        BOOL ret = FALSE;
+        if (!mbCanSelect ||
+                mDrawable->isDead() || 
+                !gPipeline.hasRenderType(mDrawable->getRenderType()))
+        {
+                return FALSE;
+        }
+
+        LLVector3 dir = end-start;
+
+        mPatch = mRegionp->getLand().resolvePatchRegion(getPositionRegion());
+        
+        LLVector3 position;
+        // Create random blades of grass with gaussian distribution
+        F32 x,y,xf,yf,dzx,dzy;
+
+        LLColor4U color(255,255,255,255);
+
+        F32 width  = sSpeciesTable[mSpecies]->mBladeSizeX;
+        F32 height = sSpeciesTable[mSpecies]->mBladeSizeY;
+
+        LLVector2 tc[4];
+        LLVector3 v[4];
+        // LLVector3 n[4]; // unused!
+
+        F32 closest_t = 1.f;
+
+        for (S32 i = 0;  i < mNumBlades; i++)
+        {
+                x   = exp_x[i] * mScale.mV[VX];
+                y   = exp_y[i] * mScale.mV[VY];
+                xf  = rot_x[i] * GRASS_BLADE_BASE * width * w_mod[i];
+                yf  = rot_y[i] * GRASS_BLADE_BASE * width * w_mod[i];
+                dzx = dz_x [i];
+                dzy = dz_y [i];
+
+                LLVector3 v1,v2,v3;
+                F32 blade_height= GRASS_BLADE_HEIGHT * height * w_mod[i];
+
+                tc[0]   = LLVector2(0, 0);
+                tc[1]   = LLVector2(0, 0.98f);
+                tc[2]   = LLVector2(1, 0);
+                tc[3]   = LLVector2(1, 0.98f);
+        
+                position.mV[0]  = mPosition.mV[VX] + x + xf;
+                position.mV[1]  = mPosition.mV[VY] + y + yf;
+                position.mV[2]  = mRegionp->getLand().resolveHeightRegion(position);
+                v[0]    = v1 = position + mRegionp->getOriginAgent();
+                
+
+
+                position.mV[0] += dzx;
+                position.mV[1] += dzy;
+                position.mV[2] += blade_height;
+                v[1]    = v2 = position + mRegionp->getOriginAgent();
+                
+                position.mV[0]  = mPosition.mV[VX] + x - xf;
+                position.mV[1]  = mPosition.mV[VY] + y - xf;
+                position.mV[2]  = mRegionp->getLand().resolveHeightRegion(position);
+                v[2]    = v3 = position + mRegionp->getOriginAgent();
+                
+                LLVector3 normal1 = (v1-v2) % (v2-v3);
+                normal1.normalize();
+                
+                position.mV[0] += dzx;
+                position.mV[1] += dzy;
+                position.mV[2] += blade_height;
+                v[3]    = v1 = position + mRegionp->getOriginAgent();
+        
+
+                F32 a,b,t;
+
+                BOOL hit = FALSE;
+
+
+                U32 idx0 = 0,idx1 = 0,idx2 = 0;
+
+                if (LLTriangleRayIntersect(v[0], v[1], v[2], start, dir, &a, &b, &t, FALSE))
+                {
+                        hit = TRUE;
+                        idx0 = 0; idx1 = 1; idx2 = 2;
+                }
+                else if (LLTriangleRayIntersect(v[1], v[3], v[2], start, dir, &a, &b, &t, FALSE))
+                {
+                        hit = TRUE;
+                        idx0 = 1; idx1 = 3; idx2 = 2;
+                }
+                else if (LLTriangleRayIntersect(v[2], v[1], v[0], start, dir, &a, &b, &t, FALSE))
+                {
+                        normal1 = -normal1;
+                        hit = TRUE;
+                        idx0 = 2; idx1 = 1; idx2 = 0;
+                }
+                else if (LLTriangleRayIntersect(v[2], v[3], v[1], start, dir, &a, &b, &t, FALSE))
+                {
+                        normal1 = -normal1;
+                        hit = TRUE;
+                        idx0 = 2; idx1 = 3; idx2 = 1;
+                }
+
+                if (hit)
+                {
+                        if (t >= 0.f &&
+                                t <= 1.f &&
+                                t < closest_t)
+                        {
+
+                                LLVector2 hit_tc = ((1.f - a - b)  * tc[idx0] +
+                                                                          a              * tc[idx1] +
+                                                                          b              * tc[idx2]);
+                                if (pick_transparent ||
+                                        getTEImage(0)->getMask(hit_tc))
+                                {
+                                        closest_t = t;
+                                        if (intersection != NULL)
+                                        {
+                                                *intersection = start+dir*closest_t;
+                                        }
+
+                                        if (tex_coord != NULL)
+                                        {
+                                                *tex_coord = hit_tc;
+                                        }
+
+                                        if (normal != NULL)
+                                        {
+                                                *normal    = normal1;
+                                        }
+                                        ret = TRUE;
+                                }
+                        }
+                }
+        }
+
+        return ret;
+}
+
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 679f5dc..95197a5 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,16 @@ public:
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
         BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
 
+        /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+                                                                                  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+                                                                                  BOOL pick_transparent = FALSE,
+                                                                                  S32* face_hit = NULL,                 // which face was hit
+                                                                                  LLVector3* intersection = NULL,       // return the intersection point
+                                                                                  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
+                                                                                  LLVector3* normal = NULL,             // return the surface normal at the intersection point
+                                                                                  LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
+                );
+
         static S32 sMaxGrassSpecies;
 
         struct GrassSpeciesData
diff --git a/linden/indra/newview/llvoground.cpp b/linden/indra/newview/llvoground.cpp
index 32622ec..8cc7724 100644
--- a/linden/indra/newview/llvoground.cpp
+++ b/linden/indra/newview/llvoground.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -45,7 +45,7 @@
 #include "pipeline.h"
 
 LLVOGround::LLVOGround(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLStaticViewerObject(id, pcode, regionp)
+:       LLStaticViewerObject(id, pcode, regionp, TRUE)
 {
         mbCanSelect = FALSE;
 }
diff --git a/linden/indra/newview/llvoground.h b/linden/indra/newview/llvoground.h
index 25e6fa6..4dab2f9 100644
--- a/linden/indra/newview/llvoground.h
+++ b/linden/indra/newview/llvoground.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 64a17ae..76ef87d 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -62,15 +62,20 @@
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
 
+#include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
+#include "llfloaterchat.h"              // for LLFloaterChat::addChat()
+
 // for base64 decoding
 #include "apr_base64.h"
 
 // for SHA1 hash
 #include "apr_sha1.h"
 
-// If we are connecting to agni AND the user's last name is "Linden", join this channel instead of looking up the sim name.
-// If we are connecting to agni and the user's last name is NOT "Linden", disable voice.
-#define AGNI_LINDENS_ONLY_CHANNEL "SL"
+// for MD5 hash
+#include "llmd5.h"
+
+#define USE_SESSION_GROUPS 0
+
 static bool sConnectingToAgni = false;
 F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f;
 
@@ -90,6 +95,44 @@ const F32 UPDATE_THROTTLE_SECONDS = 0.1f;
 const F32 LOGIN_RETRY_SECONDS = 10.0f;
 const int MAX_LOGIN_RETRIES = 12;
 
+static void setUUIDFromStringHash(LLUUID &uuid, const std::string &str)
+{
+        LLMD5 md5_uuid;
+        md5_uuid.update((const unsigned char*)str.data(), str.size());
+        md5_uuid.finalize();
+        md5_uuid.raw_digest(uuid.mData);
+}
+
+static int scale_mic_volume(float volume)
+{
+        // incoming volume has the range [0.0 ... 2.0], with 1.0 as the default.
+        // Map it as follows: 0.0 -> 40, 1.0 -> 44, 2.0 -> 75
+
+        volume -= 1.0f;         // offset volume to the range [-1.0 ... 1.0], with 0 at the default.
+        int scaled_volume = 44; // offset scaled_volume by its default level
+        if(volume < 0.0f)
+                scaled_volume += ((int)(volume * 4.0f));        // (44 - 40)
+        else
+                scaled_volume += ((int)(volume * 31.0f));       // (75 - 44)
+        
+        return scaled_volume;
+}
+
+static int scale_speaker_volume(float volume)
+{
+        // incoming volume has the range [0.0 ... 1.0], with 0.5 as the default.
+        // Map it as follows: 0.0 -> 0, 0.5 -> 62, 1.0 -> 75
+        
+        volume -= 0.5f;         // offset volume to the range [-0.5 ... 0.5], with 0 at the default.
+        int scaled_volume = 62; // offset scaled_volume by its default level
+        if(volume < 0.0f)
+                scaled_volume += ((int)(volume * 124.0f));      // (62 - 0) * 2
+        else
+                scaled_volume += ((int)(volume * 26.0f));       // (75 - 62) * 2
+        
+        return scaled_volume;
+}
+
 class LLViewerVoiceAccountProvisionResponder :
         public LLHTTPClient::Responder
 {
@@ -103,12 +146,13 @@ public:
         {
                 if ( mRetries > 0 )
                 {
+                        LL_WARNS("Voice") << "ProvisionVoiceAccountRequest returned an error, retrying.  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
                         if ( gVoiceClient ) gVoiceClient->requestVoiceAccountProvision(
                                 mRetries - 1);
                 }
                 else
                 {
-                        //TODO: throw an error message?
+                        LL_WARNS("Voice") << "ProvisionVoiceAccountRequest returned an error, too many retries (giving up).  status = " << status << ", reason = \"" << reason << "\"" << LL_ENDL;
                         if ( gVoiceClient ) gVoiceClient->giveUp();
                 }
         }
@@ -117,9 +161,23 @@ public:
         {
                 if ( gVoiceClient )
                 {
+                        std::string voice_sip_uri_hostname;
+                        std::string voice_account_server_uri;
+                        
+                        LL_DEBUGS("Voice") << "ProvisionVoiceAccountRequest response:" << ll_pretty_print_sd(content) << LL_ENDL;
+                        
+                        if(content.has("voice_sip_uri_hostname"))
+                                voice_sip_uri_hostname = content["voice_sip_uri_hostname"].asString();
+                        
+                        // this key is actually misnamed -- it will be an entire URI, not just a hostname.
+                        if(content.has("voice_account_server_name"))
+                                voice_account_server_uri = content["voice_account_server_name"].asString();
+                        
                         gVoiceClient->login(
                                 content["username"].asString(),
-                                content["password"].asString());
+                                content["password"].asString(),
+                                voice_sip_uri_hostname,
+                                voice_account_server_uri);
                 }
         }
 
@@ -166,21 +224,27 @@ protected:
         int                             ignoreDepth;
 
         // Members for processing responses. The values are transient and only valid within a call to processResponse().
+        bool                    squelchDebugOutput;
         int                             returnCode;
         int                             statusCode;
         std::string             statusString;
-        std::string             uuidString;
+        std::string             requestId;
         std::string             actionString;
         std::string             connectorHandle;
+        std::string             versionID;
         std::string             accountHandle;
         std::string             sessionHandle;
-        std::string             eventSessionHandle;
+        std::string             sessionGroupHandle;
+        std::string             alias;
+        std::string             applicationString;
 
         // Members for processing events. The values are transient and only valid within a call to processResponse().
         std::string             eventTypeString;
         int                             state;
         std::string             uriString;
         bool                    isChannel;
+        bool                    incoming;
+        bool                    enabled;
         std::string             nameString;
         std::string             audioMediaString;
         std::string             displayNameString;
@@ -190,6 +254,21 @@ protected:
         bool                    isSpeaking;
         int                             volume;
         F32                             energy;
+        std::string             messageHeader;
+        std::string             messageBody;
+        std::string             notificationType;
+        bool                    hasText;
+        bool                    hasAudio;
+        bool                    hasVideo;
+        bool                    terminated;
+        std::string             blockMask;
+        std::string             presenceOnly;
+        std::string             autoAcceptMask;
+        std::string             autoAddAsBuddy;
+        int                             numberOfAliases;
+        std::string             subscriptionHandle;
+        std::string             subscriptionType;
+                
 
         // Members for processing text between tags
         std::string             textBuffer;
@@ -222,8 +301,6 @@ void LLVivoxProtocolParser::reset()
         responseDepth = 0;
         ignoringTags = false;
         accumulateText = false;
-        textBuffer.clear();
-
         energy = 0.f;
         ignoreDepth = 0;
         isChannel = false;
@@ -232,10 +309,15 @@ void LLVivoxProtocolParser::reset()
         isModeratorMuted = false;
         isSpeaking = false;
         participantType = 0;
-        returnCode = 0;
+        squelchDebugOutput = false;
+        returnCode = -1;
         state = 0;
         statusCode = 0;
         volume = 0;
+        textBuffer.clear();
+        alias.clear();
+        numberOfAliases = 0;
+        applicationString.clear();
 }
 
 //virtual 
@@ -262,33 +344,11 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
                 mInput.append(buf, istr.gcount());
         }
         
-        // MBW -- XXX -- This should no longer be necessary.  Or even possible.
-        // We've read all the data out of the buffer.  Make sure it doesn't accumulate.
-//      buffer->clear();
-        
         // Look for input delimiter(s) in the input buffer.  If one is found, send the message to the xml parser.
         int start = 0;
         int delim;
         while((delim = mInput.find("\n\n\n", start)) != std::string::npos)
         {       
-                // Turn this on to log incoming XML
-                if(0)
-                {
-                        int foo = mInput.find("Set3DPosition", start);
-                        int bar = mInput.find("ParticipantPropertiesEvent", start);
-                        if(foo != std::string::npos && (foo < delim))
-                        {
-                                // This is a Set3DPosition response.  Don't print it, since these are way too spammy.
-                        }
-                        else if(bar != std::string::npos && (bar < delim))
-                        {
-                                // This is a ParticipantPropertiesEvent response.  Don't print it, since these are way too spammy.
-                        }
-                        else
-                        {
-                                LL_INFOS("Voice") << "parsing: " << mInput.substr(start, delim - start) << LL_ENDL;
-                        }
-                }
                 
                 // Reset internal state of the LLVivoxProtocolParser (no effect on the expat parser)
                 reset();
@@ -299,13 +359,19 @@ LLIOPipe::EStatus LLVivoxProtocolParser::process_impl(
                 XML_SetUserData(parser, this);  
                 XML_Parse(parser, mInput.data() + start, delim - start, false);
                 
+                // If this message isn't set to be squelched, output the raw XML received.
+                if(!squelchDebugOutput)
+                {
+                        LL_DEBUGS("Voice") << "parsing: " << mInput.substr(start, delim - start) << LL_ENDL;
+                }
+                
                 start = delim + 3;
         }
         
         if(start != 0)
                 mInput = mInput.substr(start);
 
-        LL_DEBUGS("Voice") << "at end, mInput is: " << mInput << LL_ENDL;
+        LL_DEBUGS("VivoxProtocolParser") << "at end, mInput is: " << mInput << LL_ENDL;
         
         if(!gVoiceClient->mConnected)
         {
@@ -360,9 +426,9 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
         
         if (responseDepth == 0)
         {       
-                isEvent = strcmp("Event", tag) == 0;
+                isEvent = !stricmp("Event", tag);
                 
-                if (strcmp("Response", tag) == 0 || isEvent)
+                if (!stricmp("Response", tag) || isEvent)
                 {
                         // Grab the attributes
                         while (*attr)
@@ -370,49 +436,62 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
                                 const char      *key = *attr++;
                                 const char      *value = *attr++;
                                 
-                                if (strcmp("requestId", key) == 0)
+                                if (!stricmp("requestId", key))
                                 {
-                                        uuidString = value;
+                                        requestId = value;
                                 }
-                                else if (strcmp("action", key) == 0)
+                                else if (!stricmp("action", key))
                                 {
                                         actionString = value;
                                 }
-                                else if (strcmp("type", key) == 0)
+                                else if (!stricmp("type", key))
                                 {
                                         eventTypeString = value;
                                 }
                         }
                 }
-                LL_DEBUGS("Voice") << tag << " (" << responseDepth << ")"  << LL_ENDL;
+                LL_DEBUGS("VivoxProtocolParser") << tag << " (" << responseDepth << ")"  << LL_ENDL;
         }
         else
         {
                 if (ignoringTags)
                 {
-                        LL_DEBUGS("Voice") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParser") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
                 }
                 else
                 {
-                        LL_DEBUGS("Voice") << tag << " (" << responseDepth << ")"  << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParser") << tag << " (" << responseDepth << ")"  << LL_ENDL;
         
                         // Ignore the InputXml stuff so we don't get confused
-                        if (strcmp("InputXml", tag) == 0)
+                        if (!stricmp("InputXml", tag))
                         {
                                 ignoringTags = true;
                                 ignoreDepth = responseDepth;
                                 accumulateText = false;
 
-                                LL_DEBUGS("Voice") << "starting ignore, ignoreDepth is " << ignoreDepth << LL_ENDL;
+                                LL_DEBUGS("VivoxProtocolParser") << "starting ignore, ignoreDepth is " << ignoreDepth << LL_ENDL;
                         }
-                        else if (strcmp("CaptureDevices", tag) == 0)
+                        else if (!stricmp("CaptureDevices", tag))
                         {
                                 gVoiceClient->clearCaptureDevices();
                         }
-                        else if (strcmp("RenderDevices", tag) == 0)
+                        else if (!stricmp("RenderDevices", tag))
                         {
                                 gVoiceClient->clearRenderDevices();
                         }
+                        else if (!stricmp("Buddies", tag))
+                        {
+                                gVoiceClient->deleteAllBuddies();
+                        }
+                        else if (!stricmp("BlockRules", tag))
+                        {
+                                gVoiceClient->deleteAllBlockRules();
+                        }
+                        else if (!stricmp("AutoAcceptRules", tag))
+                        {
+                                gVoiceClient->deleteAllAutoAcceptRules();
+                        }
+                        
                 }
         }
         responseDepth++;
@@ -431,90 +510,138 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
         {
                 if (ignoreDepth == responseDepth)
                 {
-                        LL_DEBUGS("Voice") << "end of ignore" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParser") << "end of ignore" << LL_ENDL;
                         ignoringTags = false;
                 }
                 else
                 {
-                        LL_DEBUGS("Voice") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                        LL_DEBUGS("VivoxProtocolParser") << "ignoring tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
                 }
         }
         
         if (!ignoringTags)
         {
-                LL_DEBUGS("Voice") << "processing tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
+                LL_DEBUGS("VivoxProtocolParser") << "processing tag " << tag << " (depth = " << responseDepth << ")" << LL_ENDL;
 
                 // Closing a tag. Finalize the text we've accumulated and reset
-                if (strcmp("ReturnCode", tag) == 0)
+                if (!stricmp("ReturnCode", tag))
                         returnCode = strtol(string.c_str(), NULL, 10);
-                else if (strcmp("StatusCode", tag) == 0)
+                else if (!stricmp("SessionHandle", tag))
+                        sessionHandle = string;
+                else if (!stricmp("SessionGroupHandle", tag))
+                        sessionGroupHandle = string;
+                else if (!stricmp("StatusCode", tag))
                         statusCode = strtol(string.c_str(), NULL, 10);
-                else if (strcmp("ConnectorHandle", tag) == 0)
+                else if (!stricmp("StatusString", tag))
+                        statusString = string;
+                else if (!stricmp("ParticipantURI", tag))
+                        uriString = string;
+                else if (!stricmp("Volume", tag))
+                        volume = strtol(string.c_str(), NULL, 10);
+                else if (!stricmp("Energy", tag))
+                        energy = (F32)strtod(string.c_str(), NULL);
+                else if (!stricmp("IsModeratorMuted", tag))
+                        isModeratorMuted = !stricmp(string.c_str(), "true");
+                else if (!stricmp("IsSpeaking", tag))
+                        isSpeaking = !stricmp(string.c_str(), "true");
+                else if (!stricmp("Alias", tag))
+                        alias = string;
+                else if (!stricmp("NumberOfAliases", tag))
+                        numberOfAliases = strtol(string.c_str(), NULL, 10);
+                else if (!stricmp("Application", tag))
+                        applicationString = string;
+                else if (!stricmp("ConnectorHandle", tag))
                         connectorHandle = string;
-                else if (strcmp("AccountHandle", tag) == 0)
+                else if (!stricmp("VersionID", tag))
+                        versionID = string;
+                else if (!stricmp("AccountHandle", tag))
                         accountHandle = string;
-                else if (strcmp("SessionHandle", tag) == 0)
-                {
-                        if (isEvent)
-                                eventSessionHandle = string;
-                        else
-                                sessionHandle = string;
-                }
-                else if (strcmp("StatusString", tag) == 0)
-                        statusString = string;
-                else if (strcmp("State", tag) == 0)
+                else if (!stricmp("State", tag))
                         state = strtol(string.c_str(), NULL, 10);
-                else if (strcmp("URI", tag) == 0)
+                else if (!stricmp("URI", tag))
                         uriString = string;
-                else if (strcmp("IsChannel", tag) == 0)
-                        isChannel = string == "true" ? true : false;
-                else if (strcmp("Name", tag) == 0)
+                else if (!stricmp("IsChannel", tag))
+                        isChannel = !stricmp(string.c_str(), "true");
+                else if (!stricmp("Incoming", tag))
+                        incoming = !stricmp(string.c_str(), "true");
+                else if (!stricmp("Enabled", tag))
+                        enabled = !stricmp(string.c_str(), "true");
+                else if (!stricmp("Name", tag))
                         nameString = string;
-                else if (strcmp("AudioMedia", tag) == 0)
+                else if (!stricmp("AudioMedia", tag))
                         audioMediaString = string;
-                else if (strcmp("ChannelName", tag) == 0)
+                else if (!stricmp("ChannelName", tag))
                         nameString = string;
-                else if (strcmp("ParticipantURI", tag) == 0)
-                        uriString = string;
-                else if (strcmp("DisplayName", tag) == 0)
+                else if (!stricmp("DisplayName", tag))
                         displayNameString = string;
-                else if (strcmp("AccountName", tag) == 0)
+                else if (!stricmp("AccountName", tag))
                         nameString = string;
-                else if (strcmp("ParticipantTyppe", tag) == 0)
+                else if (!stricmp("ParticipantType", tag))
                         participantType = strtol(string.c_str(), NULL, 10);
-                else if (strcmp("IsLocallyMuted", tag) == 0)
-                        isLocallyMuted = string == "true" ? true : false;
-                else if (strcmp("IsModeratorMuted", tag) == 0)
-                        isModeratorMuted = string == "true" ? true : false;
-                else if (strcmp("IsSpeaking", tag) == 0)
-                        isSpeaking = string == "true" ? true : false;
-                else if (strcmp("Volume", tag) == 0)
-                        volume = strtol(string.c_str(), NULL, 10);
-                else if (strcmp("Energy", tag) == 0)
+                else if (!stricmp("IsLocallyMuted", tag))
+                        isLocallyMuted = !stricmp(string.c_str(), "true");
+                else if (!stricmp("MicEnergy", tag))
                         energy = (F32)strtod(string.c_str(), NULL);
-                else if (strcmp("MicEnergy", tag) == 0)
-                        energy = (F32)strtod(string.c_str(), NULL);
-                else if (strcmp("ChannelName", tag) == 0)
+                else if (!stricmp("ChannelName", tag))
                         nameString = string;
-                else if (strcmp("ChannelURI", tag) == 0)
+                else if (!stricmp("ChannelURI", tag))
                         uriString = string;
-                else if (strcmp("ChannelListResult", tag) == 0)
-                {
-                        gVoiceClient->addChannelMapEntry(nameString, uriString);
-                }
-                else if (strcmp("Device", tag) == 0)
+                else if (!stricmp("BuddyURI", tag))
+                        uriString = string;
+                else if (!stricmp("Presence", tag))
+                        statusString = string;
+                else if (!stricmp("Device", tag))
                 {
                         // This closing tag shouldn't clear the accumulated text.
                         clearbuffer = false;
                 }
-                else if (strcmp("CaptureDevice", tag) == 0)
+                else if (!stricmp("CaptureDevice", tag))
                 {
                         gVoiceClient->addCaptureDevice(textBuffer);
                 }
-                else if (strcmp("RenderDevice", tag) == 0)
+                else if (!stricmp("RenderDevice", tag))
                 {
                         gVoiceClient->addRenderDevice(textBuffer);
                 }
+                else if (!stricmp("Buddy", tag))
+                {
+                        gVoiceClient->processBuddyListEntry(uriString, displayNameString);
+                }
+                else if (!stricmp("BlockRule", tag))
+                {
+                        gVoiceClient->addBlockRule(blockMask, presenceOnly);
+                }
+                else if (!stricmp("BlockMask", tag))
+                        blockMask = string;
+                else if (!stricmp("PresenceOnly", tag))
+                        presenceOnly = string;
+                else if (!stricmp("AutoAcceptRule", tag))
+                {
+                        gVoiceClient->addAutoAcceptRule(autoAcceptMask, autoAddAsBuddy);
+                }
+                else if (!stricmp("AutoAcceptMask", tag))
+                        autoAcceptMask = string;
+                else if (!stricmp("AutoAddAsBuddy", tag))
+                        autoAddAsBuddy = string;
+                else if (!stricmp("MessageHeader", tag))
+                        messageHeader = string;
+                else if (!stricmp("MessageBody", tag))
+                        messageBody = string;
+                else if (!stricmp("NotificationType", tag))
+                        notificationType = string;
+                else if (!stricmp("HasText", tag))
+                        hasText = !stricmp(string.c_str(), "true");
+                else if (!stricmp("HasAudio", tag))
+                        hasAudio = !stricmp(string.c_str(), "true");
+                else if (!stricmp("HasVideo", tag))
+                        hasVideo = !stricmp(string.c_str(), "true");
+                else if (!stricmp("Terminated", tag))
+                        terminated = !stricmp(string.c_str(), "true");
+                else if (!stricmp("SubscriptionHandle", tag))
+                        subscriptionHandle = string;
+                else if (!stricmp("SubscriptionType", tag))
+                        subscriptionType = string;
+                
 
                 if(clearbuffer)
                 {
@@ -549,144 +676,296 @@ void LLVivoxProtocolParser::CharData(const char *buffer, int length)
 
 void LLVivoxProtocolParser::processResponse(std::string tag)
 {
-        LL_DEBUGS("Voice") << tag << LL_ENDL;
+        LL_DEBUGS("VivoxProtocolParser") << tag << LL_ENDL;
 
+        // SLIM SDK: the SDK now returns a statusCode of "200" (OK) for success.  This is a change vs. previous SDKs.
+        // According to Mike S., "The actual API convention is that responses with return codes of 0 are successful, regardless of the status code returned",
+        // so I believe this will give correct behavior.
+        
+        if(returnCode == 0)
+                statusCode = 0;
+                
         if (isEvent)
         {
-                if (eventTypeString == "LoginStateChangeEvent")
+                const char *eventTypeCstr = eventTypeString.c_str();
+                if (!stricmp(eventTypeCstr, "AccountLoginStateChangeEvent"))
                 {
-                        gVoiceClient->loginStateChangeEvent(accountHandle, statusCode, statusString, state);
+                        gVoiceClient->accountLoginStateChangeEvent(accountHandle, statusCode, statusString, state);
                 }
-                else if (eventTypeString == "SessionNewEvent")
+                else if (!stricmp(eventTypeCstr, "SessionAddedEvent"))
                 {
-                        gVoiceClient->sessionNewEvent(accountHandle, eventSessionHandle, state, nameString, uriString);
+                        /*
+                        <Event type="SessionAddedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg0</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==0</SessionHandle>
+                                <Uri>sip:confctl-1408789@bhr.vivox.com</Uri>
+                                <IsChannel>true</IsChannel>
+                                <Incoming>false</Incoming>
+                                <ChannelName />
+                        </Event>
+                        */
+                        gVoiceClient->sessionAddedEvent(uriString, alias, sessionHandle, sessionGroupHandle, isChannel, incoming, nameString, applicationString);
                 }
-                else if (eventTypeString == "SessionStateChangeEvent")
+                else if (!stricmp(eventTypeCstr, "SessionRemovedEvent"))
                 {
-                        gVoiceClient->sessionStateChangeEvent(uriString, statusCode, statusString, eventSessionHandle, state, isChannel, nameString);
+                        gVoiceClient->sessionRemovedEvent(sessionHandle, sessionGroupHandle);
                 }
-                else if (eventTypeString == "ParticipantStateChangeEvent")
+                else if (!stricmp(eventTypeCstr, "SessionGroupAddedEvent"))
                 {
-                        gVoiceClient->participantStateChangeEvent(uriString, statusCode, statusString, state,  nameString, displayNameString, participantType);
-                        
+                        gVoiceClient->sessionGroupAddedEvent(sessionGroupHandle);
+                }
+                else if (!stricmp(eventTypeCstr, "MediaStreamUpdatedEvent"))
+                {
+                        /*
+                        <Event type="MediaStreamUpdatedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg0</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==0</SessionHandle>
+                                <StatusCode>200</StatusCode>
+                                <StatusString>OK</StatusString>
+                                <State>2</State>
+                                <Incoming>false</Incoming>
+                        </Event>
+                        */
+                        gVoiceClient->mediaStreamUpdatedEvent(sessionHandle, sessionGroupHandle, statusCode, statusString, state, incoming);
+                }               
+                else if (!stricmp(eventTypeCstr, "TextStreamUpdatedEvent"))
+                {
+                        /*
+                        <Event type="TextStreamUpdatedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg1</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==1</SessionHandle>
+                                <Enabled>true</Enabled>
+                                <State>1</State>
+                                <Incoming>true</Incoming>
+                        </Event>
+                        */
+                        gVoiceClient->textStreamUpdatedEvent(sessionHandle, sessionGroupHandle, enabled, state, incoming);
                 }
-                else if (eventTypeString == "ParticipantPropertiesEvent")
+                else if (!stricmp(eventTypeCstr, "ParticipantAddedEvent"))
                 {
-                        gVoiceClient->participantPropertiesEvent(uriString, statusCode, statusString, isLocallyMuted, isModeratorMuted, isSpeaking, volume, energy);
+                        /* 
+                        <Event type="ParticipantAddedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg4</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==4</SessionHandle>
+                                <ParticipantUri>sip:xI5auBZ60SJWIk606-1JGRQ==@bhr.vivox.com</ParticipantUri>
+                                <AccountName>xI5auBZ60SJWIk606-1JGRQ==</AccountName>
+                                <DisplayName />
+                                <ParticipantType>0</ParticipantType>
+                        </Event>
+                        */
+                        gVoiceClient->participantAddedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString, displayNameString, participantType);
                 }
-                else if (eventTypeString == "AuxAudioPropertiesEvent")
+                else if (!stricmp(eventTypeCstr, "ParticipantRemovedEvent"))
+                {
+                        /*
+                        <Event type="ParticipantRemovedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg4</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==4</SessionHandle>
+                                <ParticipantUri>sip:xtx7YNV-3SGiG7rA1fo5Ndw==@bhr.vivox.com</ParticipantUri>
+                                <AccountName>xtx7YNV-3SGiG7rA1fo5Ndw==</AccountName>
+                        </Event>
+                        */
+                        gVoiceClient->participantRemovedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString);
+                }
+                else if (!stricmp(eventTypeCstr, "ParticipantUpdatedEvent"))
+                {
+                        /*
+                        <Event type="ParticipantUpdatedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg0</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==0</SessionHandle>
+                                <ParticipantUri>sip:xFnPP04IpREWNkuw1cOXlhw==@bhr.vivox.com</ParticipantUri>
+                                <IsModeratorMuted>false</IsModeratorMuted>
+                                <IsSpeaking>true</IsSpeaking>
+                                <Volume>44</Volume>
+                                <Energy>0.0879437</Energy>
+                        </Event>
+                        */
+                        
+                        // These happen so often that logging them is pretty useless.
+                        squelchDebugOutput = true;
+                        
+                        gVoiceClient->participantUpdatedEvent(sessionHandle, sessionGroupHandle, uriString, alias, isModeratorMuted, isSpeaking, volume, energy);
+                }
+                else if (!stricmp(eventTypeCstr, "AuxAudioPropertiesEvent"))
                 {
                         gVoiceClient->auxAudioPropertiesEvent(energy);
                 }
+                else if (!stricmp(eventTypeCstr, "BuddyPresenceEvent"))
+                {
+                        gVoiceClient->buddyPresenceEvent(uriString, alias, statusString, applicationString);
+                }
+                else if (!stricmp(eventTypeCstr, "BuddyAndGroupListChangedEvent"))
+                {
+                        // The buddy list was updated during parsing.
+                        // Need to recheck against the friends list.
+                        gVoiceClient->buddyListChanged();
+                }
+                else if (!stricmp(eventTypeCstr, "BuddyChangedEvent"))
+                {
+                        /*
+                        <Event type="BuddyChangedEvent">
+                                <AccountHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==</AccountHandle>
+                                <BuddyURI>sip:x9fFHFZjOTN6OESF1DUPrZQ==@bhr.vivox.com</BuddyURI>
+                                <DisplayName>Monroe Tester</DisplayName>
+                                <BuddyData />
+                                <GroupID>0</GroupID>
+                                <ChangeType>Set</ChangeType>
+                        </Event>
+                        */              
+                        // TODO: Question: Do we need to process this at all?
+                }
+                else if (!stricmp(eventTypeCstr, "MessageEvent"))  
+                {
+                        gVoiceClient->messageEvent(sessionHandle, uriString, alias, messageHeader, messageBody, applicationString);
+                }
+                else if (!stricmp(eventTypeCstr, "SessionNotificationEvent"))  
+                {
+                        gVoiceClient->sessionNotificationEvent(sessionHandle, uriString, notificationType);
+                }
+                else if (!stricmp(eventTypeCstr, "SubscriptionEvent"))  
+                {
+                        gVoiceClient->subscriptionEvent(uriString, subscriptionHandle, alias, displayNameString, applicationString, subscriptionType);
+                }
+                else if (!stricmp(eventTypeCstr, "SessionUpdatedEvent"))  
+                {
+                        /*
+                        <Event type="SessionUpdatedEvent">
+                                <SessionGroupHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==_sg0</SessionGroupHandle>
+                                <SessionHandle>c1_m1000xFnPP04IpREWNkuw1cOXlhw==0</SessionHandle>
+                                <Uri>sip:confctl-9@bhd.vivox.com</Uri>
+                                <IsMuted>0</IsMuted>
+                                <Volume>50</Volume>
+                                <TransmitEnabled>1</TransmitEnabled>
+                                <IsFocused>0</IsFocused>
+                                <SpeakerPosition><Position><X>0</X><Y>0</Y><Z>0</Z></Position></SpeakerPosition>
+                                <SessionFontID>0</SessionFontID>
+                        </Event>
+                        */
+                        // We don't need to process this, but we also shouldn't warn on it, since that confuses people.
+                }
+                else
+                {
+                        LL_WARNS("VivoxProtocolParser") << "Unknown event type " << eventTypeString << LL_ENDL;
+                }
         }
         else
         {
-                if (actionString == "Connector.Create.1")
+                const char *actionCstr = actionString.c_str();
+                if (!stricmp(actionCstr, "Connector.Create.1"))
                 {
-                        gVoiceClient->connectorCreateResponse(statusCode, statusString, connectorHandle);
+                        gVoiceClient->connectorCreateResponse(statusCode, statusString, connectorHandle, versionID);
                 }
-                else if (actionString == "Account.Login.1")
+                else if (!stricmp(actionCstr, "Account.Login.1"))
                 {
-                        gVoiceClient->loginResponse(statusCode, statusString, accountHandle);
+                        gVoiceClient->loginResponse(statusCode, statusString, accountHandle, numberOfAliases);
                 }
-                else if (actionString == "Session.Create.1")
+                else if (!stricmp(actionCstr, "Session.Create.1"))
                 {
-                        gVoiceClient->sessionCreateResponse(statusCode, statusString, sessionHandle);                   
+                        gVoiceClient->sessionCreateResponse(requestId, statusCode, statusString, sessionHandle);                        
                 }
-                else if (actionString == "Session.Connect.1")
+                else if (!stricmp(actionCstr, "SessionGroup.AddSession.1"))
                 {
-                        gVoiceClient->sessionConnectResponse(statusCode, statusString);                 
+                        gVoiceClient->sessionGroupAddSessionResponse(requestId, statusCode, statusString, sessionHandle);                       
                 }
-                else if (actionString == "Session.Terminate.1")
+                else if (!stricmp(actionCstr, "Session.Connect.1"))
                 {
-                        gVoiceClient->sessionTerminateResponse(statusCode, statusString);                       
+                        gVoiceClient->sessionConnectResponse(requestId, statusCode, statusString);                      
                 }
-                else if (actionString == "Account.Logout.1")
+                else if (!stricmp(actionCstr, "Account.Logout.1"))
                 {
                         gVoiceClient->logoutResponse(statusCode, statusString);                 
                 }
-                else if (actionString == "Connector.InitiateShutdown.1")
+                else if (!stricmp(actionCstr, "Connector.InitiateShutdown.1"))
                 {
                         gVoiceClient->connectorShutdownResponse(statusCode, statusString);                      
                 }
-                else if (actionString == "Account.ChannelGetList.1")
+                else if (!stricmp(actionCstr, "Account.ListBlockRules.1"))
                 {
-                        gVoiceClient->channelGetListResponse(statusCode, statusString);
+                        gVoiceClient->accountListBlockRulesResponse(statusCode, statusString);                                          
+                }
+                else if (!stricmp(actionCstr, "Account.ListAutoAcceptRules.1"))
+                {
+                        gVoiceClient->accountListAutoAcceptRulesResponse(statusCode, statusString);                                             
+                }
+                else if (!stricmp(actionCstr, "Session.Set3DPosition.1"))
+                {
+                        // We don't need to process these, but they're so spammy we don't want to log them.
+                        squelchDebugOutput = true;
                 }
 /*
-                else if (actionString == "Connector.AccountCreate.1")
+                else if (!stricmp(actionCstr, "Account.ChannelGetList.1"))
                 {
-                        
+                        gVoiceClient->channelGetListResponse(statusCode, statusString);
                 }
-                else if (actionString == "Connector.MuteLocalMic.1")
+                else if (!stricmp(actionCstr, "Connector.AccountCreate.1"))
                 {
                         
                 }
-                else if (actionString == "Connector.MuteLocalSpeaker.1")
+                else if (!stricmp(actionCstr, "Connector.MuteLocalMic.1"))
                 {
                         
                 }
-                else if (actionString == "Connector.SetLocalMicVolume.1")
+                else if (!stricmp(actionCstr, "Connector.MuteLocalSpeaker.1"))
                 {
                         
                 }
-                else if (actionString == "Connector.SetLocalSpeakerVolume.1")
+                else if (!stricmp(actionCstr, "Connector.SetLocalMicVolume.1"))
                 {
                         
                 }
-                else if (actionString == "Session.ListenerSetPosition.1")
+                else if (!stricmp(actionCstr, "Connector.SetLocalSpeakerVolume.1"))
                 {
                         
                 }
-                else if (actionString == "Session.SpeakerSetPosition.1")
+                else if (!stricmp(actionCstr, "Session.ListenerSetPosition.1"))
                 {
                         
                 }
-                else if (actionString == "Session.Set3DPosition.1")
+                else if (!stricmp(actionCstr, "Session.SpeakerSetPosition.1"))
                 {
                         
                 }
-                else if (actionString == "Session.AudioSourceSetPosition.1")
+                else if (!stricmp(actionCstr, "Session.AudioSourceSetPosition.1"))
                 {
                         
                 }
-                else if (actionString == "Session.GetChannelParticipants.1")
+                else if (!stricmp(actionCstr, "Session.GetChannelParticipants.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelCreate.1")
+                else if (!stricmp(actionCstr, "Account.ChannelCreate.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelUpdate.1")
+                else if (!stricmp(actionCstr, "Account.ChannelUpdate.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelDelete.1")
+                else if (!stricmp(actionCstr, "Account.ChannelDelete.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelCreateAndInvite.1")
+                else if (!stricmp(actionCstr, "Account.ChannelCreateAndInvite.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelFolderCreate.1")
+                else if (!stricmp(actionCstr, "Account.ChannelFolderCreate.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelFolderUpdate.1")
+                else if (!stricmp(actionCstr, "Account.ChannelFolderUpdate.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelFolderDelete.1")
+                else if (!stricmp(actionCstr, "Account.ChannelFolderDelete.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelAddModerator.1")
+                else if (!stricmp(actionCstr, "Account.ChannelAddModerator.1"))
                 {
                         
                 }
-                else if (actionString == "Account.ChannelDeleteModerator.1")
+                else if (!stricmp(actionCstr, "Account.ChannelDeleteModerator.1"))
                 {
                         
                 }
@@ -700,9 +979,18 @@ class LLVoiceClientMuteListObserver : public LLMuteListObserver
 {
         /* virtual */ void onChange()  { gVoiceClient->muteListChanged();}
 };
+
+class LLVoiceClientFriendsObserver : public LLFriendObserver
+{
+public:
+        /* virtual */ void changed(U32 mask) { gVoiceClient->updateFriends(mask);}
+};
+
 static LLVoiceClientMuteListObserver mutelist_listener;
 static bool sMuteListListener_listening = false;
 
+static LLVoiceClientFriendsObserver *friendslist_listener = NULL;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
 class LLVoiceClientCapResponder : public LLHTTPClient::Responder
@@ -726,11 +1014,8 @@ void LLVoiceClientCapResponder::error(U32 status, const std::string& reason)
 void LLVoiceClientCapResponder::result(const LLSD& content)
 {
         LLSD::map_const_iterator iter;
-        for(iter = content.beginMap(); iter != content.endMap(); ++iter)
-        {
-                LL_DEBUGS("Voice") << "LLVoiceClientCapResponder::result got " 
-                        << iter->first << LL_ENDL;
-        }
+        
+        LL_DEBUGS("Voice") << "ParcelVoiceInfoRequest response:" << ll_pretty_print_sd(content) << LL_ENDL;
 
         if ( content.has("voice_credentials") )
         {
@@ -816,26 +1101,26 @@ LLVoiceClient::LLVoiceClient()
         mUserPTTState = false;
         mMuteMic = false;
         mSessionTerminateRequested = false;
+        mRelogRequested = false;
         mCommandCookie = 0;
-        mNonSpatialChannel = false;
-        mNextSessionSpatial = true;
-        mNextSessionNoReconnect = false;
-        mSessionP2P = false;
         mCurrentParcelLocalID = 0;
         mLoginRetryCount = 0;
-        mVivoxErrorStatusCode = 0;
 
-        mNextSessionResetOnClose = false;
-        mSessionResetOnClose = false;
         mSpeakerVolume = 0;
         mMicVolume = 0;
 
+        mAudioSession = NULL;
+        mAudioSessionChanged = false;
+
         // Initial dirty state
         mSpatialCoordsDirty = false;
         mPTTDirty = true;
-        mVolumeDirty = true;
+        mFriendsListDirty = true;
         mSpeakerVolumeDirty = true;
         mMicVolumeDirty = true;
+        mBuddyListMapPopulated = false;
+        mBlockRulesListReceived = false;
+        mAutoAcceptRulesListReceived = false;
         mCaptureDeviceDirty = false;
         mRenderDeviceDirty = false;
 
@@ -856,14 +1141,12 @@ LLVoiceClient::LLVoiceClient()
         //  gMuteListp isn't set up at this point, so we defer this until later.
 //      gMuteListp->addObserver(&mutelist_listener);
         
-        mParticipantMapChanged = false;
-
         // stash the pump for later use
         // This now happens when init() is called instead.
         mPump = NULL;
         
 #if LL_DARWIN || LL_LINUX
-                // MBW -- XXX -- THIS DOES NOT BELONG HERE
+                // HACK: THIS DOES NOT BELONG HERE
                 // When the vivox daemon dies, the next write attempt on our socket generates a SIGPIPE, which kills us.
                 // This should cause us to ignore SIGPIPE and handle the error through proper channels.
                 // This should really be set up elsewhere.  Where should it go?
@@ -899,8 +1182,10 @@ void LLVoiceClient::terminate()
 {
         if(gVoiceClient)
         {
-                gVoiceClient->sessionTerminateSendMessage();
+//              gVoiceClient->leaveAudioSession();
                 gVoiceClient->logout();
+                // As of SDK version 4885, this should no longer be necessary.  It will linger after the socket close if it needs to.
+                // ms_sleep(2000);
                 gVoiceClient->connectorShutdown();
                 gVoiceClient->closeSocket();            // Need to do this now -- bad things happen if the destructor does it later.
                 
@@ -925,13 +1210,13 @@ void LLVoiceClient::updateSettings()
         setPTTKey(keyString);
         setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
         setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
-        std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
-        setVivoxDebugServerName(serverName);
 
         std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
         setCaptureDevice(inputDevice);
         std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
         setRenderDevice(outputDevice);
+        F32 mic_level = gSavedSettings.getF32("AudioLevelMic");
+        setMicGain(mic_level);
         setLipSyncEnabled(gSavedSettings.getBOOL("LipSyncEnabled"));
 }
 
@@ -947,9 +1232,10 @@ bool LLVoiceClient::writeString(const std::string &str)
                 apr_size_t size = (apr_size_t)str.size();
                 apr_size_t written = size;
         
-                LL_DEBUGS("Voice") << "sending: " << str << LL_ENDL;
+                //MARK: Turn this on to log outgoing XML
+//              LL_DEBUGS("Voice") << "sending: " << str << LL_ENDL;
 
-                // MBW -- XXX -- check return code - sockets will fail (broken, etc.)
+                // check return code - sockets will fail (broken, etc.)
                 err = apr_socket_send(
                                 mSocket->getSocket(),
                                 (const char*)str.data(),
@@ -960,7 +1246,7 @@ bool LLVoiceClient::writeString(const std::string &str)
                         // Success.
                         result = true;
                 }
-                // MBW -- XXX -- handle partial writes (written is number of bytes written)
+                // TODO: handle partial writes (written is number of bytes written)
                 // Need to set socket to non-blocking before this will work.
 //              else if(APR_STATUS_IS_EAGAIN(err))
 //              {
@@ -984,7 +1270,7 @@ bool LLVoiceClient::writeString(const std::string &str)
 void LLVoiceClient::connectorCreate()
 {
         std::ostringstream stream;
-        std::string logpath;
+        std::string logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
         std::string loglevel = "0";
         
         // Transition to stateConnectorStarted when the connector handle comes back.
@@ -996,20 +1282,20 @@ void LLVoiceClient::connectorCreate()
         {
                 LL_DEBUGS("Voice") << "creating connector with logging enabled" << LL_ENDL;
                 loglevel = "10";
-                logpath = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
         }
         
         stream 
         << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.Create.1\">"
                 << "<ClientName>V2 SDK</ClientName>"
-                << "<AccountManagementServer>" << mAccountServerURI << "</AccountManagementServer>"
+                << "<AccountManagementServer>" << mVoiceAccountServerURI << "</AccountManagementServer>"
+                << "<Mode>Normal</Mode>"
                 << "<Logging>"
-                        << "<Enabled>false</Enabled>"
                         << "<Folder>" << logpath << "</Folder>"
                         << "<FileNamePrefix>Connector</FileNamePrefix>"
                         << "<FileNameSuffix>.log</FileNameSuffix>"
                         << "<LogLevel>" << loglevel << "</LogLevel>"
                 << "</Logging>"
+                << "<Application>SecondLifeViewer.1</Application>"
         << "</Request>\n\n\n";
         
         writeString(stream.str());
@@ -1047,20 +1333,6 @@ void LLVoiceClient::userAuthorized(const std::string& firstName, const std::stri
 
         sConnectingToAgni = LLViewerLogin::getInstance()->isInProductionGrid();
 
-        // MBW -- XXX -- Enable this when the bhd.vivox.com server gets a real ssl cert.        
-        if(sConnectingToAgni)
-        {
-                // Use the release account server
-                mAccountServerName = "bhr.vivox.com";
-                mAccountServerURI = "https://www." + mAccountServerName + "/api2/";
-        }
-        else
-        {
-                // Use the development account server
-                mAccountServerName = gSavedSettings.getString("VivoxDebugServerName");
-                mAccountServerURI = "https://www." + mAccountServerName + "/api2/";
-        }
-
         mAccountName = nameFromID(agentID);
 }
 
@@ -1082,24 +1354,69 @@ void LLVoiceClient::requestVoiceAccountProvision(S32 retries)
 }
 
 void LLVoiceClient::login(
-        const std::string& accountName,
-        const std::string &password)
+        const std::string& account_name,
+        const std::string& password,
+        const std::string& voice_sip_uri_hostname,
+        const std::string& voice_account_server_uri)
 {
-        if((getState() >= stateLoggingIn) && (getState() < stateLoggedOut))
+        mVoiceSIPURIHostName = voice_sip_uri_hostname;
+        mVoiceAccountServerURI = voice_account_server_uri;
+
+        if(!mAccountHandle.empty())
         {
-                // Already logged in.  This is an internal error.
-                LL_ERRS("Voice") << "Can't login again. Called from wrong state." << LL_ENDL;
+                // Already logged in.
+                LL_WARNS("Voice") << "Called while already logged in." << LL_ENDL;
+                
+                // Don't process another login.
+                return;
         }
-        else if ( accountName != mAccountName )
+        else if ( account_name != mAccountName )
         {
                 //TODO: error?
-                LL_WARNS("Voice") << "Wrong account name! " << accountName
+                LL_WARNS("Voice") << "Wrong account name! " << account_name
                                 << " instead of " << mAccountName << LL_ENDL;
         }
         else
         {
                 mAccountPassword = password;
         }
+
+        std::string debugSIPURIHostName = gSavedSettings.getString("VivoxDebugSIPURIHostName");
+        
+        if( !debugSIPURIHostName.empty() )
+        {
+                mVoiceSIPURIHostName = debugSIPURIHostName;
+        }
+        
+        if( mVoiceSIPURIHostName.empty() )
+        {
+                // we have an empty account server name
+                // so we fall back to hardcoded defaults
+
+                if(sConnectingToAgni)
+                {
+                        // Use the release account server
+                        mVoiceSIPURIHostName = "bhr.vivox.com";
+                }
+                else
+                {
+                        // Use the development account server
+                        mVoiceSIPURIHostName = "bhd.vivox.com";
+                }
+        }
+        
+        std::string debugAccountServerURI = gSavedSettings.getString("VivoxDebugVoiceAccountServerURI");
+
+        if( !debugAccountServerURI.empty() )
+        {
+                mVoiceAccountServerURI = debugAccountServerURI;
+        }
+        
+        if( mVoiceAccountServerURI.empty() )
+        {
+                // If the account server URI isn't specified, construct it from the SIP URI hostname
+                mVoiceAccountServerURI = "https://www." + mVoiceSIPURIHostName + "/api2/";              
+        }
 }
 
 void LLVoiceClient::idle(void* user_data)
@@ -1117,11 +1434,16 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
 
         switch(inState)
         {
+                CASE(stateDisableCleanup);
                 CASE(stateDisabled);
                 CASE(stateStart);
                 CASE(stateDaemonLaunched);
                 CASE(stateConnecting);
+                CASE(stateConnected);
                 CASE(stateIdle);
+                CASE(stateMicTuningStart);
+                CASE(stateMicTuningRunning);
+                CASE(stateMicTuningStop);
                 CASE(stateConnectorStart);
                 CASE(stateConnectorStarting);
                 CASE(stateConnectorStarted);
@@ -1130,12 +1452,8 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
                 CASE(stateNeedsLogin);
                 CASE(stateLoggingIn);
                 CASE(stateLoggedIn);
+                CASE(stateCreatingSessionGroup);
                 CASE(stateNoChannel);
-                CASE(stateMicTuningStart);
-                CASE(stateMicTuningRunning);
-                CASE(stateMicTuningStop);
-                CASE(stateSessionCreate);
-                CASE(stateSessionConnect);
                 CASE(stateJoiningSession);
                 CASE(stateSessionJoined);
                 CASE(stateRunning);
@@ -1152,7 +1470,6 @@ std::string LLVoiceClient::state2string(LLVoiceClient::state inState)
                 CASE(stateJoinSessionFailed);
                 CASE(stateJoinSessionFailedWaiting);
                 CASE(stateJail);
-                CASE(stateMicTuningNoLogin);
         }
 
 #undef CASE
@@ -1174,6 +1491,7 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv
                 CASE(STATUS_JOINING);
                 CASE(STATUS_JOINED);
                 CASE(STATUS_LEFT_CHANNEL);
+                CASE(STATUS_VOICE_DISABLED);
                 CASE(BEGIN_ERROR_STATUS);
                 CASE(ERROR_CHANNEL_FULL);
                 CASE(ERROR_CHANNEL_LOCKED);
@@ -1207,9 +1525,13 @@ void LLVoiceClient::stateMachine()
         {
                 updatePosition();
         }
+        else if(mTuningMode)
+        {
+                // Tuning mode is special -- it needs to launch SLVoice even if voice is disabled.
+        }
         else
         {
-                if(getState() != stateDisabled)
+                if((getState() != stateDisabled) && (getState() != stateDisableCleanup))
                 {
                         // User turned off voice support.  Send the cleanup messages, close the socket, and reset.
                         if(!mConnected)
@@ -1219,13 +1541,10 @@ void LLVoiceClient::stateMachine()
                                 killGateway();
                         }
                         
-                        sessionTerminateSendMessage();
                         logout();
                         connectorShutdown();
-                        closeSocket();
-                        removeAllParticipants();
-
-                        setState(stateDisabled);
+                        
+                        setState(stateDisableCleanup);
                 }
         }
         
@@ -1240,7 +1559,7 @@ void LLVoiceClient::stateMachine()
                         std::string regionName = region->getName();
                         std::string capURI = region->getCapability("ParcelVoiceInfoRequest");
                 
-                        LL_DEBUGS("Voice") << "Region name = \"" << regionName <<"\", " << "parcel local ID = " << parcelLocalID << LL_ENDL;
+//                      LL_DEBUGS("Voice") << "Region name = \"" << regionName <<"\", " << "parcel local ID = " << parcelLocalID << LL_ENDL;
 
                         // The region name starts out empty and gets filled in later.  
                         // Also, the cap gets filled in a short time after the region cross, but a little too late for our purposes.
@@ -1261,13 +1580,30 @@ void LLVoiceClient::stateMachine()
 
         switch(getState())
         {
+                //MARK: stateDisableCleanup
+                case stateDisableCleanup:
+                        // Clean up and reset everything. 
+                        closeSocket();
+                        deleteAllSessions();
+                        deleteAllBuddies();             
+                        
+                        mConnectorHandle.clear();
+                        mAccountHandle.clear();
+                        mAccountPassword.clear();
+                        mVoiceAccountServerURI.clear();
+                        
+                        setState(stateDisabled);        
+                break;
+                
+                //MARK: stateDisabled
                 case stateDisabled:
-                        if(mVoiceEnabled && (!mAccountName.empty() || mTuningMode))
+                        if(mTuningMode || (mVoiceEnabled && !mAccountName.empty()))
                         {
                                 setState(stateStart);
                         }
                 break;
                 
+                //MARK: stateStart
                 case stateStart:
                         if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
                         {
@@ -1298,7 +1634,9 @@ void LLVoiceClient::stateMachine()
                                         if(!LLFile::stat(exe_path, &s))
                                         {
                                                 // vivox executable exists.  Build the command line and launch the daemon.
-                                                std::string args = " -p tcp -h -c";
+                                                // SLIM SDK: these arguments are no longer necessary.
+//                                              std::string args = " -p tcp -h -c";
+                                                std::string args;
                                                 std::string cmd;
                                                 std::string loglevel = gSavedSettings.getString("VivoxDebugLevel");
                                                 
@@ -1383,14 +1721,15 @@ void LLVoiceClient::stateMachine()
                                         }       
                                         else
                                         {
-                                                LL_INFOS("Voice") << exe_path << "not found." << LL_ENDL;
+                                                LL_INFOS("Voice") << exe_path << " not found." << LL_ENDL;
                                         }       
                                 }
                                 else
                                 {               
+                                        // SLIM SDK: port changed from 44124 to 44125.
                                         // We can connect to a client gateway running on another host.  This is useful for testing.
                                         // To do this, launch the gateway on a nearby host like this:
-                                        //  vivox-gw.exe -p tcp -i 0.0.0.0:44124
+                                        //  vivox-gw.exe -p tcp -i 0.0.0.0:44125
                                         // and put that host's IP address here.
                                         mDaemonHost = LLHost(gSavedSettings.getString("VoiceHost"), gSavedSettings.getU32("VoicePort"));
                                 }
@@ -1402,17 +1741,23 @@ void LLVoiceClient::stateMachine()
                                 
                                 // Dirty the states we'll need to sync with the daemon when it comes up.
                                 mPTTDirty = true;
+                                mMicVolumeDirty = true;
                                 mSpeakerVolumeDirty = true;
+                                mSpeakerMuteDirty = true;
                                 // These only need to be set if they're not default (i.e. empty string).
                                 mCaptureDeviceDirty = !mCaptureDevice.empty();
                                 mRenderDeviceDirty = !mRenderDevice.empty();
+                                
+                                mMainSessionGroupHandle.clear();
                         }
                 break;
-                
+
+                //MARK: stateDaemonLaunched
                 case stateDaemonLaunched:
-                        LL_DEBUGS("Voice") << "Connecting to vivox daemon" << LL_ENDL;
                         if(mUpdateTimer.hasExpired())
                         {
+                                LL_DEBUGS("Voice") << "Connecting to vivox daemon" << LL_ENDL;
+
                                 mUpdateTimer.setTimerExpirySec(CONNECT_THROTTLE_SECONDS);
 
                                 if(!mSocket)
@@ -1433,6 +1778,7 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
 
+                //MARK: stateConnecting
                 case stateConnecting:
                 // Can't do this until we have the pump available.
                 if(mPump)
@@ -1450,48 +1796,34 @@ void LLVoiceClient::stateMachine()
 
                         mPump->addChain(readChain, NEVER_CHAIN_EXPIRY_SECS);
 
-                        setState(stateIdle);
+                        setState(stateConnected);
                 }
 
                 break;
                 
-                case stateIdle:
+                //MARK: stateConnected
+                case stateConnected:
                         // Initial devices query
                         getCaptureDevicesSendMessage();
                         getRenderDevicesSendMessage();
 
                         mLoginRetryCount = 0;
-                        
-                        setState(stateConnectorStart);
-                                
+
+                        setState(stateIdle);
                 break;
-                
-                case stateConnectorStart:
-                        if(!mVoiceEnabled)
-                        {
-                                // We were never logged in.  This will shut down the connector.
-                                setState(stateLoggedOut);
-                        }
-                        else if(!mAccountServerURI.empty())
-                        {
-                                connectorCreate();
-                        }
-                        else if(mTuningMode)
+
+                //MARK: stateIdle
+                case stateIdle:
+                        // This is the idle state where we're connected to the daemon but haven't set up a connector yet.
+                        if(mTuningMode)
                         {
-                                mTuningExitState = stateConnectorStart;
+                                mTuningExitState = stateIdle;
                                 setState(stateMicTuningStart);
                         }
-                break;
-                
-                case stateConnectorStarting:    // waiting for connector handle
-                        // connectorCreateResponse() will transition from here to stateConnectorStarted.
-                break;
-                
-                case stateConnectorStarted:             // connector handle received
-                        if(!mVoiceEnabled)
+                        else if(!mVoiceEnabled)
                         {
-                                // We were never logged in.  This will shut down the connector.
-                                setState(stateLoggedOut);
+                                // We never started up the connector.  This will shut down the daemon.
+                                setState(stateConnectorStopped);
                         }
                         else if(!mAccountName.empty())
                         {
@@ -1505,12 +1837,13 @@ void LLVoiceClient::stateMachine()
                                                 {
                                                         requestVoiceAccountProvision();
                                                 }
-                                                setState(stateNeedsLogin);
+                                                setState(stateConnectorStart);
                                         }
                                 }
                         }
                 break;
-                                
+
+                //MARK: stateMicTuningStart
                 case stateMicTuningStart:
                         if(mUpdateTimer.hasExpired())
                         {
@@ -1518,19 +1851,9 @@ void LLVoiceClient::stateMachine()
                                 {
                                         // These can't be changed while in tuning mode.  Set them before starting.
                                         std::ostringstream stream;
-
-                                        if(mCaptureDeviceDirty)
-                                        {
-                                                buildSetCaptureDevice(stream);
-                                        }
-
-                                        if(mRenderDeviceDirty)
-                                        {
-                                                buildSetRenderDevice(stream);
-                                        }
-
-                                        mCaptureDeviceDirty = false;
-                                        mRenderDeviceDirty = false;
+                                        
+                                        buildSetCaptureDevice(stream);
+                                        buildSetRenderDevice(stream);
 
                                         if(!stream.str().empty())
                                         {
@@ -1552,8 +1875,9 @@ void LLVoiceClient::stateMachine()
                         
                 break;
                 
+                //MARK: stateMicTuningRunning
                 case stateMicTuningRunning:
-                        if(!mTuningMode || !mVoiceEnabled || mSessionTerminateRequested || mCaptureDeviceDirty || mRenderDeviceDirty)
+                        if(!mTuningMode || mCaptureDeviceDirty || mRenderDeviceDirty)
                         {
                                 // All of these conditions make us leave tuning mode.
                                 setState(stateMicTuningStop);
@@ -1593,6 +1917,7 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
                 
+                //MARK: stateMicTuningStop
                 case stateMicTuningStop:
                 {
                         // transition out of mic tuning
@@ -1606,7 +1931,40 @@ void LLVoiceClient::stateMachine()
                         
                 }
                 break;
-                                                                
+                                                                                                
+                //MARK: stateConnectorStart
+                case stateConnectorStart:
+                        if(!mVoiceEnabled)
+                        {
+                                // We were never logged in.  This will shut down the connector.
+                                setState(stateLoggedOut);
+                        }
+                        else if(!mVoiceAccountServerURI.empty())
+                        {
+                                connectorCreate();
+                        }
+                break;
+                
+                //MARK: stateConnectorStarting
+                case stateConnectorStarting:    // waiting for connector handle
+                        // connectorCreateResponse() will transition from here to stateConnectorStarted.
+                break;
+                
+                //MARK: stateConnectorStarted
+                case stateConnectorStarted:             // connector handle received
+                        if(!mVoiceEnabled)
+                        {
+                                // We were never logged in.  This will shut down the connector.
+                                setState(stateLoggedOut);
+                        }
+                        else
+                        {
+                                // The connector is started.  Send a login message.
+                                setState(stateNeedsLogin);
+                        }
+                break;
+                                
+                //MARK: stateLoginRetry
                 case stateLoginRetry:
                         if(mLoginRetryCount == 0)
                         {
@@ -1630,6 +1988,7 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
                 
+                //MARK: stateLoginRetryWait
                 case stateLoginRetryWait:
                         if(mUpdateTimer.hasExpired())
                         {
@@ -1637,6 +1996,7 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
                 
+                //MARK: stateNeedsLogin
                 case stateNeedsLogin:
                         if(!mAccountPassword.empty())
                         {
@@ -1645,16 +2005,22 @@ void LLVoiceClient::stateMachine()
                         }               
                 break;
                 
+                //MARK: stateLoggingIn
                 case stateLoggingIn:                    // waiting for account handle
                         // loginResponse() will transition from here to stateLoggedIn.
                 break;
                 
+                //MARK: stateLoggedIn
                 case stateLoggedIn:                             // account handle received
-                        // Initial kick-off of channel lookup logic
-                        parcelChanged();
 
                         notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LOGGED_IN);
 
+                        // request the current set of block rules (we'll need them when updating the friends list)
+                        accountListBlockRulesSendMessage();
+                        
+                        // request the current set of auto-accept rules
+                        accountListAutoAcceptRulesSendMessage();
+                        
                         // Set up the mute list observer if it hasn't been set up already.
                         if((!sMuteListListener_listening))
                         {
@@ -1662,13 +2028,67 @@ void LLVoiceClient::stateMachine()
                                 sMuteListListener_listening = true;
                         }
 
+                        // Set up the friends list observer if it hasn't been set up already.
+                        if(friendslist_listener == NULL)
+                        {
+                                friendslist_listener = new LLVoiceClientFriendsObserver;
+                                LLAvatarTracker::instance().addObserver(friendslist_listener);
+                        }
+                        
+                        // Set the initial state of mic mute, local speaker volume, etc.
+                        {
+                                std::ostringstream stream;
+                                
+                                buildLocalAudioUpdates(stream);
+                                
+                                if(!stream.str().empty())
+                                {
+                                        writeString(stream.str());
+                                }
+                        }
+                        
+#if USE_SESSION_GROUPS                  
+                        // create the main session group
+                        sessionGroupCreateSendMessage();
+                        
+                        setState(stateCreatingSessionGroup);
+#else
+                        // Not using session groups -- skip the stateCreatingSessionGroup state.
                         setState(stateNoChannel);
+
+                        // Initial kick-off of channel lookup logic
+                        parcelChanged();                
+#endif
+                break;
+                
+                //MARK: stateCreatingSessionGroup
+                case stateCreatingSessionGroup:
+                        if(mSessionTerminateRequested || !mVoiceEnabled)
+                        {
+                                // TODO: Question: is this the right way out of this state
+                                setState(stateSessionTerminated);
+                        }
+                        else if(!mMainSessionGroupHandle.empty())
+                        {
+                                setState(stateNoChannel);
+                                
+                                // Start looped recording (needed for "panic button" anti-griefing tool)
+                                recordingLoopStart();
+
+                                // Initial kick-off of channel lookup logic
+                                parcelChanged();                
+                        }
                 break;
                                         
+                //MARK: stateNoChannel
                 case stateNoChannel:
+                        // Do this here as well as inside sendPositionalUpdate().  
+                        // Otherwise, if you log in but don't join a proximal channel (such as when your login location has voice disabled), your friends list won't sync.
+                        sendFriendsListUpdates();
+                        
                         if(mSessionTerminateRequested || !mVoiceEnabled)
                         {
-                                // MBW -- XXX -- Is this the right way out of this state?
+                                // TODO: Question: Is this the right way out of this state?
                                 setState(stateSessionTerminated);
                         }
                         else if(mTuningMode)
@@ -1676,30 +2096,49 @@ void LLVoiceClient::stateMachine()
                                 mTuningExitState = stateNoChannel;
                                 setState(stateMicTuningStart);
                         }
-                        else if(!mNextSessionHandle.empty())
+                        else if(sessionNeedsRelog(mNextAudioSession))
                         {
-                                setState(stateSessionConnect);
+                                requestRelog();
+                                setState(stateSessionTerminated);
+                        }
+                        else if(mNextAudioSession)
+                        {                               
+                                sessionState *oldSession = mAudioSession;
+
+                                mAudioSession = mNextAudioSession;
+                                if(!mAudioSession->mReconnect)  
+                                {
+                                        mNextAudioSession = NULL;
+                                }
+                                
+                                // The old session may now need to be deleted.
+                                reapSession(oldSession);
+                                
+                                if(!mAudioSession->mHandle.empty())
+                                {
+                                        // Connect to a session by session handle
+
+                                        sessionMediaConnectSendMessage(mAudioSession);
+                                }
+                                else
+                                {
+                                        // Connect to a session by URI
+                                        sessionCreateSendMessage(mAudioSession, true, false);
+                                }
+
+                                notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINING);
+                                setState(stateJoiningSession);
                         }
-                        else if(!mNextSessionURI.empty())
+                        else if(!mSpatialSessionURI.empty())
                         {
-                                setState(stateSessionCreate);
+                                // If we're not headed elsewhere and have a spatial URI, return to spatial.
+                                switchChannel(mSpatialSessionURI, true, false, false, mSpatialSessionCredentials);
                         }
                 break;
 
-                case stateSessionCreate:
-                        sessionCreateSendMessage();
-                        notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINING);
-                        setState(stateJoiningSession);
-                break;
-                
-                case stateSessionConnect:
-                        sessionConnectSendMessage();
-                        notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINING);
-                        setState(stateJoiningSession);
-                break;
-                
+                //MARK: stateJoiningSession
                 case stateJoiningSession:               // waiting for session handle
-                        // sessionCreateResponse() will transition from here to stateSessionJoined.
+                        // joinedAudioSession() will transition from here to stateSessionJoined.
                         if(!mVoiceEnabled)
                         {
                                 // User bailed out during connect -- jump straight to teardown.
@@ -1707,30 +2146,27 @@ void LLVoiceClient::stateMachine()
                         }
                         else if(mSessionTerminateRequested)
                         {
-                                if(!mSessionHandle.empty())
+                                if(mAudioSession && !mAudioSession->mHandle.empty())
                                 {
                                         // Only allow direct exits from this state in p2p calls (for cancelling an invite).
                                         // Terminating a half-connected session on other types of calls seems to break something in the vivox gateway.
-                                        if(mSessionP2P)
+                                        if(mAudioSession->mIsP2P)
                                         {
-                                                sessionTerminateSendMessage();
+                                                sessionMediaDisconnectSendMessage(mAudioSession);
                                                 setState(stateSessionTerminated);
                                         }
                                 }
                         }
                 break;
                 
+                //MARK: stateSessionJoined
                 case stateSessionJoined:                // session handle received
-                        // MBW -- XXX -- It appears that I need to wait for BOTH the Session.Create response and the SessionStateChangeEvent with state 4
-                        //  before continuing from this state.  They can happen in either order, and if I don't wait for both, things can get stuck.
-                        // For now, the Session.Create response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined.
+                        // It appears that I need to wait for BOTH the SessionGroup.AddSession response and the SessionStateChangeEvent with state 4
+                        // before continuing from this state.  They can happen in either order, and if I don't wait for both, things can get stuck.
+                        // For now, the SessionGroup.AddSession response handler sets mSessionHandle and the SessionStateChangeEvent handler transitions to stateSessionJoined.
                         // This is a cheap way to make sure both have happened before proceeding.
-                        if(!mSessionHandle.empty())
+                        if(mAudioSession && mAudioSession->mVoiceEnabled)
                         {
-                                // Events that need to happen when a session is joined could go here.
-                                // Maybe send initial spatial data?
-                                notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINED);
-
                                 // Dirty state that may need to be sync'ed with the daemon.
                                 mPTTDirty = true;
                                 mSpeakerVolumeDirty = true;
@@ -1741,6 +2177,11 @@ void LLVoiceClient::stateMachine()
                                 // Start the throttle timer
                                 mUpdateTimer.start();
                                 mUpdateTimer.setTimerExpirySec(UPDATE_THROTTLE_SECONDS);
+
+                                // Events that need to happen when a session is joined could go here.
+                                // Maybe send initial spatial data?
+                                notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINED);
+
                         }
                         else if(!mVoiceEnabled)
                         {
@@ -1751,21 +2192,20 @@ void LLVoiceClient::stateMachine()
                         {
                                 // Only allow direct exits from this state in p2p calls (for cancelling an invite).
                                 // Terminating a half-connected session on other types of calls seems to break something in the vivox gateway.
-                                if(mSessionP2P)
+                                if(mAudioSession && mAudioSession->mIsP2P)
                                 {
-                                        sessionTerminateSendMessage();
+                                        sessionMediaDisconnectSendMessage(mAudioSession);
                                         setState(stateSessionTerminated);
                                 }
                         }
                 break;
                 
+                //MARK: stateRunning
                 case stateRunning:                              // steady state
-                        // sessionTerminateSendMessage() will transition from here to stateLeavingSession
-                        
                         // Disabling voice or disconnect requested.
                         if(!mVoiceEnabled || mSessionTerminateRequested)
                         {
-                                sessionTerminateSendMessage();
+                                leaveAudioSession();
                         }
                         else
                         {
@@ -1798,7 +2238,7 @@ void LLVoiceClient::stateMachine()
                                         }
                                 }
                                 
-                                if(mNonSpatialChannel)
+                                if(!inSpatialChannel())
                                 {
                                         // When in a non-spatial channel, never send positional updates.
                                         mSpatialCoordsDirty = false;
@@ -1811,7 +2251,7 @@ void LLVoiceClient::stateMachine()
                                 
                                 // Send an update if the ptt state has changed (which shouldn't be able to happen that often -- the user can only click so fast)
                                 // or every 10hz, whichever is sooner.
-                                if(mVolumeDirty || mPTTDirty || mSpeakerVolumeDirty || mUpdateTimer.hasExpired())
+                                if((mAudioSession && mAudioSession->mVolumeDirty) || mPTTDirty || mSpeakerVolumeDirty || mUpdateTimer.hasExpired())
                                 {
                                         mUpdateTimer.setTimerExpirySec(UPDATE_THROTTLE_SECONDS);
                                         sendPositionalUpdate();
@@ -1819,25 +2259,38 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
                 
+                //MARK: stateLeavingSession
                 case stateLeavingSession:               // waiting for terminate session response
                         // The handler for the Session.Terminate response will transition from here to stateSessionTerminated.
                 break;
 
+                //MARK: stateSessionTerminated
                 case stateSessionTerminated:
-                        // Always reset the terminate request flag when we get here.
-                        mSessionTerminateRequested = false;
                         
+                        // Must do this first, since it uses mAudioSession.
                         notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL);
+                        
+                        if(mAudioSession)
+                        {
+                                sessionState *oldSession = mAudioSession;
+
+                                mAudioSession = NULL;
+                                // We just notified status observers about this change.  Don't do it again.
+                                mAudioSessionChanged = false;
 
-                        if(mVoiceEnabled)
+                                // The old session may now need to be deleted.
+                                reapSession(oldSession);
+                        }
+                        else
                         {
-                                // SPECIAL CASE: if going back to spatial but in a parcel with an empty URI, transfer the non-spatial flag now.
-                                // This fixes the case where you come out of a group chat in a parcel with voice disabled, and get stuck unable to rejoin spatial chat thereafter.
-                                if(mNextSessionSpatial && mNextSessionURI.empty())
-                                {
-                                        mNonSpatialChannel = !mNextSessionSpatial;
-                                }
-                                
+                                LL_WARNS("Voice") << "stateSessionTerminated with NULL mAudioSession" << LL_ENDL;
+                        }
+        
+                        // Always reset the terminate request flag when we get here.
+                        mSessionTerminateRequested = false;
+
+                        if(mVoiceEnabled && !mRelogRequested)
+                        {                               
                                 // Just leaving a channel, go back to stateNoChannel (the "logged in but have no channel" state).
                                 setState(stateNoChannel);
                         }
@@ -1845,49 +2298,67 @@ void LLVoiceClient::stateMachine()
                         {
                                 // Shutting down voice, continue with disconnecting.
                                 logout();
+                                
+                                // The state machine will take it from here
+                                mRelogRequested = false;
                         }
                         
                 break;
                 
+                //MARK: stateLoggingOut
                 case stateLoggingOut:                   // waiting for logout response
                         // The handler for the Account.Logout response will transition from here to stateLoggedOut.
                 break;
+                //MARK: stateLoggedOut
                 case stateLoggedOut:                    // logout response received
                         // shut down the connector
                         connectorShutdown();
                 break;
                 
+                //MARK: stateConnectorStopping
                 case stateConnectorStopping:    // waiting for connector stop
                         // The handler for the Connector.InitiateShutdown response will transition from here to stateConnectorStopped.
                 break;
 
+                //MARK: stateConnectorStopped
                 case stateConnectorStopped:             // connector stop received
-                        // Clean up and reset everything. 
-                        closeSocket();
-                        removeAllParticipants();
-                        setState(stateDisabled);
+                        setState(stateDisableCleanup);
                 break;
 
+                //MARK: stateConnectorFailed
                 case stateConnectorFailed:
                         setState(stateConnectorFailedWaiting);
                 break;
+                //MARK: stateConnectorFailedWaiting
                 case stateConnectorFailedWaiting:
                 break;
 
+                //MARK: stateLoginFailed
                 case stateLoginFailed:
                         setState(stateLoginFailedWaiting);
                 break;
+                //MARK: stateLoginFailedWaiting
                 case stateLoginFailedWaiting:
                         // No way to recover from these.  Yet.
                 break;
 
+                //MARK: stateJoinSessionFailed
                 case stateJoinSessionFailed:
                         // Transition to error state.  Send out any notifications here.
-                        LL_WARNS("Voice") << "stateJoinSessionFailed: (" << mVivoxErrorStatusCode << "): " << mVivoxErrorStatusString << LL_ENDL;
+                        if(mAudioSession)
+                        {
+                                LL_WARNS("Voice") << "stateJoinSessionFailed: (" << mAudioSession->mErrorStatusCode << "): " << mAudioSession->mErrorStatusString << LL_ENDL;
+                        }
+                        else
+                        {
+                                LL_WARNS("Voice") << "stateJoinSessionFailed with no current session" << LL_ENDL;
+                        }
+                        
                         notifyStatusObservers(LLVoiceClientStatusObserver::ERROR_UNKNOWN);
                         setState(stateJoinSessionFailedWaiting);
                 break;
                 
+                //MARK: stateJoinSessionFailedWaiting
                 case stateJoinSessionFailedWaiting:
                         // Joining a channel failed, either due to a failed channel name -> sip url lookup or an error from the join message.
                         // Region crossings may leave this state and try the join again.
@@ -1897,22 +2368,24 @@ void LLVoiceClient::stateMachine()
                         }
                 break;
                 
+                //MARK: stateJail
                 case stateJail:
                         // We have given up.  Do nothing.
                 break;
 
-                case stateMicTuningNoLogin:
-                        // *TODO: Implement me.
-                        LL_WARNS("Voice") << "stateMicTuningNoLogin not handled" << LL_ENDL;
-                break;
         }
-
-        if(mParticipantMapChanged)
+        
+        if(mAudioSession && mAudioSession->mParticipantsChanged)
         {
-                mParticipantMapChanged = false;
-                notifyObservers();
+                mAudioSession->mParticipantsChanged = false;
+                mAudioSessionChanged = true;
+        }
+        
+        if(mAudioSessionChanged)
+        {
+                mAudioSessionChanged = false;
+                notifyParticipantObservers();
         }
-
 }
 
 void LLVoiceClient::closeSocket(void)
@@ -1930,6 +2403,9 @@ void LLVoiceClient::loginSendMessage()
                 << "<AccountName>" << mAccountName << "</AccountName>"
                 << "<AccountPassword>" << mAccountPassword << "</AccountPassword>"
                 << "<AudioSessionAnswerMode>VerifyAnswer</AudioSessionAnswerMode>"
+                << "<EnableBuddiesAndPresence>true</EnableBuddiesAndPresence>"
+                << "<BuddyManagementMode>Application</BuddyManagementMode>"
+                << "<ParticipantPropertyFrequency>5</ParticipantPropertyFrequency>"
         << "</Request>\n\n\n";
         
         writeString(stream.str());
@@ -1937,7 +2413,10 @@ void LLVoiceClient::loginSendMessage()
 
 void LLVoiceClient::logout()
 {
-        mAccountPassword = "";
+        // Ensure that we'll re-request provisioning before logging in again
+        mAccountPassword.clear();
+        mVoiceAccountServerURI.clear();
+        
         setState(stateLoggingOut);
         logoutSendMessage();
 }
@@ -1959,78 +2438,164 @@ void LLVoiceClient::logoutSendMessage()
         }
 }
 
-void LLVoiceClient::channelGetListSendMessage()
+void LLVoiceClient::accountListBlockRulesSendMessage()
 {
-        std::ostringstream stream;
-        stream
-        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.ChannelGetList.1\">"
-                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
-        << "</Request>\n\n\n";
+        if(!mAccountHandle.empty())
+        {               
+                std::ostringstream stream;
 
-        writeString(stream.str());
+                LL_DEBUGS("Voice") << "requesting block rules" << LL_ENDL;
+
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.ListBlockRules.1\">"
+                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                << "</Request>"
+                << "\n\n\n";
+
+                writeString(stream.str());
+        }
 }
 
-void LLVoiceClient::sessionCreateSendMessage()
+void LLVoiceClient::accountListAutoAcceptRulesSendMessage()
 {
-        LL_DEBUGS("Voice") << "requesting join: " << mNextSessionURI << LL_ENDL;
+        if(!mAccountHandle.empty())
+        {               
+                std::ostringstream stream;
 
-        mSessionURI = mNextSessionURI;
-        mNonSpatialChannel = !mNextSessionSpatial;
-        mSessionResetOnClose = mNextSessionResetOnClose;
-        mNextSessionResetOnClose = false;
-        if(mNextSessionNoReconnect)
+                LL_DEBUGS("Voice") << "requesting auto-accept rules" << LL_ENDL;
+
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.ListAutoAcceptRules.1\">"
+                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                << "</Request>"
+                << "\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::sessionGroupCreateSendMessage()
+{
+        if(!mAccountHandle.empty())
+        {               
+                std::ostringstream stream;
+
+                LL_DEBUGS("Voice") << "creating session group" << LL_ENDL;
+
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.Create.1\">"
+                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                        << "<Type>Normal</Type>"
+                << "</Request>"
+                << "\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::sessionCreateSendMessage(sessionState *session, bool startAudio, bool startText)
+{
+        LL_DEBUGS("Voice") << "requesting create: " << session->mSIPURI << LL_ENDL;
+        
+        session->mCreateInProgress = true;
+        if(startAudio)
         {
-                // Clear the stashed URI so it can't reconnect
-                mNextSessionURI.clear();
+                session->mMediaConnectInProgress = true;
         }
-        // Only p2p sessions are created with "no reconnect".
-        mSessionP2P = mNextSessionNoReconnect;
 
         std::ostringstream stream;
         stream
-        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Create.1\">"
+        << "<Request requestId=\"" << session->mSIPURI << "\" action=\"Session.Create.1\">"
                 << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
-                << "<URI>" << mSessionURI << "</URI>";
+                << "<URI>" << session->mSIPURI << "</URI>";
 
         static const std::string allowed_chars =
                                 "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
                                 "0123456789"
                                 "-._~";
 
-        if(!mNextSessionHash.empty())
+        if(!session->mHash.empty())
         {
                 stream
-                        << "<Password>" << LLURI::escape(mNextSessionHash, allowed_chars) << "</Password>"
+                        << "<Password>" << LLURI::escape(session->mHash, allowed_chars) << "</Password>"
                         << "<PasswordHashAlgorithm>SHA1UserName</PasswordHashAlgorithm>";
         }
         
         stream
+                << "<ConnectAudio>" << (startAudio?"true":"false") << "</ConnectAudio>"
+                << "<ConnectText>" << (startText?"true":"false") << "</ConnectText>"
                 << "<Name>" << mChannelName << "</Name>"
         << "</Request>\n\n\n";
         writeString(stream.str());
 }
 
-void LLVoiceClient::sessionConnectSendMessage()
+void LLVoiceClient::sessionGroupAddSessionSendMessage(sessionState *session, bool startAudio, bool startText)
 {
-        LL_DEBUGS("Voice") << "connecting to session handle: " << mNextSessionHandle << LL_ENDL;
+        LL_DEBUGS("Voice") << "requesting create: " << session->mSIPURI << LL_ENDL;
+        
+        session->mCreateInProgress = true;
+        if(startAudio)
+        {
+                session->mMediaConnectInProgress = true;
+        }
+        
+        std::string password;
+        if(!session->mHash.empty())
+        {
+                static const std::string allowed_chars =
+                                        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+                                        "0123456789"
+                                        "-._~"
+                                        ;
+                password = LLURI::escape(session->mHash, allowed_chars);
+        }
+
+        std::ostringstream stream;
+        stream
+        << "<Request requestId=\"" << session->mSIPURI << "\" action=\"SessionGroup.AddSession.1\">"
+                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
+                << "<URI>" << session->mSIPURI << "</URI>"
+                << "<Name>" << mChannelName << "</Name>"
+                << "<ConnectAudio>" << (startAudio?"true":"false") << "</ConnectAudio>"
+                << "<ConnectText>" << (startText?"true":"false") << "</ConnectText>"
+                << "<Password>" << password << "</Password>"
+                << "<PasswordHashAlgorithm>SHA1UserName</PasswordHashAlgorithm>"
+        << "</Request>\n\n\n"
+        ;
         
-        mSessionHandle = mNextSessionHandle;
-        mSessionURI = mNextP2PSessionURI;
-        mNextSessionHandle.clear();             // never want to re-use these.
-        mNextP2PSessionURI.clear();
-        mNonSpatialChannel = !mNextSessionSpatial;
-        mSessionResetOnClose = mNextSessionResetOnClose;
-        mNextSessionResetOnClose = false;
-        // Joining by session ID is only used to answer p2p invitations, so we know this is a p2p session.
-        mSessionP2P = true;
+        writeString(stream.str());
+}
+
+void LLVoiceClient::sessionMediaConnectSendMessage(sessionState *session)
+{
+        LL_DEBUGS("Voice") << "connecting audio to session handle: " << session->mHandle << LL_ENDL;
+
+        session->mMediaConnectInProgress = true;
         
         std::ostringstream stream;
+
+        stream
+        << "<Request requestId=\"" << session->mHandle << "\" action=\"Session.MediaConnect.1\">"
+                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
+                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
+                << "<Media>Audio</Media>"
+        << "</Request>\n\n\n";
+
+        writeString(stream.str());
+}
+
+void LLVoiceClient::sessionTextConnectSendMessage(sessionState *session)
+{
+        LL_DEBUGS("Voice") << "connecting text to session handle: " << session->mHandle << LL_ENDL;
         
+        std::ostringstream stream;
+
         stream
-        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Connect.1\">"
-                << "<SessionHandle>" << mSessionHandle << "</SessionHandle>"
-                << "<AudioMedia>default</AudioMedia>"
+        << "<Request requestId=\"" << session->mHandle << "\" action=\"Session.TextConnect.1\">"
+                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
+                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
         << "</Request>\n\n\n";
+
         writeString(stream.str());
 }
 
@@ -2039,52 +2604,112 @@ void LLVoiceClient::sessionTerminate()
         mSessionTerminateRequested = true;
 }
 
-void LLVoiceClient::sessionTerminateSendMessage()
+void LLVoiceClient::requestRelog()
 {
-        LL_DEBUGS("Voice") << "leaving session: " << mSessionURI << LL_ENDL;
+        mSessionTerminateRequested = true;
+        mRelogRequested = true;
+}
 
-        switch(getState())
+
+void LLVoiceClient::leaveAudioSession()
+{
+        if(mAudioSession)
         {
-                case stateNoChannel:
-                        // In this case, we want to pretend the join failed so our state machine doesn't get stuck.
-                        // Skip the join failed transition state so we don't send out error notifications.
-                        setState(stateJoinSessionFailedWaiting);
-                break;
-                case stateJoiningSession:
-                case stateSessionJoined:
-                case stateRunning:
-                        if(!mSessionHandle.empty())
-                        {
-                                sessionTerminateByHandle(mSessionHandle);
-                                setState(stateLeavingSession);
-                        }
-                        else
-                        {
-                                LL_WARNS("Voice") << "called with no session handle" << LL_ENDL;        
+                LL_DEBUGS("Voice") << "leaving session: " << mAudioSession->mSIPURI << LL_ENDL;
+
+                switch(getState())
+                {
+                        case stateNoChannel:
+                                // In this case, we want to pretend the join failed so our state machine doesn't get stuck.
+                                // Skip the join failed transition state so we don't send out error notifications.
+                                setState(stateJoinSessionFailedWaiting);
+                        break;
+                        case stateJoiningSession:
+                        case stateSessionJoined:
+                        case stateRunning:
+                                if(!mAudioSession->mHandle.empty())
+                                {
+
+#if RECORD_EVERYTHING
+                                        // HACK: for testing only
+                                        // Save looped recording
+                                        std::string savepath("/tmp/vivoxrecording");
+                                        {
+                                                time_t now = time(NULL);
+                                                const size_t BUF_SIZE = 64;
+                                                char time_str[BUF_SIZE];        /* Flawfinder: ignore */
+                                                
+                                                strftime(time_str, BUF_SIZE, "%Y-%m-%dT%H:%M:%SZ", gmtime(&now));
+                                                savepath += time_str;
+                                        }
+                                        recordingLoopSave(savepath);
+#endif
+
+                                        sessionMediaDisconnectSendMessage(mAudioSession);
+                                        setState(stateLeavingSession);
+                                }
+                                else
+                                {
+                                        LL_WARNS("Voice") << "called with no session handle" << LL_ENDL;        
+                                        setState(stateSessionTerminated);
+                                }
+                        break;
+                        case stateJoinSessionFailed:
+                        case stateJoinSessionFailedWaiting:
                                 setState(stateSessionTerminated);
-                        }
-                break;
-                case stateJoinSessionFailed:
-                case stateJoinSessionFailedWaiting:
-                        setState(stateSessionTerminated);
-                break;
-                
-                default:
-                        LL_WARNS("Voice") << "called from unknown state" << LL_ENDL;
-                break;
+                        break;
+                        
+                        default:
+                                LL_WARNS("Voice") << "called from unknown state" << LL_ENDL;
+                        break;
+                }
+        }
+        else
+        {
+                LL_WARNS("Voice") << "called with no active session" << LL_ENDL;
+                setState(stateSessionTerminated);
         }
 }
 
-void LLVoiceClient::sessionTerminateByHandle(std::string &sessionHandle)
+void LLVoiceClient::sessionTerminateSendMessage(sessionState *session)
 {
-        LL_DEBUGS("Voice") << "Sending Session.Terminate with handle " << sessionHandle << LL_ENDL;     
-
         std::ostringstream stream;
+        
+        LL_DEBUGS("Voice") << "Sending Session.Terminate with handle " << session->mHandle << LL_ENDL;  
         stream
         << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Terminate.1\">"
-                << "<SessionHandle>" << sessionHandle << "</SessionHandle>"
-        << "</Request>"
-        << "\n\n\n";
+                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
+        << "</Request>\n\n\n";
+        
+        writeString(stream.str());
+}
+
+void LLVoiceClient::sessionMediaDisconnectSendMessage(sessionState *session)
+{
+        std::ostringstream stream;
+        
+        LL_DEBUGS("Voice") << "Sending Session.MediaDisconnect with handle " << session->mHandle << LL_ENDL;    
+        stream
+        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.MediaDisconnect.1\">"
+                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
+                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
+                << "<Media>Audio</Media>"
+        << "</Request>\n\n\n";
+        
+        writeString(stream.str());
+        
+}
+
+void LLVoiceClient::sessionTextDisconnectSendMessage(sessionState *session)
+{
+        std::ostringstream stream;
+        
+        LL_DEBUGS("Voice") << "Sending Session.TextDisconnect with handle " << session->mHandle << LL_ENDL;     
+        stream
+        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.TextDisconnect.1\">"
+                << "<SessionGroupHandle>" << session->mGroupHandle << "</SessionGroupHandle>"
+                << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
+        << "</Request>\n\n\n";
         
         writeString(stream.str());
 }
@@ -2111,14 +2736,12 @@ void LLVoiceClient::getRenderDevicesSendMessage()
 
 void LLVoiceClient::clearCaptureDevices()
 {
-        // MBW -- XXX -- do something here
         LL_DEBUGS("Voice") << "called" << LL_ENDL;
         mCaptureDevices.clear();
 }
 
 void LLVoiceClient::addCaptureDevice(const std::string& name)
 {
-        // MBW -- XXX -- do something here
         LL_DEBUGS("Voice") << name << LL_ENDL;
 
         mCaptureDevices.push_back(name);
@@ -2150,15 +2773,13 @@ void LLVoiceClient::setCaptureDevice(const std::string& name)
 }
 
 void LLVoiceClient::clearRenderDevices()
-{
-        // MBW -- XXX -- do something here
+{       
         LL_DEBUGS("Voice") << "called" << LL_ENDL;
         mRenderDevices.clear();
 }
 
 void LLVoiceClient::addRenderDevice(const std::string& name)
 {
-        // MBW -- XXX -- do something here
         LL_DEBUGS("Voice") << name << LL_ENDL;
         mRenderDevices.push_back(name);
 }
@@ -2270,29 +2891,22 @@ void LLVoiceClient::tuningCaptureStopSendMessage()
 
 void LLVoiceClient::tuningSetMicVolume(float volume)
 {
-        int scaledVolume = ((int)(volume * 100.0f)) - 100;
-        if(scaledVolume != mTuningMicVolume)
+        int scaled_volume = scale_mic_volume(volume);
+
+        if(scaled_volume != mTuningMicVolume)
         {
-                mTuningMicVolume = scaledVolume;
+                mTuningMicVolume = scaled_volume;
                 mTuningMicVolumeDirty = true;
         }
 }
 
 void LLVoiceClient::tuningSetSpeakerVolume(float volume)
 {
-        // incoming volume has the range [0.0 ... 1.0], with 0.5 as the default.
-        // Map it as follows: 0.0 -> -100, 0.5 -> 24, 1.0 -> 50
-        
-        volume -= 0.5f;         // offset volume to the range [-0.5 ... 0.5], with 0 at the default.
-        int scaledVolume = 24;  // offset scaledVolume by its default level
-        if(volume < 0.0f)
-                scaledVolume += ((int)(volume * 248.0f));       // (24 - (-100)) * 2
-        else
-                scaledVolume += ((int)(volume * 52.0f));        // (50 - 24) * 2
+        int scaled_volume = scale_speaker_volume(volume);       
 
-        if(scaledVolume != mTuningSpeakerVolume)
+        if(scaled_volume != mTuningSpeakerVolume)
         {
-                mTuningSpeakerVolume = scaledVolume;
+                mTuningSpeakerVolume = scaled_volume;
                 mTuningSpeakerVolumeDirty = true;
         }
 }
@@ -2331,67 +2945,193 @@ void LLVoiceClient::daemonDied()
         // The daemon died, so the connection is gone.  Reset everything and start over.
         LL_WARNS("Voice") << "Connection to vivox daemon lost.  Resetting state."<< LL_ENDL;
 
-        closeSocket();
-        removeAllParticipants();
-        
         // Try to relaunch the daemon
-        setState(stateDisabled);
+        setState(stateDisableCleanup);
 }
 
 void LLVoiceClient::giveUp()
 {
         // All has failed.  Clean up and stop trying.
         closeSocket();
-        removeAllParticipants();
+        deleteAllSessions();
+        deleteAllBuddies();
         
         setState(stateJail);
 }
 
+static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
+{
+        F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the  new position and velocity
+        F64 npos[3];
+        
+        // The original XML command was sent like this:
+        /*
+                        << "<Position>"
+                                << "<X>" << pos[VX] << "</X>"
+                                << "<Y>" << pos[VZ] << "</Y>"
+                                << "<Z>" << pos[VY] << "</Z>"
+                        << "</Position>"
+                        << "<Velocity>"
+                                << "<X>" << mAvatarVelocity[VX] << "</X>"
+                                << "<Y>" << mAvatarVelocity[VZ] << "</Y>"
+                                << "<Z>" << mAvatarVelocity[VY] << "</Z>"
+                        << "</Velocity>"
+                        << "<AtOrientation>"
+                                << "<X>" << l.mV[VX] << "</X>"
+                                << "<Y>" << u.mV[VX] << "</Y>"
+                                << "<Z>" << a.mV[VX] << "</Z>"
+                        << "</AtOrientation>"
+                        << "<UpOrientation>"
+                                << "<X>" << l.mV[VZ] << "</X>"
+                                << "<Y>" << u.mV[VY] << "</Y>"
+                                << "<Z>" << a.mV[VZ] << "</Z>"
+                        << "</UpOrientation>"
+                        << "<LeftOrientation>"
+                                << "<X>" << l.mV [VY] << "</X>"
+                                << "<Y>" << u.mV [VZ] << "</Y>"
+                                << "<Z>" << a.mV [VY] << "</Z>"
+                        << "</LeftOrientation>";
+        */
+
+#if 1
+        // This was the original transform done when building the XML command
+        nat[0] = left.mV[VX];
+        nat[1] = up.mV[VX];
+        nat[2] = at.mV[VX];
+
+        nup[0] = left.mV[VZ];
+        nup[1] = up.mV[VY];
+        nup[2] = at.mV[VZ];
+
+        nl[0] = left.mV[VY];
+        nl[1] = up.mV[VZ];
+        nl[2] = at.mV[VY];
+
+        npos[0] = pos.mdV[VX];
+        npos[1] = pos.mdV[VZ];
+        npos[2] = pos.mdV[VY];
+
+        nvel[0] = vel.mV[VX];
+        nvel[1] = vel.mV[VZ];
+        nvel[2] = vel.mV[VY];
+
+        for(int i=0;i<3;++i) {
+                at.mV[i] = nat[i];
+                up.mV[i] = nup[i];
+                left.mV[i] = nl[i];
+                pos.mdV[i] = npos[i];
+        }
+        
+        // This was the original transform done in the SDK
+        nat[0] = at.mV[2];
+        nat[1] = 0; // y component of at vector is always 0, this was up[2]
+        nat[2] = -1 * left.mV[2];
+
+        // We override whatever the application gives us
+        nup[0] = 0; // x component of up vector is always 0
+        nup[1] = 1; // y component of up vector is always 1
+        nup[2] = 0; // z component of up vector is always 0
+
+        nl[0] = at.mV[0];
+        nl[1] = 0;  // y component of left vector is always zero, this was up[0]
+        nl[2] = -1 * left.mV[0];
+
+        npos[2] = pos.mdV[2] * -1.0;
+        npos[1] = pos.mdV[1];
+        npos[0] = pos.mdV[0];
+
+        for(int i=0;i<3;++i) {
+                at.mV[i] = nat[i];
+                up.mV[i] = nup[i];
+                left.mV[i] = nl[i];
+                pos.mdV[i] = npos[i];
+        }
+#else
+        // This is the compose of the two transforms (at least, that's what I'm trying for)
+        nat[0] = at.mV[VX];
+        nat[1] = 0; // y component of at vector is always 0, this was up[2]
+        nat[2] = -1 * up.mV[VZ];
+
+        // We override whatever the application gives us
+        nup[0] = 0; // x component of up vector is always 0
+        nup[1] = 1; // y component of up vector is always 1
+        nup[2] = 0; // z component of up vector is always 0
+
+        nl[0] = left.mV[VX];
+        nl[1] = 0;  // y component of left vector is always zero, this was up[0]
+        nl[2] = -1 * left.mV[VY];
+
+        npos[0] = pos.mdV[VX];
+        npos[1] = pos.mdV[VZ];
+        npos[2] = pos.mdV[VY] * -1.0;
+
+        nvel[0] = vel.mV[VX];
+        nvel[1] = vel.mV[VZ];
+        nvel[2] = vel.mV[VY];
+
+        for(int i=0;i<3;++i) {
+                at.mV[i] = nat[i];
+                up.mV[i] = nup[i];
+                left.mV[i] = nl[i];
+                pos.mdV[i] = npos[i];
+        }
+        
+#endif
+}
+
 void LLVoiceClient::sendPositionalUpdate(void)
 {       
         std::ostringstream stream;
         
         if(mSpatialCoordsDirty)
         {
-                LLVector3 l, u, a;
+                LLVector3 l, u, a, vel;
+                LLVector3d pos;
+
+                mSpatialCoordsDirty = false;
                 
                 // Always send both speaker and listener positions together.
                 stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.Set3DPosition.1\">"               
-                        << "<SessionHandle>" << mSessionHandle << "</SessionHandle>";
+                        << "<SessionHandle>" << getAudioSessionHandle() << "</SessionHandle>";
                 
                 stream << "<SpeakerPosition>";
 
+//              LL_DEBUGS("Voice") << "Sending speaker position " << mAvatarPosition << LL_ENDL;
                 l = mAvatarRot.getLeftRow();
                 u = mAvatarRot.getUpRow();
                 a = mAvatarRot.getFwdRow();
-                        
-                LL_DEBUGS("Voice") << "Sending speaker position " << mAvatarPosition << LL_ENDL;
+                pos = mAvatarPosition;
+                vel = mAvatarVelocity;
 
+                // SLIM SDK: the old SDK was doing a transform on the passed coordinates that the new one doesn't do anymore.
+                // The old transform is replicated by this function.
+                oldSDKTransform(l, u, a, pos, vel);
+                
                 stream 
                         << "<Position>"
-                                << "<X>" << mAvatarPosition[VX] << "</X>"
-                                << "<Y>" << mAvatarPosition[VZ] << "</Y>"
-                                << "<Z>" << mAvatarPosition[VY] << "</Z>"
+                                << "<X>" << pos.mdV[VX] << "</X>"
+                                << "<Y>" << pos.mdV[VY] << "</Y>"
+                                << "<Z>" << pos.mdV[VZ] << "</Z>"
                         << "</Position>"
                         << "<Velocity>"
-                                << "<X>" << mAvatarVelocity[VX] << "</X>"
-                                << "<Y>" << mAvatarVelocity[VZ] << "</Y>"
-                                << "<Z>" << mAvatarVelocity[VY] << "</Z>"
+                                << "<X>" << vel.mV[VX] << "</X>"
+                                << "<Y>" << vel.mV[VY] << "</Y>"
+                                << "<Z>" << vel.mV[VZ] << "</Z>"
                         << "</Velocity>"
                         << "<AtOrientation>"
-                                << "<X>" << l.mV[VX] << "</X>"
-                                << "<Y>" << u.mV[VX] << "</Y>"
-                                << "<Z>" << a.mV[VX] << "</Z>"
+                                << "<X>" << a.mV[VX] << "</X>"
+                                << "<Y>" << a.mV[VY] << "</Y>"
+                                << "<Z>" << a.mV[VZ] << "</Z>"
                         << "</AtOrientation>"
                         << "<UpOrientation>"
-                                << "<X>" << l.mV[VZ] << "</X>"
+                                << "<X>" << u.mV[VX] << "</X>"
                                 << "<Y>" << u.mV[VY] << "</Y>"
-                                << "<Z>" << a.mV[VZ] << "</Z>"
+                                << "<Z>" << u.mV[VZ] << "</Z>"
                         << "</UpOrientation>"
                         << "<LeftOrientation>"
-                                << "<X>" << l.mV [VY] << "</X>"
-                                << "<Y>" << u.mV [VZ] << "</Y>"
-                                << "<Z>" << a.mV [VY] << "</Z>"
+                                << "<X>" << l.mV [VX] << "</X>"
+                                << "<Y>" << l.mV [VY] << "</Y>"
+                                << "<Z>" << l.mV [VZ] << "</Z>"
                         << "</LeftOrientation>";
 
                 stream << "</SpeakerPosition>";
@@ -2427,43 +3167,158 @@ void LLVoiceClient::sendPositionalUpdate(void)
                 l = earRot.getLeftRow();
                 u = earRot.getUpRow();
                 a = earRot.getFwdRow();
+                pos = earPosition;
+                vel = earVelocity;
 
-                LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
-
+//              LL_DEBUGS("Voice") << "Sending listener position " << earPosition << LL_ENDL;
+                
+                oldSDKTransform(l, u, a, pos, vel);
+                
                 stream 
                         << "<Position>"
-                                << "<X>" << earPosition[VX] << "</X>"
-                                << "<Y>" << earPosition[VZ] << "</Y>"
-                                << "<Z>" << earPosition[VY] << "</Z>"
+                                << "<X>" << pos.mdV[VX] << "</X>"
+                                << "<Y>" << pos.mdV[VY] << "</Y>"
+                                << "<Z>" << pos.mdV[VZ] << "</Z>"
                         << "</Position>"
                         << "<Velocity>"
-                                << "<X>" << earVelocity[VX] << "</X>"
-                                << "<Y>" << earVelocity[VZ] << "</Y>"
-                                << "<Z>" << earVelocity[VY] << "</Z>"
+                                << "<X>" << vel.mV[VX] << "</X>"
+                                << "<Y>" << vel.mV[VY] << "</Y>"
+                                << "<Z>" << vel.mV[VZ] << "</Z>"
                         << "</Velocity>"
                         << "<AtOrientation>"
-                                << "<X>" << l.mV[VX] << "</X>"
-                                << "<Y>" << u.mV[VX] << "</Y>"
-                                << "<Z>" << a.mV[VX] << "</Z>"
+                                << "<X>" << a.mV[VX] << "</X>"
+                                << "<Y>" << a.mV[VY] << "</Y>"
+                                << "<Z>" << a.mV[VZ] << "</Z>"
                         << "</AtOrientation>"
                         << "<UpOrientation>"
-                                << "<X>" << l.mV[VZ] << "</X>"
+                                << "<X>" << u.mV[VX] << "</X>"
                                 << "<Y>" << u.mV[VY] << "</Y>"
-                                << "<Z>" << a.mV[VZ] << "</Z>"
+                                << "<Z>" << u.mV[VZ] << "</Z>"
                         << "</UpOrientation>"
                         << "<LeftOrientation>"
-                                << "<X>" << l.mV [VY] << "</X>"
-                                << "<Y>" << u.mV [VZ] << "</Y>"
-                                << "<Z>" << a.mV [VY] << "</Z>"
+                                << "<X>" << l.mV [VX] << "</X>"
+                                << "<Y>" << l.mV [VY] << "</Y>"
+                                << "<Z>" << l.mV [VZ] << "</Z>"
                         << "</LeftOrientation>";
 
+
                 stream << "</ListenerPosition>";
 
                 stream << "</Request>\n\n\n";
         }       
+        
+        if(mAudioSession && mAudioSession->mVolumeDirty)
+        {
+                participantMap::iterator iter = mAudioSession->mParticipantsByURI.begin();
+
+                mAudioSession->mVolumeDirty = false;
+                
+                for(; iter != mAudioSession->mParticipantsByURI.end(); iter++)
+                {
+                        participantState *p = iter->second;
+                        
+                        if(p->mVolumeDirty)
+                        {
+                                // Can't set volume/mute for yourself
+                                if(!p->mIsSelf)
+                                {
+                                        int volume = p->mUserVolume;
+                                        bool mute = p->mOnMuteList;
+                                                                                
+                                        // SLIM SDK: scale volume from 0-400 (with 100 as "normal") to 0-100 (with 56 as "normal")
+                                        if(volume < 100)
+                                                volume = (volume * 56) / 100;
+                                        else
+                                                volume = (((volume - 100) * (100 - 56)) / 300) + 56;
+
+                                        if(mute)
+                                        {
+                                                // SetParticipantMuteForMe doesn't work in p2p sessions.
+                                                // If we want the user to be muted, set their volume to 0 as well.
+                                                // This isn't perfect, but it will at least reduce their volume to a minimum.
+                                                volume = 0;
+                                        }
+                                        
+                                        if(volume == 0)
+                                                mute = true;
+
+                                        LL_DEBUGS("Voice") << "Setting volume/mute for avatar " << p->mAvatarID << " to " << volume << (mute?"/true":"/false") << LL_ENDL;
+                                        
+                                        // SLIM SDK: Send both volume and mute commands.
+                                        
+                                        // Send a "volume for me" command for the user.
+                                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.SetParticipantVolumeForMe.1\">"
+                                                << "<SessionHandle>" << getAudioSessionHandle() << "</SessionHandle>"
+                                                << "<ParticipantURI>" << p->mURI << "</ParticipantURI>"
+                                                << "<Volume>" << volume << "</Volume>"
+                                                << "</Request>\n\n\n";
+
+                                        // Send a "mute for me" command for the user
+                                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.SetParticipantMuteForMe.1\">"
+                                                << "<SessionHandle>" << getAudioSessionHandle() << "</SessionHandle>"
+                                                << "<ParticipantURI>" << p->mURI << "</ParticipantURI>"
+                                                << "<Mute>" << (mute?"1":"0") << "</Mute>"
+                                                << "</Request>\n\n\n";
+                                }
+                                
+                                p->mVolumeDirty = false;
+                        }
+                }
+        }
+                        
+        buildLocalAudioUpdates(stream);
+        
+        if(!stream.str().empty())
+        {
+                writeString(stream.str());
+        }
+        
+        // Friends list updates can be huge, especially on the first voice login of an account with lots of friends.
+        // Batching them all together can choke SLVoice, so send them in separate writes.
+        sendFriendsListUpdates();
+}
+
+void LLVoiceClient::buildSetCaptureDevice(std::ostringstream &stream)
+{
+        if(mCaptureDeviceDirty)
+        {
+                LL_DEBUGS("Voice") << "Setting input device = \"" << mCaptureDevice << "\"" << LL_ENDL;
+        
+                stream 
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.SetCaptureDevice.1\">"
+                        << "<CaptureDeviceSpecifier>" << mCaptureDevice << "</CaptureDeviceSpecifier>"
+                << "</Request>"
+                << "\n\n\n";
+                
+                mCaptureDeviceDirty = false;
+        }
+}
+
+void LLVoiceClient::buildSetRenderDevice(std::ostringstream &stream)
+{
+        if(mRenderDeviceDirty)
+        {
+                LL_DEBUGS("Voice") << "Setting output device = \"" << mRenderDevice << "\"" << LL_ENDL;
+
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.SetRenderDevice.1\">"
+                        << "<RenderDeviceSpecifier>" << mRenderDevice << "</RenderDeviceSpecifier>"
+                << "</Request>"
+                << "\n\n\n";
+                mRenderDeviceDirty = false;
+        }
+}
+
+void LLVoiceClient::buildLocalAudioUpdates(std::ostringstream &stream)
+{
+        buildSetCaptureDevice(stream);
+
+        buildSetRenderDevice(stream);
 
         if(mPTTDirty)
         {
+                mPTTDirty = false;
+
                 // Send a local mute command.
                 // NOTE that the state of "PTT" is the inverse of "local mute".
                 //   (i.e. when PTT is true, we send a mute command with "false", and vice versa)
@@ -2474,119 +3329,337 @@ void LLVoiceClient::sendPositionalUpdate(void)
                         << "<ConnectorHandle>" << mConnectorHandle << "</ConnectorHandle>"
                         << "<Value>" << (mPTT?"false":"true") << "</Value>"
                         << "</Request>\n\n\n";
-
-        }
-        
-        if(mVolumeDirty)
-        {
-                participantMap::iterator iter = mParticipantMap.begin();
                 
-                for(; iter != mParticipantMap.end(); iter++)
-                {
-                        participantState *p = iter->second;
-                        
-                        if(p->mVolumeDirty)
-                        {
-                                int volume = p->mOnMuteList?0:p->mUserVolume;
-                                
-                                LL_INFOS("Voice") << "Setting volume for avatar " << p->mAvatarID << " to " << volume << LL_ENDL;
-                                
-                                // Send a mute/unumte command for the user (actually "volume for me").
-                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.SetParticipantVolumeForMe.1\">"
-                                        << "<SessionHandle>" << mSessionHandle << "</SessionHandle>"
-                                        << "<ParticipantURI>" << p->mURI << "</ParticipantURI>"
-                                        << "<Volume>" << volume << "</Volume>"
-                                        << "</Request>\n\n\n";
-
-                                p->mVolumeDirty = false;
-                        }
-                }
         }
-        
+
         if(mSpeakerMuteDirty)
         {
-                const char *muteval = ((mSpeakerVolume == -100)?"true":"false");
+                const char *muteval = ((mSpeakerVolume == 0)?"true":"false");
+
+                mSpeakerMuteDirty = false;
+
                 LL_INFOS("Voice") << "Setting speaker mute to " << muteval  << LL_ENDL;
                 
                 stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.MuteLocalSpeaker.1\">"
                         << "<ConnectorHandle>" << mConnectorHandle << "</ConnectorHandle>"
                         << "<Value>" << muteval << "</Value>"
-                        << "</Request>\n\n\n";          
+                        << "</Request>\n\n\n";  
+                
         }
         
         if(mSpeakerVolumeDirty)
         {
+                mSpeakerVolumeDirty = false;
+
                 LL_INFOS("Voice") << "Setting speaker volume to " << mSpeakerVolume  << LL_ENDL;
 
                 stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.SetLocalSpeakerVolume.1\">"
                         << "<ConnectorHandle>" << mConnectorHandle << "</ConnectorHandle>"
                         << "<Value>" << mSpeakerVolume << "</Value>"
-                        << "</Request>\n\n\n";          
+                        << "</Request>\n\n\n";
+                        
         }
         
         if(mMicVolumeDirty)
         {
+                mMicVolumeDirty = false;
+
                 LL_INFOS("Voice") << "Setting mic volume to " << mMicVolume  << LL_ENDL;
 
                 stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Connector.SetLocalMicVolume.1\">"
                         << "<ConnectorHandle>" << mConnectorHandle << "</ConnectorHandle>"
                         << "<Value>" << mMicVolume << "</Value>"
-                        << "</Request>\n\n\n";          
+                        << "</Request>\n\n\n";                          
         }
 
         
-        // MBW -- XXX -- Maybe check to make sure the capture/render devices are in the current list here?
-        if(mCaptureDeviceDirty)
-        {
-                buildSetCaptureDevice(stream);
-        }
+}
 
-        if(mRenderDeviceDirty)
+void LLVoiceClient::checkFriend(const LLUUID& id)
+{
+        std::string name;
+        buddyListEntry *buddy = findBuddy(id);
+
+        // Make sure we don't add a name before it's been looked up.
+        if(gCacheName->getFullName(id, name))
         {
-                buildSetRenderDevice(stream);
+
+                const LLRelationship* relationInfo = LLAvatarTracker::instance().getBuddyInfo(id);
+                bool canSeeMeOnline = false;
+                if(relationInfo && relationInfo->isRightGrantedTo(LLRelationship::GRANT_ONLINE_STATUS))
+                        canSeeMeOnline = true;
+                
+                // When we get here, mNeedsSend is true and mInSLFriends is false.  Change them as necessary.
+                
+                if(buddy)
+                {
+                        // This buddy is already in both lists.
+
+                        if(name != buddy->mDisplayName)
+                        {
+                                // The buddy is in the list with the wrong name.  Update it with the correct name.
+                                LL_WARNS("Voice") << "Buddy " << id << " has wrong name (\"" << buddy->mDisplayName << "\" should be \"" << name << "\"), updating."<< LL_ENDL;
+                                buddy->mDisplayName = name;
+                                buddy->mNeedsNameUpdate = true;         // This will cause the buddy to be resent.
+                        }
+                }
+                else
+                {
+                        // This buddy was not in the vivox list, needs to be added.
+                        buddy = addBuddy(sipURIFromID(id), name);
+                        buddy->mUUID = id;
+                }
+                
+                // In all the above cases, the buddy is in the SL friends list (which is how we got here).
+                buddy->mInSLFriends = true;
+                buddy->mCanSeeMeOnline = canSeeMeOnline;
+                buddy->mNameResolved = true;
+                
         }
-        
-        mSpatialCoordsDirty = false;
-        mPTTDirty = false;
-        mVolumeDirty = false;
-        mSpeakerVolumeDirty = false;
-        mMicVolumeDirty = false;
-        mSpeakerMuteDirty = false;
-        mCaptureDeviceDirty = false;
-        mRenderDeviceDirty = false;
-        
-        if(!stream.str().empty())
+        else
         {
-                writeString(stream.str());
+                // This name hasn't been looked up yet.  Don't do anything with this buddy list entry until it has.
+                if(buddy)
+                {
+                        buddy->mNameResolved = false;
+                }
+                
+                // Initiate a lookup.
+                // The "lookup completed" callback will ensure that the friends list is rechecked after it completes.
+                lookupName(id);
         }
 }
 
-void LLVoiceClient::buildSetCaptureDevice(std::ostringstream &stream)
+void LLVoiceClient::clearAllLists()
 {
-        LL_DEBUGS("Voice") << "Setting input device = \"" << mCaptureDevice << "\"" << LL_ENDL;
+        // FOR TESTING ONLY
         
-        stream 
-        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.SetCaptureDevice.1\">"
-                << "<CaptureDeviceSpecifier>" << mCaptureDevice << "</CaptureDeviceSpecifier>"
-        << "</Request>"
-        << "\n\n\n";
+        // This will send the necessary commands to delete ALL buddies, autoaccept rules, and block rules SLVoice tells us about.
+        buddyListMap::iterator buddy_it;
+        for(buddy_it = mBuddyListMap.begin(); buddy_it != mBuddyListMap.end();)
+        {
+                buddyListEntry *buddy = buddy_it->second;
+                buddy_it++;
+                
+                std::ostringstream stream;
+
+                if(buddy->mInVivoxBuddies)
+                {
+                        // delete this entry from the vivox buddy list
+                        buddy->mInVivoxBuddies = false;
+                        LL_DEBUGS("Voice") << "delete " << buddy->mURI << " (" << buddy->mDisplayName << ")" << LL_ENDL;
+                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.BuddyDelete.1\">"
+                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                << "<BuddyURI>" << buddy->mURI << "</BuddyURI>"
+                                << "</Request>\n\n\n";          
+                }
+
+                if(buddy->mHasBlockListEntry)
+                {
+                        // Delete the associated block list entry (so the block list doesn't fill up with junk)
+                        buddy->mHasBlockListEntry = false;
+                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteBlockRule.1\">"
+                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                << "<BlockMask>" << buddy->mURI << "</BlockMask>"
+                                << "</Request>\n\n\n";                                                          
+                }
+                if(buddy->mHasAutoAcceptListEntry)
+                {
+                        // Delete the associated auto-accept list entry (so the auto-accept list doesn't fill up with junk)
+                        buddy->mHasAutoAcceptListEntry = false;
+                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteAutoAcceptRule.1\">"
+                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                << "<AutoAcceptMask>" << buddy->mURI << "</AutoAcceptMask>"
+                                << "</Request>\n\n\n";
+                }
+
+                writeString(stream.str());
+
+        }
 }
 
-void LLVoiceClient::buildSetRenderDevice(std::ostringstream &stream)
+void LLVoiceClient::sendFriendsListUpdates()
 {
-        LL_DEBUGS("Voice") << "Setting output device = \"" << mRenderDevice << "\"" << LL_ENDL;
+        if(mBuddyListMapPopulated && mBlockRulesListReceived && mAutoAcceptRulesListReceived && mFriendsListDirty)
+        {
+                mFriendsListDirty = false;
+                
+                if(0)
+                {
+                        // FOR TESTING ONLY -- clear all buddy list, block list, and auto-accept list entries.
+                        clearAllLists();
+                        return;
+                }
+                
+                LL_INFOS("Voice") << "Checking vivox buddy list against friends list..." << LL_ENDL;
+                
+                buddyListMap::iterator buddy_it;
+                for(buddy_it = mBuddyListMap.begin(); buddy_it != mBuddyListMap.end(); buddy_it++)
+                {
+                        // reset the temp flags in the local buddy list
+                        buddy_it->second->mInSLFriends = false;
+                }
+                
+                // correlate with the friends list
+                {
+                        LLCollectAllBuddies collect;
+                        LLAvatarTracker::instance().applyFunctor(collect);
+                        LLCollectAllBuddies::buddy_map_t::const_iterator it = collect.mOnline.begin();
+                        LLCollectAllBuddies::buddy_map_t::const_iterator end = collect.mOnline.end();
+                        
+                        for ( ; it != end; ++it)
+                        {
+                                checkFriend(it->second);
+                        }
+                        it = collect.mOffline.begin();
+                        end = collect.mOffline.end();
+                        for ( ; it != end; ++it)
+                        {
+                                checkFriend(it->second);
+                        }
+                }
+                                
+                LL_INFOS("Voice") << "Sending friend list updates..." << LL_ENDL;
 
-        stream
-        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.SetRenderDevice.1\">"
-                << "<RenderDeviceSpecifier>" << mRenderDevice << "</RenderDeviceSpecifier>"
-        << "</Request>"
-        << "\n\n\n";
+                for(buddy_it = mBuddyListMap.begin(); buddy_it != mBuddyListMap.end();)
+                {
+                        buddyListEntry *buddy = buddy_it->second;
+                        buddy_it++;
+                        
+                        // Ignore entries that aren't resolved yet.
+                        if(buddy->mNameResolved)
+                        {
+                                std::ostringstream stream;
+
+                                if(buddy->mInSLFriends && (!buddy->mInVivoxBuddies || buddy->mNeedsNameUpdate))
+                                {                                       
+                                        if(mNumberOfAliases > 0)
+                                        {
+                                                // Add (or update) this entry in the vivox buddy list
+                                                buddy->mInVivoxBuddies = true;
+                                                buddy->mNeedsNameUpdate = false;
+                                                LL_DEBUGS("Voice") << "add/update " << buddy->mURI << " (" << buddy->mDisplayName << ")" << LL_ENDL;
+                                                stream 
+                                                        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.BuddySet.1\">"
+                                                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                                << "<BuddyURI>" << buddy->mURI << "</BuddyURI>"
+                                                                << "<DisplayName>" << buddy->mDisplayName << "</DisplayName>"
+                                                                << "<BuddyData></BuddyData>"    // Without this, SLVoice doesn't seem to parse the command.
+                                                                << "<GroupID>0</GroupID>"
+                                                        << "</Request>\n\n\n";  
+                                        }
+                                }
+                                else if(!buddy->mInSLFriends)
+                                {
+                                        // This entry no longer exists in your SL friends list.  Remove all traces of it from the Vivox buddy list.
+                                        if(buddy->mInVivoxBuddies)
+                                        {
+                                                // delete this entry from the vivox buddy list
+                                                buddy->mInVivoxBuddies = false;
+                                                LL_DEBUGS("Voice") << "delete " << buddy->mURI << " (" << buddy->mDisplayName << ")" << LL_ENDL;
+                                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.BuddyDelete.1\">"
+                                                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                        << "<BuddyURI>" << buddy->mURI << "</BuddyURI>"
+                                                        << "</Request>\n\n\n";          
+                                        }
+
+                                        if(buddy->mHasBlockListEntry)
+                                        {
+                                                // Delete the associated block list entry, if any
+                                                buddy->mHasBlockListEntry = false;
+                                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteBlockRule.1\">"
+                                                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                        << "<BlockMask>" << buddy->mURI << "</BlockMask>"
+                                                        << "</Request>\n\n\n";                                                          
+                                        }
+                                        if(buddy->mHasAutoAcceptListEntry)
+                                        {
+                                                // Delete the associated auto-accept list entry, if any
+                                                buddy->mHasAutoAcceptListEntry = false;
+                                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteAutoAcceptRule.1\">"
+                                                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                        << "<AutoAcceptMask>" << buddy->mURI << "</AutoAcceptMask>"
+                                                        << "</Request>\n\n\n";
+                                        }
+                                }
+                                
+                                if(buddy->mInSLFriends)
+                                {
+
+                                        if(buddy->mCanSeeMeOnline)
+                                        {
+                                                // Buddy should not be blocked.
+
+                                                // If this buddy doesn't already have either a block or autoaccept list entry, we'll update their status when we receive a SubscriptionEvent.
+                                                
+                                                // If the buddy has a block list entry, delete it.
+                                                if(buddy->mHasBlockListEntry)
+                                                {
+                                                        buddy->mHasBlockListEntry = false;
+                                                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteBlockRule.1\">"
+                                                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                                << "<BlockMask>" << buddy->mURI << "</BlockMask>"
+                                                                << "</Request>\n\n\n";          
+                                                        
+                                                        
+                                                        // If we just deleted a block list entry, add an auto-accept entry.
+                                                        if(!buddy->mHasAutoAcceptListEntry)
+                                                        {
+                                                                buddy->mHasAutoAcceptListEntry = true;                                                          
+                                                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.CreateAutoAcceptRule.1\">"
+                                                                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                                        << "<AutoAcceptMask>" << buddy->mURI << "</AutoAcceptMask>"
+                                                                        << "<AutoAddAsBuddy>0</AutoAddAsBuddy>"
+                                                                        << "</Request>\n\n\n";
+                                                        }
+                                                }
+                                        }
+                                        else
+                                        {
+                                                // Buddy should be blocked.
+                                                
+                                                // If this buddy doesn't already have either a block or autoaccept list entry, we'll update their status when we receive a SubscriptionEvent.
+
+                                                // If this buddy has an autoaccept entry, delete it
+                                                if(buddy->mHasAutoAcceptListEntry)
+                                                {
+                                                        buddy->mHasAutoAcceptListEntry = false;
+                                                        stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.DeleteAutoAcceptRule.1\">"
+                                                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                                << "<AutoAcceptMask>" << buddy->mURI << "</AutoAcceptMask>"
+                                                                << "</Request>\n\n\n";
+                                                
+                                                        // If we just deleted an auto-accept entry, add a block list entry.
+                                                        if(!buddy->mHasBlockListEntry)
+                                                        {
+                                                                buddy->mHasBlockListEntry = true;
+                                                                stream << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.CreateBlockRule.1\">"
+                                                                        << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                                                        << "<BlockMask>" << buddy->mURI << "</BlockMask>"
+                                                                        << "<PresenceOnly>1</PresenceOnly>"
+                                                                        << "</Request>\n\n\n";                                                          
+                                                        }
+                                                }
+                                        }
+
+                                        if(!buddy->mInSLFriends && !buddy->mInVivoxBuddies)
+                                        {
+                                                // Delete this entry from the local buddy list.  This should NOT invalidate the iterator,
+                                                // since it has already been incremented to the next entry.
+                                                deleteBuddy(buddy->mURI);
+                                        }
+
+                                }
+                                writeString(stream.str());
+                        }
+                }
+        }
 }
 
 /////////////////////////////
 // Response/Event handlers
 
-void LLVoiceClient::connectorCreateResponse(int statusCode, std::string &statusString, std::string &connectorHandle)
+void LLVoiceClient::connectorCreateResponse(int statusCode, std::string &statusString, std::string &connectorHandle, std::string &versionID)
 {       
         if(statusCode != 0)
         {
@@ -2596,6 +3669,7 @@ void LLVoiceClient::connectorCreateResponse(int statusCode, std::string &statusS
         else
         {
                 // Connector created, move forward.
+                LL_INFOS("Voice") << "Connector.Create succeeded, Vivox SDK version is " << versionID << LL_ENDL;
                 mConnectorHandle = connectorHandle;
                 if(getState() == stateConnectorStarting)
                 {
@@ -2604,7 +3678,7 @@ void LLVoiceClient::connectorCreateResponse(int statusCode, std::string &statusS
         }
 }
 
-void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std::string &accountHandle)
+void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std::string &accountHandle, int numberOfAliases)
 { 
         LL_DEBUGS("Voice") << "Account.Login response (" << statusCode << "): " << statusString << LL_ENDL;
         
@@ -2625,7 +3699,8 @@ void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std
         {
                 // Login succeeded, move forward.
                 mAccountHandle = accountHandle;
-                // MBW -- XXX -- This needs to wait until the LoginStateChangeEvent is received.
+                mNumberOfAliases = numberOfAliases;
+                // This needs to wait until the AccountLoginStateChangeEvent is received.
 //              if(getState() == stateLoggingIn)
 //              {
 //                      setState(stateLoggedIn);
@@ -2633,106 +3708,91 @@ void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std
         }
 }
 
-void LLVoiceClient::channelGetListResponse(int statusCode, std::string &statusString)
-{
+void LLVoiceClient::sessionCreateResponse(std::string &requestId, int statusCode, std::string &statusString, std::string &sessionHandle)
+{       
+        sessionState *session = findSessionBeingCreatedByURI(requestId);
+        
+        if(session)
+        {
+                session->mCreateInProgress = false;
+        }
+        
         if(statusCode != 0)
         {
-                LL_WARNS("Voice") << "Account.ChannelGetList response failure: " << statusString << LL_ENDL;
-                switchChannel();
+                LL_WARNS("Voice") << "Session.Create response failure (" << statusCode << "): " << statusString << LL_ENDL;
+                if(session)
+                {
+                        session->mErrorStatusCode = statusCode;         
+                        session->mErrorStatusString = statusString;
+                        if(session == mAudioSession)
+                        {
+                                setState(stateJoinSessionFailed);
+                        }
+                        else
+                        {
+                                reapSession(session);
+                        }
+                }
         }
         else
         {
-                // Got the channel list, try to do a lookup.
-                std::string uri = findChannelURI(mChannelName);
-                if(uri.empty())
-                {       
-                        // Lookup failed, can't join a channel for this area.
-                        LL_INFOS("Voice") << "failed to map channel name: " << mChannelName << LL_ENDL;
-                }
-                else
+                LL_INFOS("Voice") << "Session.Create response received (success), session handle is " << sessionHandle << LL_ENDL;
+                if(session)
                 {
-                        // We have a sip URL for this area.
-                        LL_INFOS("Voice") << "mapped channel " << mChannelName << " to URI "<< uri << LL_ENDL;
+                        setSessionHandle(session, sessionHandle);
                 }
-                
-                // switchChannel with an empty uri string will do the right thing (leave channel and not rejoin)
-                switchChannel(uri);
         }
 }
 
-void LLVoiceClient::sessionCreateResponse(int statusCode, std::string &statusString, std::string &sessionHandle)
+void LLVoiceClient::sessionGroupAddSessionResponse(std::string &requestId, int statusCode, std::string &statusString, std::string &sessionHandle)
 {       
+        sessionState *session = findSessionBeingCreatedByURI(requestId);
+        
+        if(session)
+        {
+                session->mCreateInProgress = false;
+        }
+        
         if(statusCode != 0)
         {
-                LL_WARNS("Voice") << "Session.Create response failure (" << statusCode << "): " << statusString << LL_ENDL;
-//              if(statusCode == 1015)
-//              {
-//                      if(getState() == stateJoiningSession)
-//                      {
-//                              // this happened during a real join.  Going to sessionTerminated should cause a retry in appropriate cases.
-//                              LL_WARNS("Voice") << "session handle \"" << sessionHandle << "\", mSessionStateEventHandle \"" << mSessionStateEventHandle << "\""<< LL_ENDL;
-//                              if(!sessionHandle.empty())
-//                              {
-//                                      // This session is bad.  Terminate it.
-//                                      mSessionHandle = sessionHandle;
-//                                      sessionTerminateByHandle(sessionHandle);
-//                                      setState(stateLeavingSession);
-//                              }
-//                              else if(!mSessionStateEventHandle.empty())
-//                              {
-//                                      mSessionHandle = mSessionStateEventHandle;
-//                                      sessionTerminateByHandle(mSessionStateEventHandle);
-//                                      setState(stateLeavingSession);
-//                              }
-//                              else
-//                              {
-//                                      setState(stateSessionTerminated);
-//                              }
-//                      }
-//                      else
-//                      {
-//                              // We didn't think we were in the middle of a join.  Don't change state.
-//                              LL_WARNS("Voice") << "Not in stateJoiningSession, ignoring" << LL_ENDL;
-//                      }
-//              }
-//              else
+                LL_WARNS("Voice") << "SessionGroup.AddSession response failure (" << statusCode << "): " << statusString << LL_ENDL;
+                if(session)
                 {
-                        mVivoxErrorStatusCode = statusCode;             
-                        mVivoxErrorStatusString = statusString;
-                        setState(stateJoinSessionFailed);
+                        session->mErrorStatusCode = statusCode;         
+                        session->mErrorStatusString = statusString;
+                        if(session == mAudioSession)
+                        {
+                                setState(stateJoinSessionFailed);
+                        }
+                        else
+                        {
+                                reapSession(session);
+                        }
                 }
         }
         else
         {
-                LL_DEBUGS("Voice") << "Session.Create response received (success), session handle is " << sessionHandle << LL_ENDL;
-                if(getState() == stateJoiningSession)
-                {
-                        // This is also grabbed in the SessionStateChangeEvent handler, but it might be useful to have it early...
-                        mSessionHandle = sessionHandle;
-                }
-                else
+                LL_DEBUGS("Voice") << "SessionGroup.AddSession response received (success), session handle is " << sessionHandle << LL_ENDL;
+                if(session)
                 {
-                        // We should never get a session.create response in any state except stateJoiningSession.  Things are out of sync.  Kill this session.
-                        sessionTerminateByHandle(sessionHandle);
+                        setSessionHandle(session, sessionHandle);
                 }
         }
 }
 
-void LLVoiceClient::sessionConnectResponse(int statusCode, std::string &statusString)
+void LLVoiceClient::sessionConnectResponse(std::string &requestId, int statusCode, std::string &statusString)
 {
+        sessionState *session = findSession(requestId);
         if(statusCode != 0)
         {
                 LL_WARNS("Voice") << "Session.Connect response failure (" << statusCode << "): " << statusString << LL_ENDL;
-//              if(statusCode == 1015)
-//              {
-//                      LL_WARNS("Voice") << "terminating existing session" << LL_ENDL;
-//                      sessionTerminate();
-//              }
-//              else
+                if(session)
                 {
-                        mVivoxErrorStatusCode = statusCode;             
-                        mVivoxErrorStatusString = statusString;
-                        setState(stateJoinSessionFailed);
+                        session->mMediaConnectInProgress = false;
+                        session->mErrorStatusCode = statusCode;         
+                        session->mErrorStatusString = statusString;
+                        if(session == mAudioSession)
+                                setState(stateJoinSessionFailed);
                 }
         }
         else
@@ -2741,27 +3801,12 @@ void LLVoiceClient::sessionConnectResponse(int statusCode, std::string &statusSt
         }
 }
 
-void LLVoiceClient::sessionTerminateResponse(int statusCode, std::string &statusString)
-{       
-        if(statusCode != 0)
-        {
-                LL_WARNS("Voice") << "Session.Terminate response failure: (" << statusCode << "): " << statusString << LL_ENDL;
-                if(getState() == stateLeavingSession)
-                {
-                        // This is probably "(404): Server reporting Failure. Not a member of this conference."
-                        // Do this so we don't get stuck.
-                        setState(stateSessionTerminated);
-                }
-        }
-        
-}
-
 void LLVoiceClient::logoutResponse(int statusCode, std::string &statusString)
 {       
         if(statusCode != 0)
         {
                 LL_WARNS("Voice") << "Account.Logout response failure: " << statusString << LL_ENDL;
-                // MBW -- XXX -- Should this ever fail?  do we care if it does?
+                // Should this ever fail?  do we care if it does?
         }
         
         if(getState() == stateLoggingOut)
@@ -2775,7 +3820,7 @@ void LLVoiceClient::connectorShutdownResponse(int statusCode, std::string &statu
         if(statusCode != 0)
         {
                 LL_WARNS("Voice") << "Connector.InitiateShutdown response failure: " << statusString << LL_ENDL;
-                // MBW -- XXX -- Should this ever fail?  do we care if it does?
+                // Should this ever fail?  do we care if it does?
         }
         
         mConnected = false;
@@ -2786,109 +3831,277 @@ void LLVoiceClient::connectorShutdownResponse(int statusCode, std::string &statu
         }
 }
 
-void LLVoiceClient::sessionStateChangeEvent(
+void LLVoiceClient::sessionAddedEvent(
                 std::string &uriString, 
-                int statusCode, 
-                std::string &statusString, 
-                std::string &sessionHandle,
-                int state,  
+                std::string &alias, 
+                std::string &sessionHandle, 
+                std::string &sessionGroupHandle, 
                 bool isChannel, 
-                std::string &nameString)
+                bool incoming,
+                std::string &nameString,
+                std::string &applicationString)
 {
-        switch(state)
-        {
-                case 4: // I see this when joining the session
-                        LL_INFOS("Voice") << "joined session " << uriString << ", name " << nameString << " handle " << mNextSessionHandle << LL_ENDL;
+        sessionState *session = NULL;
 
-                        // Session create succeeded, move forward.
-                        mSessionStateEventHandle = sessionHandle;
-                        mSessionStateEventURI = uriString;
-                        if(sessionHandle == mSessionHandle)
+        LL_INFOS("Voice") << "session " << uriString << ", alias " << alias << ", name " << nameString << " handle " << sessionHandle << LL_ENDL;
+        
+        session = addSession(uriString, sessionHandle);
+        if(session)
+        {
+                session->mGroupHandle = sessionGroupHandle;
+                session->mIsChannel = isChannel;
+                session->mIncoming = incoming;
+                session->mAlias = alias;
+                        
+                // Generate a caller UUID -- don't need to do this for channels
+                if(!session->mIsChannel)
+                {
+                        if(IDFromName(session->mSIPURI, session->mCallerID))
                         {
-                                // This is the session we're joining.
-                                if(getState() == stateJoiningSession)
-                                {
-                                        setState(stateSessionJoined);
-                                        //RN: the uriString being returned by vivox here is actually your account uri, not the channel
-                                        // you are attempting to join, so ignore it
-                                        //LL_DEBUGS("Voice") << "received URI " << uriString << "(previously " << mSessionURI << ")" << LL_ENDL;
-                                        //mSessionURI = uriString;
-                                }
+                                // Normal URI(base64-encoded UUID) 
                         }
-                        else if(sessionHandle == mNextSessionHandle)
+                        else if(!session->mAlias.empty() && IDFromName(session->mAlias, session->mCallerID))
                         {
-//                              LL_DEBUGS("Voice") << "received URI " << uriString << ", name " << nameString << " for next session (handle " << mNextSessionHandle << ")" << LL_ENDL;
+                                // Wrong URI, but an alias is available.  Stash the incoming URI as an alternate
+                                session->mAlternateSIPURI = session->mSIPURI;
+                                
+                                // and generate a proper URI from the ID.
+                                setSessionURI(session, sipURIFromID(session->mCallerID));
                         }
                         else
                         {
-                                LL_WARNS("Voice") << "joining unknown session handle " << sessionHandle << ", URI " << uriString << ", name " << nameString << LL_ENDL;
-                                // MBW -- XXX -- Should we send a Session.Terminate here?
+                                LL_INFOS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
+                                setUUIDFromStringHash(session->mCallerID, session->mSIPURI);
+                                session->mSynthesizedCallerID = true;
+                                
+                                // Can't look up the name in this case -- we have to extract it from the URI.
+                                std::string namePortion = nameFromsipURI(session->mSIPURI);
+                                if(namePortion.empty())
+                                {
+                                        // Didn't seem to be a SIP URI, just use the whole provided name.
+                                        namePortion = nameString;
+                                }
+                                
+                                // Some incoming names may be separated with an underscore instead of a space.  Fix this.
+                                LLStringUtil::replaceChar(namePortion, '_', ' ');
+                                
+                                // Act like we just finished resolving the name (this stores it in all the right places)
+                                avatarNameResolved(session->mCallerID, namePortion);
                         }
-                        
-                break;
-                case 5: // I see this when leaving the session
-                        LL_INFOS("Voice") << "left session " << uriString << ", name " << nameString << " handle " << mNextSessionHandle << LL_ENDL;
+                
+                        LL_INFOS("Voice") << "caller ID: " << session->mCallerID << LL_ENDL;
 
-                        // Set the session handle to the empty string.  If we get back to stateJoiningSession, we'll want to wait for the new session handle.
-                        if(sessionHandle == mSessionHandle)
+                        if(!session->mSynthesizedCallerID)
                         {
-                                // MBW -- XXX -- I think this is no longer necessary, now that we've got mNextSessionURI/mNextSessionHandle
-                                // mSessionURI.clear();
-                                // clear the session handle here just for sanity.
-                                mSessionHandle.clear();
-                                if(mSessionResetOnClose)
+                                // If we got here, we don't have a proper name.  Initiate a lookup.
+                                lookupName(session->mCallerID);
+                        }
+                }
+        }
+}
+
+void LLVoiceClient::sessionGroupAddedEvent(std::string &sessionGroupHandle)
+{
+        LL_DEBUGS("Voice") << "handle " << sessionGroupHandle << LL_ENDL;
+        
+#if USE_SESSION_GROUPS
+        if(mMainSessionGroupHandle.empty())
+        {
+                // This is the first (i.e. "main") session group.  Save its handle.
+                mMainSessionGroupHandle = sessionGroupHandle;
+        }
+        else
+        {
+                LL_DEBUGS("Voice") << "Already had a session group handle " << mMainSessionGroupHandle << LL_ENDL;
+        }
+#endif
+}
+
+void LLVoiceClient::joinedAudioSession(sessionState *session)
+{
+        if(mAudioSession != session)
+        {
+                sessionState *oldSession = mAudioSession;
+
+                mAudioSession = session;
+                mAudioSessionChanged = true;
+
+                // The old session may now need to be deleted.
+                reapSession(oldSession);
+        }
+        
+        // This is the session we're joining.
+        if(getState() == stateJoiningSession)
+        {
+                setState(stateSessionJoined);
+                
+                // SLIM SDK: we don't always receive a participant state change for ourselves when joining a channel now.
+                // Add the current user as a participant here.
+                participantState *participant = session->addParticipant(sipURIFromName(mAccountName));
+                if(participant)
+                {
+                        participant->mIsSelf = true;
+                        lookupName(participant->mAvatarID);
+
+                        LL_INFOS("Voice") << "added self as participant \"" << participant->mAccountName 
+                                        << "\" (" << participant->mAvatarID << ")"<< LL_ENDL;
+                }
+                
+                if(!session->mIsChannel)
+                {
+                        // this is a p2p session.  Make sure the other end is added as a participant.
+                        participantState *participant = session->addParticipant(session->mSIPURI);
+                        if(participant)
+                        {
+                                if(participant->mAvatarIDValid)
                                 {
-                                        mSessionResetOnClose = false;
-                                        mNonSpatialChannel = false;
-                                        mNextSessionSpatial = true;
-                                        parcelChanged();
+                                        lookupName(participant->mAvatarID);
+                                }
+                                else if(!session->mName.empty())
+                                {
+                                        participant->mDisplayName = session->mName;
+                                        avatarNameResolved(participant->mAvatarID, session->mName);
                                 }
-                        
-                                removeAllParticipants();
                                 
-                                switch(getState())
+                                // TODO: Question: Do we need to set up mAvatarID/mAvatarIDValid here?
+                                LL_INFOS("Voice") << "added caller as participant \"" << participant->mAccountName 
+                                                << "\" (" << participant->mAvatarID << ")"<< LL_ENDL;
+                        }
+                }
+        }
+}
+
+void LLVoiceClient::sessionRemovedEvent(
+        std::string &sessionHandle, 
+        std::string &sessionGroupHandle)
+{
+        LL_INFOS("Voice") << "handle " << sessionHandle << LL_ENDL;
+        
+        sessionState *session = findSession(sessionHandle);
+        if(session)
+        {
+                leftAudioSession(session);
+
+                // This message invalidates the session's handle.  Set it to empty.
+                setSessionHandle(session);
+                
+                // Reset the media state (we now have no info)
+                session->mMediaStreamState = streamStateUnknown;
+                session->mTextStreamState = streamStateUnknown;
+                
+                // Conditionally delete the session
+                reapSession(session);
+        }
+        else
+        {
+                LL_WARNS("Voice") << "unknown session " << sessionHandle << " removed" << LL_ENDL;
+        }
+}
+
+void LLVoiceClient::reapSession(sessionState *session)
+{
+        if(session)
+        {
+                if(!session->mHandle.empty())
+                {
+                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (non-null session handle)" << LL_ENDL;
+                }
+                else if(session->mCreateInProgress)
+                {
+                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (create in progress)" << LL_ENDL;
+                }
+                else if(session->mMediaConnectInProgress)
+                {
+                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (connect in progress)" << LL_ENDL;
+                }
+                else if(session == mAudioSession)
+                {
+                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (it's the current session)" << LL_ENDL;
+                }
+                else if(session == mNextAudioSession)
+                {
+                        LL_DEBUGS("Voice") << "NOT deleting session " << session->mSIPURI << " (it's the next session)" << LL_ENDL;
+                }
+                else
+                {
+                        // TODO: Question: Should we check for queued text messages here?
+                        // We don't have a reason to keep tracking this session, so just delete it.
+                        LL_DEBUGS("Voice") << "deleting session " << session->mSIPURI << LL_ENDL;
+                        deleteSession(session);
+                        session = NULL;
+                }       
+        }
+        else
+        {
+//              LL_DEBUGS("Voice") << "session is NULL" << LL_ENDL;
+        }
+}
+
+// Returns true if the session seems to indicate we've moved to a region on a different voice server
+bool LLVoiceClient::sessionNeedsRelog(sessionState *session)
+{
+        bool result = false;
+        
+        if(session != NULL)
+        {
+                // Only make this check for spatial channels (so it won't happen for group or p2p calls)
+                if(session->mIsSpatial)
+                {
+                        std::string::size_type atsign;
+                        
+                        atsign = session->mSIPURI.find("@");
+                        
+                        if(atsign != std::string::npos)
+                        {
+                                std::string urihost = session->mSIPURI.substr(atsign + 1);
+                                if(stricmp(urihost.c_str(), mVoiceSIPURIHostName.c_str()))
                                 {
-                                        case stateJoiningSession:
-                                        case stateSessionJoined:
-                                        case stateRunning:
-                                        case stateLeavingSession:
-                                        case stateJoinSessionFailed:
-                                        case stateJoinSessionFailedWaiting:
-                                                // normal transition
-                                                LL_INFOS("Voice") << "left session " << sessionHandle << "in state " << state2string(getState()) << LL_ENDL;
-                                                setState(stateSessionTerminated);
-                                        break;
+                                        // The hostname in this URI is different from what we expect.  This probably means we need to relog.
                                         
-                                        case stateSessionTerminated:
-                                                // this will happen sometimes -- there are cases where we send the terminate and then go straight to this state.
-                                                LL_WARNS("Voice") << "left session " << sessionHandle << "in state " << state2string(getState()) << LL_ENDL;
-                                        break;
+                                        // We could make a ProvisionVoiceAccountRequest and compare the result with the current values of
+                                        // mVoiceSIPURIHostName and mVoiceAccountServerURI to be really sure, but this is a pretty good indicator.
                                         
-                                        default:
-                                                LL_WARNS("Voice") << "unexpected SessionStateChangeEvent (left session) in state " << state2string(getState()) << LL_ENDL;
-                                                setState(stateSessionTerminated);
-                                        break;
+                                        result = true;
                                 }
-
-                                // store status values for later notification of observers
-                                mVivoxErrorStatusCode = statusCode;             
-                                mVivoxErrorStatusString = statusString;
-                        }
-                        else
-                        {
-                                LL_INFOS("Voice") << "leaving unknown session handle " << sessionHandle << ", URI " << uriString << ", name " << nameString << LL_ENDL;
                         }
+                }
+        }
+        
+        return result;
+}
 
-                        mSessionStateEventHandle.clear();
-                        mSessionStateEventURI.clear();
-                break;
-                default:
-                        LL_WARNS("Voice") << "unknown state: " << state << LL_ENDL;
-                break;
+void LLVoiceClient::leftAudioSession(
+        sessionState *session)
+{
+        if(mAudioSession == session)
+        {
+                switch(getState())
+                {
+                        case stateJoiningSession:
+                        case stateSessionJoined:
+                        case stateRunning:
+                        case stateLeavingSession:
+                        case stateJoinSessionFailed:
+                        case stateJoinSessionFailedWaiting:
+                                // normal transition
+                                LL_DEBUGS("Voice") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
+                                setState(stateSessionTerminated);
+                        break;
+                        
+                        case stateSessionTerminated:
+                                // this will happen sometimes -- there are cases where we send the terminate and then go straight to this state.
+                                LL_WARNS("Voice") << "left session " << session->mHandle << " in state " << state2string(getState()) << LL_ENDL;
+                        break;
+                        
+                        default:
+                                LL_WARNS("Voice") << "unexpected SessionStateChangeEvent (left session) in state " << state2string(getState()) << LL_ENDL;
+                                setState(stateSessionTerminated);
+                        break;
+                }
         }
 }
 
-void LLVoiceClient::loginStateChangeEvent(
+void LLVoiceClient::accountLoginStateChangeEvent(
                 std::string &accountHandle, 
                 int statusCode, 
                 std::string &statusString, 
@@ -2921,110 +4134,571 @@ void LLVoiceClient::loginStateChangeEvent(
         }
 }
 
-void LLVoiceClient::sessionNewEvent(
-                std::string &accountHandle, 
-                std::string &eventSessionHandle, 
-                int state, 
-                std::string &nameString, 
-                std::string &uriString)
+void LLVoiceClient::mediaStreamUpdatedEvent(
+        std::string &sessionHandle, 
+        std::string &sessionGroupHandle, 
+        int statusCode, 
+        std::string &statusString, 
+        int state, 
+        bool incoming)
 {
-        LL_DEBUGS("Voice") << "state is " << state << LL_ENDL;
+        sessionState *session = findSession(sessionHandle);
         
-        switch(state)
+        LL_DEBUGS("Voice") << "session " << sessionHandle << ", status code " << statusCode << ", string \"" << statusString << "\"" << LL_ENDL;
+        
+        if(session)
         {
-                case 0:
-                        {
-                                LL_DEBUGS("Voice") << "session handle = " << eventSessionHandle << ", name = " << nameString << ", uri = " << uriString << LL_ENDL;
+                // We know about this session
+                
+                // Save the state for later use
+                session->mMediaStreamState = state;
+                
+                switch(statusCode)
+                {
+                        case 0:
+                        case 200:
+                                // generic success
+                                // Don't change the saved error code (it may have been set elsewhere)
+                        break;
+                        default:
+                                // save the status code for later
+                                session->mErrorStatusCode = statusCode;
+                        break;
+                }
+                
+                switch(state)
+                {
+                        case streamStateIdle:
+                                // Standard "left audio session"
+                                session->mVoiceEnabled = false;
+                                session->mMediaConnectInProgress = false;
+                                leftAudioSession(session);
+                        break;
 
-                                LLUUID caller_id;
-                                if(IDFromName(nameString, caller_id))
+                        case streamStateConnected:
+                                session->mVoiceEnabled = true;
+                                session->mMediaConnectInProgress = false;
+                                joinedAudioSession(session);
+                        break;
+                        
+                        case streamStateRinging:
+                                if(incoming)
                                 {
-                                        gIMMgr->inviteToSession(
-                                                LLIMMgr::computeSessionID(
-                                                        IM_SESSION_P2P_INVITE,
-                                                        caller_id),
-                                                LLStringUtil::null,
-                                                caller_id, 
-                                                LLStringUtil::null, 
-                                                IM_SESSION_P2P_INVITE, 
-                                                LLIMMgr::INVITATION_TYPE_VOICE,
-                                                eventSessionHandle);
+                                        // Send the voice chat invite to the GUI layer
+                                        // TODO: Question: Should we correlate with the mute list here?
+                                        session->mIMSessionID = LLIMMgr::computeSessionID(IM_SESSION_P2P_INVITE, session->mCallerID);
+                                        session->mVoiceInvitePending = true;
+                                        if(session->mName.empty())
+                                        {
+                                                lookupName(session->mCallerID);
+                                        }
+                                        else
+                                        {
+                                                // Act like we just finished resolving the name
+                                                avatarNameResolved(session->mCallerID, session->mName);
+                                        }
+                                }
+                        break;
+                        
+                        default:
+                                LL_WARNS("Voice") << "unknown state " << state << LL_ENDL;
+                        break;
+                        
+                }
+                
+        }
+        else
+        {
+                LL_WARNS("Voice") << "session " << sessionHandle << "not found"<< LL_ENDL;
+        }
+}
+
+void LLVoiceClient::textStreamUpdatedEvent(
+        std::string &sessionHandle, 
+        std::string &sessionGroupHandle, 
+        bool enabled,
+        int state, 
+        bool incoming)
+{
+        sessionState *session = findSession(sessionHandle);
+        
+        if(session)
+        {
+                // Save the state for later use
+                session->mTextStreamState = state;
+                
+                // We know about this session
+                switch(state)
+                {
+                        case 0: // We see this when the text stream closes
+                                LL_DEBUGS("Voice") << "stream closed" << LL_ENDL;
+                        break;
+                        
+                        case 1: // We see this on an incoming call from the Connector
+                                // Try to send any text messages queued for this session.
+                                sendQueuedTextMessages(session);
+
+                                // Send the text chat invite to the GUI layer
+                                // TODO: Question: Should we correlate with the mute list here?
+                                session->mTextInvitePending = true;
+                                if(session->mName.empty())
+                                {
+                                        lookupName(session->mCallerID);
                                 }
                                 else
                                 {
-                                        LL_WARNS("Voice") << "Could not generate caller id from uri " << uriString << LL_ENDL;
+                                        // Act like we just finished resolving the name
+                                        avatarNameResolved(session->mCallerID, session->mName);
                                 }
-                        }
-                break;
-                
-                default:
-                        LL_WARNS("Voice") << "unknown state: " << state << LL_ENDL;
-                break;
+                        break;
+
+                        default:
+                                LL_WARNS("Voice") << "unknown state " << state << LL_ENDL;
+                        break;
+                        
+                }
         }
 }
 
-void LLVoiceClient::participantStateChangeEvent(
+void LLVoiceClient::participantAddedEvent(
+                std::string &sessionHandle, 
+                std::string &sessionGroupHandle, 
                 std::string &uriString, 
-                int statusCode, 
-                std::string &statusString, 
-                int state,  
+                std::string &alias, 
                 std::string &nameString, 
                 std::string &displayNameString, 
                 int participantType)
 {
-        participantState *participant = NULL;
-        LL_DEBUGS("Voice") << "state is " << state << LL_ENDL;
-
-        switch(state)
+        sessionState *session = findSession(sessionHandle);
+        if(session)
         {
-                case 7: // I see this when a participant joins
-                        participant = addParticipant(uriString);
-                        if(participant)
+                participantState *participant = session->addParticipant(uriString);
+                if(participant)
+                {
+                        participant->mAccountName = nameString;
+
+                        LL_DEBUGS("Voice") << "added participant \"" << participant->mAccountName 
+                                        << "\" (" << participant->mAvatarID << ")"<< LL_ENDL;
+
+                        if(participant->mAvatarIDValid)
                         {
-                                participant->mName = nameString;
-                                LL_DEBUGS("Voice") << "added participant \"" << participant->mName 
-                                                << "\" (" << participant->mAvatarID << ")"<< LL_ENDL;
+                                // Initiate a lookup
+                                lookupName(participant->mAvatarID);
                         }
-                break;
-                case 9: // I see this when a participant leaves
-                        participant = findParticipant(uriString);
-                        if(participant)
+                        else
                         {
-                                removeParticipant(participant);
+                                // If we don't have a valid avatar UUID, we need to fill in the display name to make the active speakers floater work.
+                                std::string namePortion = nameFromsipURI(uriString);
+                                if(namePortion.empty())
+                                {
+                                        // Problem with the SIP URI, fall back to the display name
+                                        namePortion = displayNameString;
+                                }
+                                if(namePortion.empty())
+                                {
+                                        // Problems with both of the above, fall back to the account name
+                                        namePortion = nameString;
+                                }
+                                
+                                // Set the display name (which is a hint to the active speakers window not to do its own lookup)
+                                participant->mDisplayName = namePortion;
+                                avatarNameResolved(participant->mAvatarID, namePortion);
                         }
-                break;
-                default:
-                        LL_DEBUGS("Voice") << "unknown state: " << state << LL_ENDL;
-                break;
+                }
         }
 }
 
-void LLVoiceClient::participantPropertiesEvent(
+void LLVoiceClient::participantRemovedEvent(
+                std::string &sessionHandle, 
+                std::string &sessionGroupHandle, 
                 std::string &uriString, 
-                int statusCode, 
-                std::string &statusString, 
-                bool isLocallyMuted, 
+                std::string &alias, 
+                std::string &nameString)
+{
+        sessionState *session = findSession(sessionHandle);
+        if(session)
+        {
+                participantState *participant = session->findParticipant(uriString);
+                if(participant)
+                {
+                        session->removeParticipant(participant);
+                }
+                else
+                {
+                        LL_DEBUGS("Voice") << "unknown participant " << uriString << LL_ENDL;
+                }
+        }
+        else
+        {
+                LL_DEBUGS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+        }
+}
+
+
+void LLVoiceClient::participantUpdatedEvent(
+                std::string &sessionHandle, 
+                std::string &sessionGroupHandle, 
+                std::string &uriString, 
+                std::string &alias, 
                 bool isModeratorMuted, 
                 bool isSpeaking, 
                 int volume, 
                 F32 energy)
 {
-        participantState *participant = findParticipant(uriString);
-        if(participant)
+        sessionState *session = findSession(sessionHandle);
+        if(session)
+        {
+                participantState *participant = session->findParticipant(uriString);
+                
+                if(participant)
+                {
+                        participant->mIsSpeaking = isSpeaking;
+                        participant->mIsModeratorMuted = isModeratorMuted;
+
+                        // SLIM SDK: convert range: ensure that energy is set to zero if is_speaking is false
+                        if (isSpeaking)
+                        {
+                                participant->mSpeakingTimeout.reset();
+                                participant->mPower = energy;
+                        }
+                        else
+                        {
+                                participant->mPower = 0.0f;
+                        }
+                        participant->mVolume = volume;
+                }
+                else
+                {
+                        LL_WARNS("Voice") << "unknown participant: " << uriString << LL_ENDL;
+                }
+        }
+        else
+        {
+                LL_INFOS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+        }
+}
+
+void LLVoiceClient::buddyPresenceEvent(
+                std::string &uriString, 
+                std::string &alias, 
+                std::string &statusString,
+                std::string &applicationString)
+{
+        buddyListEntry *buddy = findBuddy(uriString);
+        
+        if(buddy)
+        {
+                LL_DEBUGS("Voice") << "Presence event for " << buddy->mDisplayName << " status \"" << statusString << "\", application \"" << applicationString << "\""<< LL_ENDL;
+                LL_DEBUGS("Voice") << "before: mOnlineSL = " << (buddy->mOnlineSL?"true":"false") << ", mOnlineSLim = " << (buddy->mOnlineSLim?"true":"false") << LL_ENDL;
+
+                if(applicationString.empty())
+                {
+                        // This presence event is from a client that doesn't set up the Application string.  Do things the old-skool way.
+                        // NOTE: this will be needed to support people who aren't on the 3010-class SDK yet.
+
+                        if ( stricmp("Unknown", statusString.c_str())== 0) 
+                        {
+                                // User went offline with a non-SLim-enabled viewer.
+                                buddy->mOnlineSL = false;
+                        }
+                        else if ( stricmp("Online", statusString.c_str())== 0) 
+                        {
+                                // User came online with a non-SLim-enabled viewer.
+                                buddy->mOnlineSL = true;
+                        }
+                        else
+                        {
+                                // If the user is online through SLim, their status will be "Online-slc", "Away", or something else.
+                                // NOTE: we should never see this unless someone is running an OLD version of SLim -- the versions that should be in use now all set the application string.
+                                buddy->mOnlineSLim = true;
+                        } 
+                }
+                else if(applicationString.find("SecondLifeViewer") != std::string::npos)
+                {
+                        // This presence event is from a viewer that sets the application string
+                        if ( stricmp("Unknown", statusString.c_str())== 0) 
+                        {
+                                // Viewer says they're offline
+                                buddy->mOnlineSL = false;
+                        }
+                        else
+                        {
+                                // Viewer says they're online
+                                buddy->mOnlineSL = true;
+                        }
+                }
+                else
+                {
+                        // This presence event is from something which is NOT the SL viewer (assume it's SLim).
+                        if ( stricmp("Unknown", statusString.c_str())== 0) 
+                        {
+                                // SLim says they're offline
+                                buddy->mOnlineSLim = false;
+                        }
+                        else
+                        {
+                                // SLim says they're online
+                                buddy->mOnlineSLim = true;
+                        }
+                } 
+
+                LL_DEBUGS("Voice") << "after: mOnlineSL = " << (buddy->mOnlineSL?"true":"false") << ", mOnlineSLim = " << (buddy->mOnlineSLim?"true":"false") << LL_ENDL;
+                
+                // HACK -- increment the internal change serial number in the LLRelationship (without changing the actual status), so the UI notices the change.
+                LLAvatarTracker::instance().setBuddyOnline(buddy->mUUID,LLAvatarTracker::instance().isBuddyOnline(buddy->mUUID));
+
+                notifyFriendObservers();
+        }
+        else
+        {
+                LL_DEBUGS("Voice") << "Presence for unknown buddy " << uriString << LL_ENDL;
+        }       
+}
+
+void LLVoiceClient::messageEvent(
+                std::string &sessionHandle, 
+                std::string &uriString, 
+                std::string &alias, 
+                std::string &messageHeader, 
+                std::string &messageBody,
+                std::string &applicationString)
+{
+        LL_DEBUGS("Voice") << "Message event, session " << sessionHandle << " from " << uriString << LL_ENDL;
+//      LL_DEBUGS("Voice") << "    header " << messageHeader << ", body: \n" << messageBody << LL_ENDL;
+        
+        if(messageHeader.find("text/html") != std::string::npos)
+        {
+                std::string rawMessage;
+
+                {
+                        const std::string startMarker = "<body";
+                        const std::string startMarker2 = ">";
+                        const std::string endMarker = "</body>";
+                        const std::string startSpan = "<span";
+                        const std::string endSpan = "</span>";
+                        std::string::size_type start;
+                        std::string::size_type end;
+                        
+                        // Default to displaying the raw string, so the message gets through.
+                        rawMessage = messageBody;
+
+                        // Find the actual message text within the XML fragment
+                        start = messageBody.find(startMarker);
+                        start = messageBody.find(startMarker2, start);
+                        end = messageBody.find(endMarker);
+
+                        if(start != std::string::npos)
+                        {
+                                start += startMarker2.size();
+                                
+                                if(end != std::string::npos)
+                                        end -= start;
+                                        
+                                rawMessage.assign(messageBody, start, end);
+                        }
+                        else 
+                        {
+                                // Didn't find a <body>, try looking for a <span> instead.
+                                start = messageBody.find(startSpan);
+                                start = messageBody.find(startMarker2, start);
+                                end = messageBody.find(endSpan);
+                                
+                                if(start != std::string::npos)
+                                {
+                                        start += startMarker2.size();
+                                        
+                                        if(end != std::string::npos)
+                                                end -= start;
+                                        
+                                        rawMessage.assign(messageBody, start, end);
+                                }                       
+                        }
+                }       
+                
+//              LL_DEBUGS("Voice") << "    raw message = \n" << rawMessage << LL_ENDL;
+
+                // strip formatting tags
+                {
+                        std::string::size_type start;
+                        std::string::size_type end;
+                        
+                        while((start = rawMessage.find('<')) != std::string::npos)
+                        {
+                                if((end = rawMessage.find('>', start + 1)) != std::string::npos)
+                                {
+                                        // Strip out the tag
+                                        rawMessage.erase(start, (end + 1) - start);
+                                }
+                                else
+                                {
+                                        // Avoid an infinite loop
+                                        break;
+                                }
+                        }
+                }
+                
+                // Decode ampersand-escaped chars
+                {
+                        std::string::size_type mark = 0;
+
+                        // The text may contain text encoded with &lt;, &gt;, and &amp;
+                        mark = 0;
+                        while((mark = rawMessage.find("&lt;", mark)) != std::string::npos)
+                        {
+                                rawMessage.replace(mark, 4, "<");
+                                mark += 1;
+                        }
+                        
+                        mark = 0;
+                        while((mark = rawMessage.find("&gt;", mark)) != std::string::npos)
+                        {
+                                rawMessage.replace(mark, 4, ">");
+                                mark += 1;
+                        }
+                        
+                        mark = 0;
+                        while((mark = rawMessage.find("&amp;", mark)) != std::string::npos)
+                        {
+                                rawMessage.replace(mark, 5, "&");
+                                mark += 1;
+                        }
+                }
+                
+                // strip leading/trailing whitespace (since we always seem to get a couple newlines)
+                LLStringUtil::trim(rawMessage);
+                
+//              LL_DEBUGS("Voice") << "    stripped message = \n" << rawMessage << LL_ENDL;
+                
+                sessionState *session = findSession(sessionHandle);
+                if(session)
+                {
+                        bool is_busy = gAgent.getBusy();
+                        bool is_muted = LLMuteList::getInstance()->isMuted(session->mCallerID, session->mName, LLMute::flagTextChat);
+                        bool is_linden = LLMuteList::getInstance()->isLinden(session->mName);
+                        bool quiet_chat = false;
+                        LLChat chat;
+
+                        chat.mMuted = is_muted && !is_linden;
+                        
+                        if(!chat.mMuted)
+                        {
+                                chat.mFromID = session->mCallerID;
+                                chat.mFromName = session->mName;
+                                chat.mSourceType = CHAT_SOURCE_AGENT;
+
+                                if(is_busy && !is_linden)
+                                {
+                                        quiet_chat = true;
+                                        // TODO: Question: Return busy mode response here?  Or maybe when session is started instead?
+                                }
+                                
+                                std::string fullMessage = std::string(": ") + rawMessage;
+                                
+                                LL_DEBUGS("Voice") << "adding message, name " << session->mName << " session " << session->mIMSessionID << ", target " << session->mCallerID << LL_ENDL;
+                                gIMMgr->addMessage(session->mIMSessionID,
+                                                session->mCallerID,
+                                                session->mName.c_str(),
+                                                fullMessage.c_str(),
+                                                LLStringUtil::null,             // default arg
+                                                IM_NOTHING_SPECIAL,             // default arg
+                                                0,                                              // default arg
+                                                LLUUID::null,                   // default arg
+                                                LLVector3::zero,                // default arg
+                                                true);                                  // prepend name and make it a link to the user's profile
+
+                                chat.mText = std::string("IM: ") + session->mName + std::string(": ") + rawMessage;
+                                // If the chat should come in quietly (i.e. we're in busy mode), pretend it's from a local agent.
+                                LLFloaterChat::addChat( chat, TRUE, quiet_chat );
+                        }
+                }               
+        }
+}
+
+void LLVoiceClient::sessionNotificationEvent(std::string &sessionHandle, std::string &uriString, std::string &notificationType)
+{
+        sessionState *session = findSession(sessionHandle);
+        
+        if(session)
         {
-                participant->mPTT = !isLocallyMuted;
-                participant->mIsSpeaking = isSpeaking;
-                participant->mIsModeratorMuted = isModeratorMuted;
-                if (isSpeaking)
+                participantState *participant = session->findParticipant(uriString);
+                if(participant)
+                {
+                        if (!stricmp(notificationType.c_str(), "Typing"))
+                        {
+                                // Other end started typing
+                                // TODO: The proper way to add a typing notification seems to be LLIMMgr::processIMTypingStart().
+                                // It requires an LLIMInfo for the message, which we don't have here.
+                        }
+                        else if (!stricmp(notificationType.c_str(), "NotTyping"))
+                        {
+                                // Other end stopped typing
+                                // TODO: The proper way to remove a typing notification seems to be LLIMMgr::processIMTypingStop().
+                                // It requires an LLIMInfo for the message, which we don't have here.
+                        }
+                        else
+                        {
+                                LL_DEBUGS("Voice") << "Unknown notification type " << notificationType << "for participant " << uriString << " in session " << session->mSIPURI << LL_ENDL;
+                        }
+                }
+                else
                 {
-                        participant->mSpeakingTimeout.reset();
+                        LL_DEBUGS("Voice") << "Unknown participant " << uriString << " in session " << session->mSIPURI << LL_ENDL;
                 }
-                participant->mPower = energy;
-                participant->mVolume = volume;
         }
         else
         {
-                LL_WARNS("Voice") << "unknown participant: " << uriString << LL_ENDL;
+                LL_DEBUGS("Voice") << "Unknown session handle " << sessionHandle << LL_ENDL;
+        }
+}
+
+void LLVoiceClient::subscriptionEvent(std::string &buddyURI, std::string &subscriptionHandle, std::string &alias, std::string &displayName, std::string &applicationString, std::string &subscriptionType)
+{
+        buddyListEntry *buddy = findBuddy(buddyURI);
+        
+        if(!buddy)
+        {
+                // Couldn't find buddy by URI, try converting the alias...
+                if(!alias.empty())
+                {
+                        LLUUID id;
+                        if(IDFromName(alias, id))
+                        {
+                                buddy = findBuddy(id);
+                        }
+                }
+        }
+        
+        if(buddy)
+        {
+                std::ostringstream stream;
+                
+                if(buddy->mCanSeeMeOnline)
+                {
+                        // Sending the response will create an auto-accept rule
+                        buddy->mHasAutoAcceptListEntry = true;
+                }
+                else
+                {
+                        // Sending the response will create a block rule
+                        buddy->mHasBlockListEntry = true;
+                }
+                
+                if(buddy->mInSLFriends)
+                {
+                        buddy->mInVivoxBuddies = true;
+                }
+                
+                stream
+                        << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.SendSubscriptionReply.1\">"
+                                << "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
+                                << "<BuddyURI>" << buddy->mURI << "</BuddyURI>"
+                                << "<RuleType>" << (buddy->mCanSeeMeOnline?"Allow":"Hide") << "</RuleType>"
+                                << "<AutoAccept>"<< (buddy->mInSLFriends?"1":"0")<< "</AutoAccept>"
+                                << "<SubscriptionHandle>" << subscriptionHandle << "</SubscriptionHandle>"
+                        << "</Request>"
+                        << "\n\n\n";
+                        
+                writeString(stream.str());
         }
 }
 
@@ -3034,155 +4708,226 @@ void LLVoiceClient::auxAudioPropertiesEvent(F32 energy)
         mTuningEnergy = energy;
 }
 
+void LLVoiceClient::buddyListChanged()
+{
+        // This is called after we receive a BuddyAndGroupListChangedEvent.
+        mBuddyListMapPopulated = true;
+        mFriendsListDirty = true;
+}
+
 void LLVoiceClient::muteListChanged()
 {
         // The user's mute list has been updated.  Go through the current participant list and sync it with the mute list.
-
-        participantMap::iterator iter = mParticipantMap.begin();
-        
-        for(; iter != mParticipantMap.end(); iter++)
+        if(mAudioSession)
         {
-                participantState *p = iter->second;
+                participantMap::iterator iter = mAudioSession->mParticipantsByURI.begin();
                 
-                // Check to see if this participant is on the mute list already
-                updateMuteState(p);
+                for(; iter != mAudioSession->mParticipantsByURI.end(); iter++)
+                {
+                        participantState *p = iter->second;
+                        
+                        // Check to see if this participant is on the mute list already
+                        if(p->updateMuteState())
+                                mAudioSession->mVolumeDirty = true;
+                }
+        }
+}
+
+void LLVoiceClient::updateFriends(U32 mask)
+{
+        if(mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::POWERS))
+        {
+                // Just resend the whole friend list to the daemon
+                mFriendsListDirty = true;
         }
 }
 
 /////////////////////////////
 // Managing list of participants
 LLVoiceClient::participantState::participantState(const std::string &uri) : 
-         mURI(uri), mPTT(false), mIsSpeaking(false), mIsModeratorMuted(false), mLastSpokeTimestamp(0.f), mPower(0.f), mVolume(0), mServiceType(serviceTypeUnknown),
-         mOnMuteList(false), mUserVolume(100), mVolumeDirty(false), mAvatarIDValid(false)
+         mURI(uri), 
+         mPTT(false), 
+         mIsSpeaking(false), 
+         mIsModeratorMuted(false), 
+         mLastSpokeTimestamp(0.f), 
+         mPower(0.f), 
+         mVolume(0), 
+         mOnMuteList(false), 
+         mUserVolume(100), 
+         mVolumeDirty(false), 
+         mAvatarIDValid(false),
+         mIsSelf(false)
 {
 }
 
-LLVoiceClient::participantState *LLVoiceClient::addParticipant(const std::string &uri)
+LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(const std::string &uri)
 {
         participantState *result = NULL;
-
-        participantMap::iterator iter = mParticipantMap.find(uri);
+        bool useAlternateURI = false;
         
-        if(iter != mParticipantMap.end())
+        // Note: this is mostly the body of LLVoiceClient::sessionState::findParticipant(), but since we need to know if it
+        // matched the alternate SIP URI (so we can add it properly), we need to reproduce it here.
         {
-                // Found a matching participant already in the map.
-                result = iter->second;
-        }
+                participantMap::iterator iter = mParticipantsByURI.find(&uri);
+
+                if(iter == mParticipantsByURI.end())
+                {
+                        if(!mAlternateSIPURI.empty() && (uri == mAlternateSIPURI))
+                        {
+                                // This is a p2p session (probably with the SLIM client) with an alternate URI for the other participant.
+                                // Use mSIPURI instead, since it will be properly encoded.
+                                iter = mParticipantsByURI.find(&(mSIPURI));
+                                useAlternateURI = true;
+                        }
+                }
 
+                if(iter != mParticipantsByURI.end())
+                {
+                        result = iter->second;
+                }
+        }
+                
         if(!result)
         {
                 // participant isn't already in one list or the other.
-                result = new participantState(uri);
-                mParticipantMap.insert(participantMap::value_type(uri, result));
-                mParticipantMapChanged = true;
+                result = new participantState(useAlternateURI?mSIPURI:uri);
+                mParticipantsByURI.insert(participantMap::value_type(&(result->mURI), result));
+                mParticipantsChanged = true;
                 
                 // Try to do a reverse transform on the URI to get the GUID back.
                 {
                         LLUUID id;
-                        if(IDFromName(uri, id))
+                        if(IDFromName(result->mURI, id))
                         {
                                 result->mAvatarIDValid = true;
                                 result->mAvatarID = id;
 
-                                updateMuteState(result);
+                                if(result->updateMuteState())
+                                        mVolumeDirty = true;
+                        }
+                        else
+                        {
+                                // Create a UUID by hashing the URI, but do NOT set mAvatarIDValid.
+                                // This tells both code in LLVoiceClient and code in llfloateractivespeakers.cpp that the ID will not be in the name cache.
+                                setUUIDFromStringHash(result->mAvatarID, uri);
                         }
                 }
                 
+                mParticipantsByUUID.insert(participantUUIDMap::value_type(&(result->mAvatarID), result));
+                
                 LL_DEBUGS("Voice") << "participant \"" << result->mURI << "\" added." << LL_ENDL;
         }
         
         return result;
 }
 
-void LLVoiceClient::updateMuteState(participantState *p)
+bool LLVoiceClient::participantState::updateMuteState()
 {
-        if(p->mAvatarIDValid)
+        bool result = false;
+        
+        if(mAvatarIDValid)
         {
-                bool isMuted = LLMuteList::getInstance()->isMuted(p->mAvatarID, LLMute::flagVoiceChat);
-                if(p->mOnMuteList != isMuted)
+                bool isMuted = LLMuteList::getInstance()->isMuted(mAvatarID, LLMute::flagVoiceChat);
+                if(mOnMuteList != isMuted)
                 {
-                        p->mOnMuteList = isMuted;
-                        p->mVolumeDirty = true;
+                        mOnMuteList = isMuted;
                         mVolumeDirty = true;
+                        result = true;
                 }
         }
+        return result;
 }
 
-void LLVoiceClient::removeParticipant(LLVoiceClient::participantState *participant)
+void LLVoiceClient::sessionState::removeParticipant(LLVoiceClient::participantState *participant)
 {
         if(participant)
         {
-                participantMap::iterator iter = mParticipantMap.find(participant->mURI);
-                                
+                participantMap::iterator iter = mParticipantsByURI.find(&(participant->mURI));
+                participantUUIDMap::iterator iter2 = mParticipantsByUUID.find(&(participant->mAvatarID));
+                
                 LL_DEBUGS("Voice") << "participant \"" << participant->mURI <<  "\" (" << participant->mAvatarID << ") removed." << LL_ENDL;
-
-                mParticipantMap.erase(iter);
-                delete participant;
-                mParticipantMapChanged = true;
+                
+                if(iter == mParticipantsByURI.end())
+                {
+                        LL_ERRS("Voice") << "Internal error: participant " << participant->mURI << " not in URI map" << LL_ENDL;
+                }
+                else if(iter2 == mParticipantsByUUID.end())
+                {
+                        LL_ERRS("Voice") << "Internal error: participant ID " << participant->mAvatarID << " not in UUID map" << LL_ENDL;
+                }
+                else if(iter->second != iter2->second)
+                {
+                        LL_ERRS("Voice") << "Internal error: participant mismatch!" << LL_ENDL;
+                }
+                else
+                {
+                        mParticipantsByURI.erase(iter);
+                        mParticipantsByUUID.erase(iter2);
+                        
+                        delete participant;
+                        mParticipantsChanged = true;
+                }
         }
 }
 
-void LLVoiceClient::removeAllParticipants()
+void LLVoiceClient::sessionState::removeAllParticipants()
 {
         LL_DEBUGS("Voice") << "called" << LL_ENDL;
 
-        while(!mParticipantMap.empty())
+        while(!mParticipantsByURI.empty())
         {
-                removeParticipant(mParticipantMap.begin()->second);
+                removeParticipant(mParticipantsByURI.begin()->second);
+        }
+        
+        if(!mParticipantsByUUID.empty())
+        {
+                LL_ERRS("Voice") << "Internal error: empty URI map, non-empty UUID map" << LL_ENDL
         }
 }
 
 LLVoiceClient::participantMap *LLVoiceClient::getParticipantList(void)
 {
-        return &mParticipantMap;
+        participantMap *result = NULL;
+        if(mAudioSession)
+        {
+                result = &(mAudioSession->mParticipantsByURI);
+        }
+        return result;
 }
 
 
-LLVoiceClient::participantState *LLVoiceClient::findParticipant(const std::string &uri)
+LLVoiceClient::participantState *LLVoiceClient::sessionState::findParticipant(const std::string &uri)
 {
         participantState *result = NULL;
         
-        // Don't find any participants if we're not connected.  This is so that we don't continue to get stale data
-        // after the daemon dies.
-        if(mConnected)
+        participantMap::iterator iter = mParticipantsByURI.find(&uri);
+
+        if(iter == mParticipantsByURI.end())
         {
-                participantMap::iterator iter = mParticipantMap.find(uri);
-        
-                if(iter != mParticipantMap.end())
+                if(!mAlternateSIPURI.empty() && (uri == mAlternateSIPURI))
                 {
-                        result = iter->second;
+                        // This is a p2p session (probably with the SLIM client) with an alternate URI for the other participant.
+                        // Look up the other URI
+                        iter = mParticipantsByURI.find(&(mSIPURI));
                 }
         }
-                        
+
+        if(iter != mParticipantsByURI.end())
+        {
+                result = iter->second;
+        }
+                
         return result;
 }
 
-
-LLVoiceClient::participantState *LLVoiceClient::findParticipantByAvatar(LLVOAvatar *avatar)
+LLVoiceClient::participantState* LLVoiceClient::sessionState::findParticipantByID(const LLUUID& id)
 {
         participantState * result = NULL;
+        participantUUIDMap::iterator iter = mParticipantsByUUID.find(&id);
 
-        // You'd think this would work, but it doesn't...
-//      std::string uri = sipURIFromAvatar(avatar);
-        
-        // Currently, the URI is just the account name.
-        std::string loginName = nameFromAvatar(avatar);
-        result = findParticipant(loginName);
-        
-        if(result != NULL)
+        if(iter != mParticipantsByUUID.end())
         {
-                if(!result->mAvatarIDValid)
-                {
-                        result->mAvatarID = avatar->getID();
-                        result->mAvatarIDValid = true;
-                        
-                        // We just figured out the avatar ID, so the participant list has "changed" from the perspective of anyone who uses that to identify participants.
-                        mParticipantMapChanged = true;
-                        
-                        updateMuteState(result);
-                }
-                
-
+                result = iter->second;
         }
 
         return result;
@@ -3191,43 +4936,19 @@ LLVoiceClient::participantState *LLVoiceClient::findParticipantByAvatar(LLVOAvat
 LLVoiceClient::participantState* LLVoiceClient::findParticipantByID(const LLUUID& id)
 {
         participantState * result = NULL;
-
-        // Currently, the URI is just the account name.
-        std::string loginName = nameFromID(id);
-        result = findParticipant(loginName);
-
-        return result;
-}
-
-
-void LLVoiceClient::clearChannelMap(void)
-{
-        mChannelMap.clear();
-}
-
-void LLVoiceClient::addChannelMapEntry(std::string &name, std::string &uri)
-{
-        LL_DEBUGS("Voice") << "Adding channel name mapping: " << name << " -> " << uri << LL_ENDL;
-        mChannelMap.insert(channelMap::value_type(name, uri));
-}
-
-std::string LLVoiceClient::findChannelURI(std::string &name)
-{
-        std::string result;
         
-        channelMap::iterator iter = mChannelMap.find(name);
-
-        if(iter != mChannelMap.end())
+        if(mAudioSession)
         {
-                result = iter->second;
+                result = mAudioSession->findParticipantByID(id);
         }
         
         return result;
 }
 
+
 void LLVoiceClient::parcelChanged()
 {
-        if(getState() >= stateLoggedIn)
+        if(getState() >= stateNoChannel)
         {
                 // If the user is logged in, start a channel lookup.
                 LL_DEBUGS("Voice") << "sending ParcelVoiceInfoRequest (" << mCurrentRegionName << ", " << mCurrentParcelLocalID << ")" << LL_ENDL;
@@ -3241,7 +4962,7 @@ void LLVoiceClient::parcelChanged()
         }
         else
         {
-                // The transition to stateLoggedIn needs to kick this off again.
+                // The transition to stateNoChannel needs to kick this off again.
                 LL_INFOS("Voice") << "not logged in yet, deferring" << LL_ENDL;
         }
 }
@@ -3249,12 +4970,17 @@ void LLVoiceClient::parcelChanged()
 void LLVoiceClient::switchChannel(
         std::string uri,
         bool spatial,
-        bool noReconnect,
+        bool no_reconnect,
+        bool is_p2p,
         std::string hash)
 {
         bool needsSwitch = false;
         
-        LL_DEBUGS("Voice") << "called in state " << state2string(getState()) << " with uri \"" << uri << "\"" << LL_ENDL;
+        LL_DEBUGS("Voice") 
+                << "called in state " << state2string(getState()) 
+                << " with uri \"" << uri << "\"" 
+                << (spatial?", spatial is true":", spatial is false")
+                << LL_ENDL;
         
         switch(getState())
         {
@@ -3264,18 +4990,18 @@ void LLVoiceClient::switchChannel(
                         // Always switch to the new URI from these states.
                         needsSwitch = true;
                 break;
-                
+
                 default:
                         if(mSessionTerminateRequested)
                         {
                                 // If a terminate has been requested, we need to compare against where the URI we're already headed to.
-                                if(mNextSessionURI != uri)
+                                if(mNextAudioSession && (mNextAudioSession->mSIPURI != uri))
                                         needsSwitch = true;
                         }
                         else
                         {
                                 // Otherwise, compare against the URI we're in now.
-                                if(mSessionURI != uri)
+                                if(mAudioSession && (mAudioSession->mSIPURI != uri))
                                         needsSwitch = true;
                         }
                 break;
@@ -3283,22 +5009,28 @@ void LLVoiceClient::switchChannel(
         
         if(needsSwitch)
         {
-                mNextSessionURI = uri;
-                mNextSessionHash = hash;
-                mNextSessionHandle.clear();
-                mNextP2PSessionURI.clear();
-                mNextSessionSpatial = spatial;
-                mNextSessionNoReconnect = noReconnect;
-                
                 if(uri.empty())
                 {
                         // Leave any channel we may be in
                         LL_DEBUGS("Voice") << "leaving channel" << LL_ENDL;
+
+                        sessionState *oldSession = mNextAudioSession;
+                        mNextAudioSession = NULL;
+
+                        // The old session may now need to be deleted.
+                        reapSession(oldSession);
+
                         notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED);
                 }
                 else
                 {
                         LL_DEBUGS("Voice") << "switching to channel " << uri << LL_ENDL;
+
+                        mNextAudioSession = addSession(uri);
+                        mNextAudioSession->mHash = hash;
+                        mNextAudioSession->mIsSpatial = spatial;
+                        mNextAudioSession->mReconnect = !no_reconnect;
+                        mNextAudioSession->mIsP2P = is_p2p;
                 }
                 
                 if(getState() <= stateNoChannel)
@@ -3313,15 +5045,10 @@ void LLVoiceClient::switchChannel(
         }
 }
 
-void LLVoiceClient::joinSession(std::string handle, std::string uri)
+void LLVoiceClient::joinSession(sessionState *session)
 {
-        mNextSessionURI.clear();
-        mNextSessionHash.clear();
-        mNextP2PSessionURI = uri;
-        mNextSessionHandle = handle;
-        mNextSessionSpatial = false;
-        mNextSessionNoReconnect = false;
-
+        mNextAudioSession = session;
+        
         if(getState() <= stateNoChannel)
         {
                 // We're already set up to join a channel, just needed to fill in the session handle
@@ -3337,7 +5064,7 @@ void LLVoiceClient::setNonSpatialChannel(
         const std::string &uri,
         const std::string &credentials)
 {
-        switchChannel(uri, false, false, credentials);
+        switchChannel(uri, false, false, false, credentials);
 }
 
 void LLVoiceClient::setSpatialChannel(
@@ -3345,51 +5072,216 @@ void LLVoiceClient::setSpatialChannel(
         const std::string &credentials)
 {
         mSpatialSessionURI = uri;
+        mSpatialSessionCredentials = credentials;
         mAreaVoiceDisabled = mSpatialSessionURI.empty();
 
         LL_DEBUGS("Voice") << "got spatial channel uri: \"" << uri << "\"" << LL_ENDL;
         
-        if(mNonSpatialChannel || !mNextSessionSpatial)
+        if((mAudioSession && !(mAudioSession->mIsSpatial)) || (mNextAudioSession && !(mNextAudioSession->mIsSpatial)))
         {
                 // User is in a non-spatial chat or joining a non-spatial chat.  Don't switch channels.
                 LL_INFOS("Voice") << "in non-spatial chat, not switching channels" << LL_ENDL;
         }
         else
         {
-                switchChannel(mSpatialSessionURI, true, false, credentials);
+                switchChannel(mSpatialSessionURI, true, false, false, mSpatialSessionCredentials);
         }
 }
 
-void LLVoiceClient::callUser(LLUUID &uuid)
+void LLVoiceClient::callUser(const LLUUID &uuid)
 {
         std::string userURI = sipURIFromID(uuid);
 
-        switchChannel(userURI, false, true);
+        switchChannel(userURI, false, true, true);
+}
+
+LLVoiceClient::sessionState* LLVoiceClient::startUserIMSession(const LLUUID &uuid)
+{
+        // Figure out if a session with the user already exists
+        sessionState *session = findSession(uuid);
+        if(!session)
+        {
+                // No session with user, need to start one.
+                std::string uri = sipURIFromID(uuid);
+                session = addSession(uri);
+                session->mIsSpatial = false;
+                session->mReconnect = false;    
+                session->mIsP2P = true;
+                session->mCallerID = uuid;
+        }
+        
+        if(session)
+        {
+                if(session->mHandle.empty())
+                {
+                        // Session isn't active -- start it up.
+                        sessionCreateSendMessage(session, false, true);
+                }
+                else
+                {       
+                        // Session is already active -- start up text.
+                        sessionTextConnectSendMessage(session);
+                }
+        }
+        
+        return session;
+}
+
+bool LLVoiceClient::sendTextMessage(const LLUUID& participant_id, const std::string& message)
+{
+        bool result = false;
+
+        // Attempt to locate the indicated session
+        sessionState *session = startUserIMSession(participant_id);
+        if(session)
+        {
+                // found the session, attempt to send the message
+                session->mTextMsgQueue.push(message);
+                
+                // Try to send queued messages (will do nothing if the session is not open yet)
+                sendQueuedTextMessages(session);
+
+                // The message is queued, so we succeed.
+                result = true;
+        }       
+        else
+        {
+                LL_DEBUGS("Voice") << "Session not found for participant ID " << participant_id << LL_ENDL;
+        }
+        
+        return result;
+}
+
+void LLVoiceClient::sendQueuedTextMessages(sessionState *session)
+{
+        if(session->mTextStreamState == 1)
+        {
+                if(!session->mTextMsgQueue.empty())
+                {
+                        std::ostringstream stream;
+                        
+                        while(!session->mTextMsgQueue.empty())
+                        {
+                                std::string message = session->mTextMsgQueue.front();
+                                session->mTextMsgQueue.pop();
+                                stream
+                                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Session.SendMessage.1\">"
+                                        << "<SessionHandle>" << session->mHandle << "</SessionHandle>"
+                                        << "<MessageHeader>text/HTML</MessageHeader>"
+                                        << "<MessageBody>" << message << "</MessageBody>"
+                                << "</Request>"
+                                << "\n\n\n";
+                        }               
+                        writeString(stream.str());
+                }
+        }
+        else
+        {
+                // Session isn't connected yet, defer until later.
+        }
+}
+
+void LLVoiceClient::endUserIMSession(const LLUUID &uuid)
+{
+        // Figure out if a session with the user exists
+        sessionState *session = findSession(uuid);
+        if(session)
+        {
+                // found the session
+                if(!session->mHandle.empty())
+                {
+                        sessionTextDisconnectSendMessage(session);
+                }
+        }       
+        else
+        {
+                LL_DEBUGS("Voice") << "Session not found for participant ID " << uuid << LL_ENDL;
+        }
 }
 
-void LLVoiceClient::answerInvite(std::string &sessionHandle, LLUUID& other_user_id)
+bool LLVoiceClient::answerInvite(std::string &sessionHandle)
 {
-        joinSession(sessionHandle, sipURIFromID(other_user_id));
+        // this is only ever used to answer incoming p2p call invites.
+        
+        sessionState *session = findSession(sessionHandle);
+        if(session)
+        {
+                session->mIsSpatial = false;
+                session->mReconnect = false;    
+                session->mIsP2P = true;
+
+                joinSession(session);
+                return true;
+        }
+        
+        return false;
+}
+
+bool LLVoiceClient::isOnlineSIP(const LLUUID &id)
+{
+        bool result = false;
+        buddyListEntry *buddy = findBuddy(id);
+        if(buddy)
+        {
+                result = buddy->mOnlineSLim;
+                LL_DEBUGS("Voice") << "Buddy " << buddy->mDisplayName << " is SIP " << (result?"online":"offline") << LL_ENDL;
+        }
+
+        if(!result)
+        {
+                // This user isn't on the buddy list or doesn't show online status through the buddy list, but could be a participant in an existing session if they initiated a text IM.
+                sessionState *session = findSession(id);
+                if(session && !session->mHandle.empty())
+                {
+                        if((session->mTextStreamState != streamStateUnknown) || (session->mMediaStreamState > streamStateIdle))
+                        {
+                                LL_DEBUGS("Voice") << "Open session with " << id << " found, returning SIP online state" << LL_ENDL;
+                                // we have a p2p text session open with this user, so by definition they're online.
+                                result = true;
+                        }
+                }
+        }
+        
+        return result;
 }
 
 void LLVoiceClient::declineInvite(std::string &sessionHandle)
 {
-        sessionTerminateByHandle(sessionHandle);
+        sessionState *session = findSession(sessionHandle);
+        if(session)
+        {
+                sessionMediaDisconnectSendMessage(session);
+        }
 }
 
 void LLVoiceClient::leaveNonSpatialChannel()
 {
-        switchChannel(mSpatialSessionURI);
+        LL_DEBUGS("Voice") 
+                << "called in state " << state2string(getState()) 
+                << LL_ENDL;
+        
+        // Make sure we don't rejoin the current session.       
+        sessionState *oldNextSession = mNextAudioSession;
+        mNextAudioSession = NULL;
+        
+        // Most likely this will still be the current session at this point, but check it anyway.
+        reapSession(oldNextSession);
+        
+        verifySessionState();
+        
+        sessionTerminate();
 }
 
 std::string LLVoiceClient::getCurrentChannel()
 {
+        std::string result;
+        
         if((getState() == stateRunning) && !mSessionTerminateRequested)
         {
-                return mSessionURI;
+                result = getAudioSessionURI();
         }
         
-        return "";
+        return result;
 }
 
 bool LLVoiceClient::inProximalChannel()
@@ -3398,7 +5290,7 @@ bool LLVoiceClient::inProximalChannel()
         
         if((getState() == stateRunning) && !mSessionTerminateRequested)
         {
-                result = !mNonSpatialChannel;
+                result = inSpatialChannel();
         }
         
         return result;
@@ -3410,7 +5302,7 @@ std::string LLVoiceClient::sipURIFromID(const LLUUID &id)
         result = "sip:";
         result += nameFromID(id);
         result += "@";
-        result += mAccountServerName;
+        result += mVoiceSIPURIHostName;
         
         return result;
 }
@@ -3423,7 +5315,7 @@ std::string LLVoiceClient::sipURIFromAvatar(LLVOAvatar *avatar)
                 result = "sip:";
                 result += nameFromID(avatar->getID());
                 result += "@";
-                result += mAccountServerName;
+                result += mVoiceSIPURIHostName;
         }
         
         return result;
@@ -3442,6 +5334,13 @@ std::string LLVoiceClient::nameFromAvatar(LLVOAvatar *avatar)
 std::string LLVoiceClient::nameFromID(const LLUUID &uuid)
 {
         std::string result;
+        
+        if (uuid.isNull()) {
+                //VIVOX, the uuid emtpy look for the mURIString and return that instead.
+                //result.assign(uuid.mURIStringName);
+                LLStringUtil::replaceChar(result, '_', ' ');
+                return result;
+        }
         // Prepending this apparently prevents conflicts with reserved names inside the vivox and diamondware code.
         result = "x";
         
@@ -3455,13 +5354,24 @@ std::string LLVoiceClient::nameFromID(const LLUUID &uuid)
         // If you need to transform a GUID to this form on the Mac OS X command line, this will do so:
         // echo -n x && (echo e669132a-6c43-4ee1-a78d-6c82fff59f32 |xxd -r -p |openssl base64|tr '/+' '_-')
         
+        // The reverse transform can be done with:
+        // echo 'x5mkTKmxDTuGnjWyC__WfMg==' |cut -b 2- -|tr '_-' '/+' |openssl base64 -d|xxd -p
+        
         return result;
 }
 
-bool LLVoiceClient::IDFromName(const std::string name, LLUUID &uuid)
+bool LLVoiceClient::IDFromName(const std::string inName, LLUUID &uuid)
 {
         bool result = false;
         
+        // SLIM SDK: The "name" may actually be a SIP URI such as: "sip:xFnPP04IpREWNkuw1cOXlhw==@bhr.vivox.com"
+        // If it is, convert to a bare name before doing the transform.
+        std::string name = nameFromsipURI(inName);
+        
+        // Doesn't look like a SIP URI, assume it's an actual name.
+        if(name.empty())
+                name = inName;
+
         // This will only work if the name is of the proper form.
         // As an example, the account name for Monroe Linden (UUID 1673cfd3-8229-4445-8d92-ec3570e5e587) is:
         // "xFnPP04IpREWNkuw1cOXlhw=="
@@ -3483,6 +5393,13 @@ bool LLVoiceClient::IDFromName(const std::string name, LLUUID &uuid)
                         memcpy(uuid.mData, rawuuid, UUID_BYTES);
                         result = true;
                 }
+        } 
+        
+        if(!result)
+        {
+                // VIVOX:  not a standard account name, just copy the URI name mURIString field
+                // and hope for the best.  bpj
+                uuid.setNull();  // VIVOX, set the uuid field to nulls
         }
         
         return result;
@@ -3499,13 +5416,59 @@ std::string LLVoiceClient::sipURIFromName(std::string &name)
         result = "sip:";
         result += name;
         result += "@";
-        result += mAccountServerName;
+        result += mVoiceSIPURIHostName;
 
 //      LLStringUtil::toLower(result);
 
         return result;
 }
 
+std::string LLVoiceClient::nameFromsipURI(const std::string &uri)
+{
+        std::string result;
+
+        std::string::size_type sipOffset, atOffset;
+        sipOffset = uri.find("sip:");
+        atOffset = uri.find("@");
+        if((sipOffset != std::string::npos) && (atOffset != std::string::npos))
+        {
+                result = uri.substr(sipOffset + 4, atOffset - (sipOffset + 4));
+        }
+        
+        return result;
+}
+
+bool LLVoiceClient::inSpatialChannel(void)
+{
+        bool result = false;
+        
+        if(mAudioSession)
+                result = mAudioSession->mIsSpatial;
+                
+        return result;
+}
+
+std::string LLVoiceClient::getAudioSessionURI()
+{
+        std::string result;
+        
+        if(mAudioSession)
+                result = mAudioSession->mSIPURI;
+                
+        return result;
+}
+
+std::string LLVoiceClient::getAudioSessionHandle()
+{
+        std::string result;
+        
+        if(mAudioSession)
+                result = mAudioSession->mHandle;
+                
+        return result;
+}
+
+
 /////////////////////////////
 // Sending updates of current state
 
@@ -3544,7 +5507,8 @@ void LLVoiceClient::updatePosition(void)
                         LLMatrix3 rot;
                         LLVector3d pos;
 
-                        // MBW -- XXX -- Setting both camera and avatar velocity to 0 for now.  May figure it out later...
+                        // TODO: If camera and avatar velocity are actually used by the voice system, we could compute them here...
+                        // They're currently always set to zero.
 
                         // Send the current camera position to the voice code
                         rot.setRows(LLViewerCamera::getInstance()->getAtAxis(), LLViewerCamera::getInstance()->getLeftAxis (),  LLViewerCamera::getInstance()->getUpAxis());            
@@ -3559,7 +5523,7 @@ void LLVoiceClient::updatePosition(void)
                         rot = agent->getRootJoint()->getWorldRotation().getMatrix3();
         
                         pos = agent->getPositionGlobal();
-                        // MBW -- XXX -- Can we get the head offset from outside the LLVOAvatar?
+                        // TODO: Can we get the head offset from outside the LLVOAvatar?
 //                      pos += LLVector3d(mHeadOffset);
                         pos += LLVector3d(0.f, 0.f, 1.f);
                 
@@ -3665,8 +5629,8 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
                 }
                 else
                 {
-                        // for now, leave active channel, to auto join when turning voice back on
-                        //LLVoiceChannel::getCurrentVoiceChannel->deactivate();
+                        // Turning voice off looses your current channel -- this makes sure the UI isn't out of sync when you re-enable it.
+                        LLVoiceChannel::getCurrentVoiceChannel()->deactivate();
                 }
         }
 }
@@ -3746,56 +5710,34 @@ void LLVoiceClient::setEarLocation(S32 loc)
 
 void LLVoiceClient::setVoiceVolume(F32 volume)
 {
-        LL_DEBUGS("Voice") << "volume is " << volume << LL_ENDL;
+        int scaled_volume = scale_speaker_volume(volume);       
 
-        // incoming volume has the range [0.0 ... 1.0], with 0.5 as the default.
-        // Map it as follows: 0.0 -> -100, 0.5 -> 24, 1.0 -> 50
-        
-        volume -= 0.5f;         // offset volume to the range [-0.5 ... 0.5], with 0 at the default.
-        int scaledVolume = 24;  // offset scaledVolume by its default level
-        if(volume < 0.0f)
-                scaledVolume += ((int)(volume * 248.0f));       // (24 - (-100)) * 2
-        else
-                scaledVolume += ((int)(volume * 52.0f));        // (50 - 24) * 2
-        
-        if(scaledVolume != mSpeakerVolume)
+        if(scaled_volume != mSpeakerVolume)
         {
-                if((scaledVolume == -100) || (mSpeakerVolume == -100))
+                if((scaled_volume == 0) || (mSpeakerVolume == 0))
                 {
                         mSpeakerMuteDirty = true;
                 }
 
-                mSpeakerVolume = scaledVolume;
+                mSpeakerVolume = scaled_volume;
                 mSpeakerVolumeDirty = true;
         }
 }
 
 void LLVoiceClient::setMicGain(F32 volume)
 {
-        int scaledVolume = ((int)(volume * 100.0f)) - 100;
-        if(scaledVolume != mMicVolume)
+        int scaled_volume = scale_mic_volume(volume);
+        
+        if(scaled_volume != mMicVolume)
         {
-                mMicVolume = scaledVolume;
+                mMicVolume = scaled_volume;
                 mMicVolumeDirty = true;
         }
 }
 
-void LLVoiceClient::setVivoxDebugServerName(std::string &serverName)
-{
-        if(!mAccountServerName.empty())
-        {
-                // The name has been filled in already, which means we know whether we're connecting to agni or not.
-                if(!sConnectingToAgni)
-                {
-                        // Only use the setting if we're connecting to a development grid -- always use bhr when on agni.
-                        mAccountServerName = serverName;
-                }
-        }
-}
-
 void LLVoiceClient::keyDown(KEY key, MASK mask)
 {       
-        LL_DEBUGS("Voice") << "key is " << LLKeyboard::stringFromKey(key) << LL_ENDL;
+//      LL_DEBUGS("Voice") << "key is " << LLKeyboard::stringFromKey(key) << LL_ENDL;
 
         if (gKeyboard->getKeyRepeated(key))
         {
@@ -3933,19 +5875,6 @@ BOOL LLVoiceClient::getUsingPTT(const LLUUID& id)
         return result;
 }
 
-BOOL LLVoiceClient::getPTTPressed(const LLUUID& id)
-{
-        BOOL result = FALSE;
-        
-        participantState *participant = findParticipantByID(id);
-        if(participant)
-        {
-                result = participant->mPTT;
-        }
-        
-        return result;
-}
-
 BOOL LLVoiceClient::getOnMuteList(const LLUUID& id)
 {
         BOOL result = FALSE;
@@ -3977,144 +5906,841 @@ F32 LLVoiceClient::getUserVolume(const LLUUID& id)
 
 void LLVoiceClient::setUserVolume(const LLUUID& id, F32 volume)
 {
+        if(mAudioSession)
+        {
+                participantState *participant = findParticipantByID(id);
+                if (participant)
+                {
+                        // volume can amplify by as much as 4x!
+                        S32 ivol = (S32)(400.f * volume * volume);
+                        participant->mUserVolume = llclamp(ivol, 0, 400);
+                        participant->mVolumeDirty = TRUE;
+                        mAudioSession->mVolumeDirty = TRUE;
+                }
+        }
+}
+
+std::string LLVoiceClient::getGroupID(const LLUUID& id)
+{
+        std::string result;
+
         participantState *participant = findParticipantByID(id);
-        if (participant)
+        if(participant)
         {
-                // volume can amplify by as much as 4x!
-                S32 ivol = (S32)(400.f * volume * volume);
-                participant->mUserVolume = llclamp(ivol, 0, 400);
-                participant->mVolumeDirty = TRUE;
-                mVolumeDirty = TRUE;
+                result = participant->mGroupID;
         }
+        
+        return result;
 }
 
+BOOL LLVoiceClient::getAreaVoiceDisabled()
+{
+        return mAreaVoiceDisabled;
+}
+
+void LLVoiceClient::recordingLoopStart(int seconds, int deltaFramesPerControlFrame)
+{
+//      LL_DEBUGS("Voice") << "sending SessionGroup.ControlRecording (Start)" << LL_ENDL;
+        
+        if(!mMainSessionGroupHandle.empty())
+        {
+                std::ostringstream stream;
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.ControlRecording.1\">"
+                << "<SessionGroupHandle>" << mMainSessionGroupHandle << "</SessionGroupHandle>"
+                << "<RecordingControlType>Start</RecordingControlType>" 
+                << "<DeltaFramesPerControlFrame>" << deltaFramesPerControlFrame << "</DeltaFramesPerControlFrame>"
+                << "<Filename>" << "" << "</Filename>"
+                << "<EnableAudioRecordingEvents>false</EnableAudioRecordingEvents>"
+                << "<LoopModeDurationSeconds>" << seconds << "</LoopModeDurationSeconds>"
+                << "</Request>\n\n\n";
 
 
-LLVoiceClient::serviceType LLVoiceClient::getServiceType(const LLUUID& id)
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::recordingLoopSave(const std::string& filename)
 {
-        serviceType result = serviceTypeUnknown;
+//      LL_DEBUGS("Voice") << "sending SessionGroup.ControlRecording (Flush)" << LL_ENDL;
 
-        participantState *participant = findParticipantByID(id);
-        if(participant)
+        if(mAudioSession != NULL && !mAudioSession->mGroupHandle.empty())
+        {
+                std::ostringstream stream;
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.ControlRecording.1\">"
+                << "<SessionGroupHandle>" << mMainSessionGroupHandle << "</SessionGroupHandle>"
+                << "<RecordingControlType>Flush</RecordingControlType>" 
+                << "<Filename>" << filename << "</Filename>"
+                << "</Request>\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::recordingStop()
+{
+//      LL_DEBUGS("Voice") << "sending SessionGroup.ControlRecording (Stop)" << LL_ENDL;
+
+        if(mAudioSession != NULL && !mAudioSession->mGroupHandle.empty())
+        {
+                std::ostringstream stream;
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.ControlRecording.1\">"
+                << "<SessionGroupHandle>" << mMainSessionGroupHandle << "</SessionGroupHandle>"
+                << "<RecordingControlType>Stop</RecordingControlType>" 
+                << "</Request>\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::filePlaybackStart(const std::string& filename)
+{
+//      LL_DEBUGS("Voice") << "sending SessionGroup.ControlPlayback (Start)" << LL_ENDL;
+
+        if(mAudioSession != NULL && !mAudioSession->mGroupHandle.empty())
+        {
+                std::ostringstream stream;
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.ControlPlayback.1\">"
+                << "<SessionGroupHandle>" << mMainSessionGroupHandle << "</SessionGroupHandle>"
+                << "<RecordingControlType>Start</RecordingControlType>" 
+                << "<Filename>" << filename << "</Filename>"
+                << "</Request>\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::filePlaybackStop()
+{
+//      LL_DEBUGS("Voice") << "sending SessionGroup.ControlPlayback (Stop)" << LL_ENDL;
+
+        if(mAudioSession != NULL && !mAudioSession->mGroupHandle.empty())
         {
-                result = participant->mServiceType;
+                std::ostringstream stream;
+                stream
+                << "<Request requestId=\"" << mCommandCookie++ << "\" action=\"SessionGroup.ControlPlayback.1\">"
+                << "<SessionGroupHandle>" << mMainSessionGroupHandle << "</SessionGroupHandle>"
+                << "<RecordingControlType>Stop</RecordingControlType>" 
+                << "</Request>\n\n\n";
+
+                writeString(stream.str());
+        }
+}
+
+void LLVoiceClient::filePlaybackSetPaused(bool paused)
+{
+        // TODO: Implement once Vivox gives me a sample
+}
+
+void LLVoiceClient::filePlaybackSetMode(bool vox, float speed)
+{
+        // TODO: Implement once Vivox gives me a sample
+}
+
+LLVoiceClient::sessionState::sessionState() :
+        mMediaStreamState(streamStateUnknown),
+        mTextStreamState(streamStateUnknown),
+        mCreateInProgress(false),
+        mMediaConnectInProgress(false),
+        mVoiceInvitePending(false),
+        mTextInvitePending(false),
+        mSynthesizedCallerID(false),
+        mIsChannel(false),
+        mIsSpatial(false),
+        mIsP2P(false),
+        mIncoming(false),
+        mVoiceEnabled(false),
+        mReconnect(false),
+        mVolumeDirty(false),
+        mParticipantsChanged(false)
+{
+}
+
+LLVoiceClient::sessionState::~sessionState()
+{
+        removeAllParticipants();
+}
+
+LLVoiceClient::sessionIterator LLVoiceClient::sessionsBegin(void)
+{
+        return mSessions.begin();
+}
+
+LLVoiceClient::sessionIterator LLVoiceClient::sessionsEnd(void)
+{
+        return mSessions.end();
+}
+
+
+LLVoiceClient::sessionState *LLVoiceClient::findSession(const std::string &handle)
+{
+        sessionState *result = NULL;
+        sessionMap::iterator iter = mSessionsByHandle.find(&handle);
+        if(iter != mSessionsByHandle.end())
+        {
+                result = iter->second;
         }
         
         return result;
 }
 
-std::string LLVoiceClient::getGroupID(const LLUUID& id)
+LLVoiceClient::sessionState *LLVoiceClient::findSessionBeingCreatedByURI(const std::string &uri)
+{       
+        sessionState *result = NULL;
+        for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
+        {
+                sessionState *session = *iter;
+                if(session->mCreateInProgress && (session->mSIPURI == uri))
+                {
+                        result = session;
+                        break;
+                }
+        }
+        
+        return result;
+}
+
+LLVoiceClient::sessionState *LLVoiceClient::findSession(const LLUUID &participant_id)
 {
-        std::string result;
+        sessionState *result = NULL;
+        
+        for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
+        {
+                sessionState *session = *iter;
+                if(session->mCallerID == participant_id)
+                {
+                        result = session;
+                        break;
+                }
+        }
+        
+        return result;
+}
 
-        participantState *participant = findParticipantByID(id);
-        if(participant)
+LLVoiceClient::sessionState *LLVoiceClient::addSession(const std::string &uri, const std::string &handle)
+{
+        sessionState *result = NULL;
+        
+        if(handle.empty())
         {
-                result = participant->mGroupID;
+                // No handle supplied.
+                // Check whether there's already a session with this URI
+                for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
+                {
+                        sessionState *s = *iter;
+                        if((s->mSIPURI == uri) || (s->mAlternateSIPURI == uri))
+                        {
+                                // TODO: I need to think about this logic... it's possible that this case should raise an internal error.
+                                result = s;
+                                break;
+                        }
+                }
+        }
+        else // (!handle.empty())
+        {
+                // Check for an existing session with this handle
+                sessionMap::iterator iter = mSessionsByHandle.find(&handle);
+                
+                if(iter != mSessionsByHandle.end())
+                {
+                        result = iter->second;
+                }
+        }
+
+        if(!result)
+        {
+                // No existing session found.
+                
+                LL_DEBUGS("Voice") << "adding new session: handle " << handle << " URI " << uri << LL_ENDL;
+                result = new sessionState();
+                result->mSIPURI = uri;
+                result->mHandle = handle;
+                
+                mSessions.insert(result);
+
+                if(!result->mHandle.empty())
+                {
+                        mSessionsByHandle.insert(sessionMap::value_type(&(result->mHandle), result));
+                }
+        }
+        else
+        {
+                // Found an existing session
+                
+                if(uri != result->mSIPURI)
+                {
+                        // TODO: Should this be an internal error?
+                        LL_DEBUGS("Voice") << "changing uri from " << result->mSIPURI << " to " << uri << LL_ENDL;
+                        setSessionURI(result, uri);
+                }
+
+                if(handle != result->mHandle)
+                {
+                        // TODO: Should this be an internal error?
+                        LL_DEBUGS("Voice") << "changing handle from " << result->mHandle << " to " << handle << LL_ENDL;
+                        setSessionHandle(result, handle);
+                }
+                
+                LL_DEBUGS("Voice") << "returning existing session: handle " << handle << " URI " << uri << LL_ENDL;
+        }
+
+        verifySessionState();
+                
+        return result;
+}
+
+void LLVoiceClient::setSessionHandle(sessionState *session, const std::string &handle)
+{
+        // Have to remove the session from the handle-indexed map before changing the handle, or things will break badly.
+        
+        if(!session->mHandle.empty())
+        {
+                // Remove session from the map if it should have been there.
+                sessionMap::iterator iter = mSessionsByHandle.find(&(session->mHandle));
+                if(iter != mSessionsByHandle.end())
+                {
+                        if(iter->second != session)
+                        {
+                                LL_ERRS("Voice") << "Internal error: session mismatch!" << LL_ENDL;
+                        }
+
+                        mSessionsByHandle.erase(iter);
+                }
+                else
+                {
+                        LL_ERRS("Voice") << "Internal error: session handle not found in map!" << LL_ENDL;
+                }
+        }
+                        
+        session->mHandle = handle;
+
+        if(!handle.empty())
+        {
+                mSessionsByHandle.insert(sessionMap::value_type(&(session->mHandle), session));
+        }
+
+        verifySessionState();
+}
+
+void LLVoiceClient::setSessionURI(sessionState *session, const std::string &uri)
+{
+        // There used to be a map of session URIs to sessions, which made this complex....
+        session->mSIPURI = uri;
+
+        verifySessionState();
+}
+
+void LLVoiceClient::deleteSession(sessionState *session)
+{
+        // Remove the session from the handle map
+        if(!session->mHandle.empty())
+        {
+                sessionMap::iterator iter = mSessionsByHandle.find(&(session->mHandle));
+                if(iter != mSessionsByHandle.end())
+                {
+                        if(iter->second != session)
+                        {
+                                LL_ERRS("Voice") << "Internal error: session mismatch" << LL_ENDL
+                        }
+                        mSessionsByHandle.erase(iter);
+                }
+        }
+
+        // Remove the session from the URI map
+        mSessions.erase(session);
+        
+        // At this point, the session should be unhooked from all lists and all state should be consistent.
+        verifySessionState();
+
+        // If this is the current audio session, clean up the pointer which will soon be dangling.
+        if(mAudioSession == session)
+        {
+                mAudioSession = NULL;
+                mAudioSessionChanged = true;
+        }
+
+        // ditto for the next audio session
+        if(mNextAudioSession == session)
+        {
+                mNextAudioSession = NULL;
+        }
+
+        // delete the session
+        delete session;
+}
+
+void LLVoiceClient::deleteAllSessions()
+{
+        LL_DEBUGS("Voice") << "called" << LL_ENDL;
+
+        while(!mSessions.empty())
+        {
+                deleteSession(*(sessionsBegin()));
+        }
+        
+        if(!mSessionsByHandle.empty())
+        {
+                LL_ERRS("Voice") << "Internal error: empty session map, non-empty handle map" << LL_ENDL
+        }
+}
+
+void LLVoiceClient::verifySessionState(void)
+{
+        // This is mostly intended for debugging problems with session state management.
+        LL_DEBUGS("Voice") << "Total session count: " << mSessions.size() << " , session handle map size: " << mSessionsByHandle.size() << LL_ENDL;
+
+        for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
+        {
+                sessionState *session = *iter;
+
+                LL_DEBUGS("Voice") << "session " << session << ": handle " << session->mHandle << ", URI " << session->mSIPURI << LL_ENDL;
+                
+                if(!session->mHandle.empty())
+                {
+                        // every session with a non-empty handle needs to be in the handle map
+                        sessionMap::iterator i2 = mSessionsByHandle.find(&(session->mHandle));
+                        if(i2 == mSessionsByHandle.end())
+                        {
+                                LL_ERRS("Voice") << "internal error (handle " << session->mHandle << " not found in session map)" << LL_ENDL;
+                        }
+                        else
+                        {
+                                if(i2->second != session)
+                                {
+                                        LL_ERRS("Voice") << "internal error (handle " << session->mHandle << " in session map points to another session)" << LL_ENDL;
+                                }
+                        }
+                }
+        }
+                
+        // check that every entry in the handle map points to a valid session in the session set
+        for(sessionMap::iterator iter = mSessionsByHandle.begin(); iter != mSessionsByHandle.end(); iter++)
+        {
+                sessionState *session = iter->second;
+                sessionIterator i2 = mSessions.find(session);
+                if(i2 == mSessions.end())
+                {
+                        LL_ERRS("Voice") << "internal error (session for handle " << session->mHandle << " not found in session map)" << LL_ENDL;
+                }
+                else
+                {
+                        if(session->mHandle != (*i2)->mHandle)
+                        {
+                                LL_ERRS("Voice") << "internal error (session for handle " << session->mHandle << " points to session with different handle " << (*i2)->mHandle << ")" << LL_ENDL;
+                        }
+                }
+        }
+}
+
+LLVoiceClient::buddyListEntry::buddyListEntry(const std::string &uri) :
+        mURI(uri)
+{
+        mOnlineSL = false;
+        mOnlineSLim = false;
+        mCanSeeMeOnline = true;
+        mHasBlockListEntry = false;
+        mHasAutoAcceptListEntry = false;
+        mNameResolved = false;
+        mInVivoxBuddies = false;
+        mInSLFriends = false;
+        mNeedsNameUpdate = false;
+}
+
+void LLVoiceClient::processBuddyListEntry(const std::string &uri, const std::string &displayName)
+{
+        buddyListEntry *buddy = addBuddy(uri, displayName);
+        buddy->mInVivoxBuddies = true;  
+}
+
+LLVoiceClient::buddyListEntry *LLVoiceClient::addBuddy(const std::string &uri)
+{
+        std::string empty;
+        buddyListEntry *buddy = addBuddy(uri, empty);
+        if(buddy->mDisplayName.empty())
+        {
+                buddy->mNameResolved = false;
+        }
+        return buddy;
+}
+
+LLVoiceClient::buddyListEntry *LLVoiceClient::addBuddy(const std::string &uri, const std::string &displayName)
+{
+        buddyListEntry *result = NULL;
+        buddyListMap::iterator iter = mBuddyListMap.find(&uri);
+        
+        if(iter != mBuddyListMap.end())
+        {
+                // Found a matching buddy already in the map.
+                LL_DEBUGS("Voice") << "adding existing buddy " << uri << LL_ENDL;
+                result = iter->second;
+        }
+
+        if(!result)
+        {
+                // participant isn't already in one list or the other.
+                LL_DEBUGS("Voice") << "adding new buddy " << uri << LL_ENDL;
+                result = new buddyListEntry(uri);
+                result->mDisplayName = displayName;
+
+                if(IDFromName(uri, result->mUUID)) 
+                {
+                        // Extracted UUID from name successfully.
+                }
+                else
+                {
+                        LL_DEBUGS("Voice") << "Couldn't find ID for buddy " << uri << " (\"" << displayName << "\")" << LL_ENDL;
+                }
+
+                mBuddyListMap.insert(buddyListMap::value_type(&(result->mURI), result));
         }
         
         return result;
 }
 
-BOOL LLVoiceClient::getAreaVoiceDisabled()
+LLVoiceClient::buddyListEntry *LLVoiceClient::findBuddy(const std::string &uri)
 {
-        return mAreaVoiceDisabled;
+        buddyListEntry *result = NULL;
+        buddyListMap::iterator iter = mBuddyListMap.find(&uri);
+        if(iter != mBuddyListMap.end())
+        {
+                result = iter->second;
+        }
+        
+        return result;
+}
+
+LLVoiceClient::buddyListEntry *LLVoiceClient::findBuddy(const LLUUID &id)
+{
+        buddyListEntry *result = NULL;
+        buddyListMap::iterator iter;
+
+        for(iter = mBuddyListMap.begin(); iter != mBuddyListMap.end(); iter++)
+        {
+                if(iter->second->mUUID == id)
+                {
+                        result = iter->second;
+                        break;
+                }
+        }
+        
+        return result;
+}
+
+LLVoiceClient::buddyListEntry *LLVoiceClient::findBuddyByDisplayName(const std::string &name)
+{
+        buddyListEntry *result = NULL;
+        buddyListMap::iterator iter;
+
+        for(iter = mBuddyListMap.begin(); iter != mBuddyListMap.end(); iter++)
+        {
+                if(iter->second->mDisplayName == name)
+                {
+                        result = iter->second;
+                        break;
+                }
+        }
+        
+        return result;
+}
+
+void LLVoiceClient::deleteBuddy(const std::string &uri)
+{
+        buddyListMap::iterator iter = mBuddyListMap.find(&uri);
+        if(iter != mBuddyListMap.end())
+        {
+                LL_DEBUGS("Voice") << "deleting buddy " << uri << LL_ENDL;
+                buddyListEntry *buddy = iter->second;
+                mBuddyListMap.erase(iter);
+                delete buddy;
+        }
+        else
+        {
+                LL_DEBUGS("Voice") << "attempt to delete nonexistent buddy " << uri << LL_ENDL;
+        }
+        
+}
+
+void LLVoiceClient::deleteAllBuddies(void)
+{
+        while(!mBuddyListMap.empty())
+        {
+                deleteBuddy(*(mBuddyListMap.begin()->first));
+        }
+        
+        // Don't want to correlate with friends list when we've emptied the buddy list.
+        mBuddyListMapPopulated = false;
+        
+        // Don't want to correlate with friends list when we've reset the block rules.
+        mBlockRulesListReceived = false;
+        mAutoAcceptRulesListReceived = false;
+}
+
+void LLVoiceClient::deleteAllBlockRules(void)
+{
+        // Clear the block list entry flags from all local buddy list entries
+        buddyListMap::iterator buddy_it;
+        for(buddy_it = mBuddyListMap.begin(); buddy_it != mBuddyListMap.end(); buddy_it++)
+        {
+                buddy_it->second->mHasBlockListEntry = false;
+        }
+}
+
+void LLVoiceClient::deleteAllAutoAcceptRules(void)
+{
+        // Clear the auto-accept list entry flags from all local buddy list entries
+        buddyListMap::iterator buddy_it;
+        for(buddy_it = mBuddyListMap.begin(); buddy_it != mBuddyListMap.end(); buddy_it++)
+        {
+                buddy_it->second->mHasAutoAcceptListEntry = false;
+        }
+}
+
+void LLVoiceClient::addBlockRule(const std::string &blockMask, const std::string &presenceOnly)
+{
+        buddyListEntry *buddy = NULL;
+
+        // blockMask is the SIP URI of a friends list entry
+        buddyListMap::iterator iter = mBuddyListMap.find(&blockMask);
+        if(iter != mBuddyListMap.end())
+        {
+                LL_DEBUGS("Voice") << "block list entry for " << blockMask << LL_ENDL;
+                buddy = iter->second;
+        }
+
+        if(buddy == NULL)
+        {
+                LL_DEBUGS("Voice") << "block list entry for unknown buddy " << blockMask << LL_ENDL;
+                buddy = addBuddy(blockMask);
+        }
+        
+        if(buddy != NULL)
+        {
+                buddy->mHasBlockListEntry = true;
+        }
+}
+
+void LLVoiceClient::addAutoAcceptRule(const std::string &autoAcceptMask, const std::string &autoAddAsBuddy)
+{
+        buddyListEntry *buddy = NULL;
+
+        // blockMask is the SIP URI of a friends list entry
+        buddyListMap::iterator iter = mBuddyListMap.find(&autoAcceptMask);
+        if(iter != mBuddyListMap.end())
+        {
+                LL_DEBUGS("Voice") << "auto-accept list entry for " << autoAcceptMask << LL_ENDL;
+                buddy = iter->second;
+        }
+
+        if(buddy == NULL)
+        {
+                LL_DEBUGS("Voice") << "auto-accept list entry for unknown buddy " << autoAcceptMask << LL_ENDL;
+                buddy = addBuddy(autoAcceptMask);
+        }
+
+        if(buddy != NULL)
+        {
+                buddy->mHasAutoAcceptListEntry = true;
+        }
+}
+
+void LLVoiceClient::accountListBlockRulesResponse(int statusCode, const std::string &statusString)
+{
+        // Block list entries were updated via addBlockRule() during parsing.  Just flag that we're done.
+        mBlockRulesListReceived = true;
+}
+
+void LLVoiceClient::accountListAutoAcceptRulesResponse(int statusCode, const std::string &statusString)
+{
+        // Block list entries were updated via addBlockRule() during parsing.  Just flag that we're done.
+        mAutoAcceptRulesListReceived = true;
 }
 
 void LLVoiceClient::addObserver(LLVoiceClientParticipantObserver* observer)
 {
-        mObservers.insert(observer);
+        mParticipantObservers.insert(observer);
 }
 
 void LLVoiceClient::removeObserver(LLVoiceClientParticipantObserver* observer)
 {
-        mObservers.erase(observer);
+        mParticipantObservers.erase(observer);
 }
 
-void LLVoiceClient::notifyObservers()
+void LLVoiceClient::notifyParticipantObservers()
 {
-        for (observer_set_t::iterator it = mObservers.begin();
-                it != mObservers.end();
+        for (observer_set_t::iterator it = mParticipantObservers.begin();
+                it != mParticipantObservers.end();
                 )
         {
                 LLVoiceClientParticipantObserver* observer = *it;
                 observer->onChange();
                 // In case onChange() deleted an entry.
-                it = mObservers.upper_bound(observer);
+                it = mParticipantObservers.upper_bound(observer);
         }
 }
 
-void LLVoiceClient::addStatusObserver(LLVoiceClientStatusObserver* observer)
+void LLVoiceClient::addObserver(LLVoiceClientStatusObserver* observer)
 {
         mStatusObservers.insert(observer);
 }
 
-void LLVoiceClient::removeStatusObserver(LLVoiceClientStatusObserver* observer)
+void LLVoiceClient::removeObserver(LLVoiceClientStatusObserver* observer)
 {
         mStatusObservers.erase(observer);
 }
 
 void LLVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::EStatusType status)
 {
-        if(status == LLVoiceClientStatusObserver::ERROR_UNKNOWN)
+        if(mAudioSession)
         {
-                switch(mVivoxErrorStatusCode)
+                if(status == LLVoiceClientStatusObserver::ERROR_UNKNOWN)
                 {
-                case 20713:             status = LLVoiceClientStatusObserver::ERROR_CHANNEL_FULL;               break;
-                case 20714:             status = LLVoiceClientStatusObserver::ERROR_CHANNEL_LOCKED;     break;
-                case 20715:
-                        //invalid channel, we may be using a set of poorly cached
-                        //info
-                        status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
-                        break;
-                case 1009:
-                        //invalid username and password
-                        status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
-                        break;
-                }
-
-                // Reset the error code to make sure it won't be reused later by accident.
-                mVivoxErrorStatusCode = 0;
-        }
-        
-        if (status == LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL 
-                //NOT_FOUND || TEMPORARILY_UNAVAILABLE || REQUEST_TIMEOUT
-                && (mVivoxErrorStatusCode == 404 || mVivoxErrorStatusCode == 480 || mVivoxErrorStatusCode == 408)) 
-        {
-                // call failed because other user was not available
-                // treat this as an error case
-                status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
+                        switch(mAudioSession->mErrorStatusCode)
+                        {
+                                case 20713:             status = LLVoiceClientStatusObserver::ERROR_CHANNEL_FULL;               break;
+                                case 20714:             status = LLVoiceClientStatusObserver::ERROR_CHANNEL_LOCKED;     break;
+                                case 20715:
+                                        //invalid channel, we may be using a set of poorly cached
+                                        //info
+                                        status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
+                                        break;
+                                case 1009:
+                                        //invalid username and password
+                                        status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
+                                        break;
+                        }
 
-                // Reset the error code to make sure it won't be reused later by accident.
-                mVivoxErrorStatusCode = 0;
+                        // Reset the error code to make sure it won't be reused later by accident.
+                        mAudioSession->mErrorStatusCode = 0;
+                }
+                else if(status == LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL)
+                {
+                        switch(mAudioSession->mErrorStatusCode)
+                        {
+                                case 404:       // NOT_FOUND
+                                case 480:       // TEMPORARILY_UNAVAILABLE
+                                case 408:       // REQUEST_TIMEOUT
+                                        // call failed because other user was not available
+                                        // treat this as an error case
+                                        status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE;
+
+                                        // Reset the error code to make sure it won't be reused later by accident.
+                                        mAudioSession->mErrorStatusCode = 0;
+                                break;
+                        }
+                }
         }
-        
-        LL_DEBUGS("Voice") << " " << LLVoiceClientStatusObserver::status2string(status)  << ", session URI " << mSessionURI << LL_ENDL;
+                
+        LL_DEBUGS("Voice") 
+                << " " << LLVoiceClientStatusObserver::status2string(status)  
+                << ", session URI " << getAudioSessionURI() 
+                << (inSpatialChannel()?", proximal is true":", proximal is false")
+        << LL_ENDL;
 
         for (status_observer_set_t::iterator it = mStatusObservers.begin();
                 it != mStatusObservers.end();
                 )
         {
                 LLVoiceClientStatusObserver* observer = *it;
-                observer->onChange(status, mSessionURI, !mNonSpatialChannel);
+                observer->onChange(status, getAudioSessionURI(), inSpatialChannel());
                 // In case onError() deleted an entry.
                 it = mStatusObservers.upper_bound(observer);
         }
 
 }
 
+void LLVoiceClient::addObserver(LLFriendObserver* observer)
+{
+        mFriendObservers.insert(observer);
+}
+
+void LLVoiceClient::removeObserver(LLFriendObserver* observer)
+{
+        mFriendObservers.erase(observer);
+}
+
+void LLVoiceClient::notifyFriendObservers()
+{
+        for (friend_observer_set_t::iterator it = mFriendObservers.begin();
+                it != mFriendObservers.end();
+                )
+        {
+                LLFriendObserver* observer = *it;
+                it++;
+                // The only friend-related thing we notify on is online/offline transitions.
+                observer->changed(LLFriendObserver::ONLINE);
+        }
+}
+
+void LLVoiceClient::lookupName(const LLUUID &id)
+{
+        gCacheName->getName(id, onAvatarNameLookup);
+}
+
 //static
-// void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
-// {
-//      participantState* statep = gVoiceClient->findParticipantByID(id);
+void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
+{
+        if(gVoiceClient)
+        {
+                std::string name = llformat("%s %s", first.c_str(), last.c_str());
+                gVoiceClient->avatarNameResolved(id, name);
+        }
+}
 
-//      if (statep)
-//      {
-//              statep->mDisplayName = first + " " + last;
-//      }
+void LLVoiceClient::avatarNameResolved(const LLUUID &id, const std::string &name)
+{
+        // If the avatar whose name just resolved is on our friends list, resync the friends list.
+        if(LLAvatarTracker::instance().getBuddyInfo(id) != NULL)
+        {
+                mFriendsListDirty = true;
+        }
         
-//      gVoiceClient->notifyObservers();
-// }
+        // Iterate over all sessions.
+        for(sessionIterator iter = sessionsBegin(); iter != sessionsEnd(); iter++)
+        {
+                sessionState *session = *iter;
+
+                // Check for this user as a participant in this session
+                participantState *participant = session->findParticipantByID(id);
+                if(participant)
+                {
+                        // Found -- fill in the name
+                        participant->mAccountName = name;
+                        // and post a "participants updated" message to listeners later.
+                        session->mParticipantsChanged = true;
+                }
+                
+                // Check whether this is a p2p session whose caller name just resolved
+                if(session->mCallerID == id)
+                {
+                        // this session's "caller ID" just resolved.  Fill in the name.
+                        session->mName = name;
+                        if(session->mTextInvitePending)
+                        {
+                                session->mTextInvitePending = false;
+
+                                // We don't need to call gIMMgr->addP2PSession() here.  The first incoming message will create the panel.                               
+                        }
+                        if(session->mVoiceInvitePending)
+                        {
+                                session->mVoiceInvitePending = false;
+
+                                gIMMgr->inviteToSession(
+                                        session->mIMSessionID,
+                                        session->mName,
+                                        session->mCallerID, 
+                                        session->mName, 
+                                        IM_SESSION_P2P_INVITE, 
+                                        LLIMMgr::INVITATION_TYPE_VOICE,
+                                        session->mHandle,
+                                        session->mSIPURI);
+                        }
+                        
+                }
+        }
+}
 
 class LLViewerParcelVoiceInfo : public LLHTTPNode
 {
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 2220d59..13dd974 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -41,6 +41,7 @@ class LLVivoxProtocolParser;
 #include "v3math.h"
 #include "llframetimer.h"
 #include "llviewerregion.h"
+#include "llcallingcard.h"   // for LLFriendObserver
 
 class LLVoiceClientParticipantObserver
 {
@@ -91,41 +92,10 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
 
         public:
                 
-                enum serviceType
-                {
-                        serviceTypeUnknown,     // Unknown, returned if no data on the avatar is available
-                        serviceTypeA,           // spatialized local chat
-                        serviceTypeB,           // remote multi-party chat
-                        serviceTypeC            // one-to-one and small group chat
-                };
                 static F32 OVERDRIVEN_POWER_LEVEL;
 
                 void updateSettings(); // call after loading settings and whenever they change
         
-                /////////////////////////////
-                // session control messages
-                void connect();
-
-                void connectorCreate();
-                void connectorShutdown();
-
-                void requestVoiceAccountProvision(S32 retries = 3);
-                void userAuthorized(
-                        const std::string& firstName,
-                        const std::string& lastName,
-                        const LLUUID &agentID);
-                void login(const std::string& accountName, const std::string &password);
-                void loginSendMessage();
-                void logout();
-                void logoutSendMessage();
-                
-                void channelGetListSendMessage();
-                void sessionCreateSendMessage();
-                void sessionConnectSendMessage();
-                void sessionTerminate();
-                void sessionTerminateSendMessage();
-                void sessionTerminateByHandle(std::string &sessionHandle);
-                
                 void getCaptureDevicesSendMessage();
                 void getRenderDevicesSendMessage();
                 
@@ -170,23 +140,32 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                 
                 /////////////////////////////
                 // Response/Event handlers
-                void connectorCreateResponse(int statusCode, std::string &statusString, std::string &connectorHandle);
-                void loginResponse(int statusCode, std::string &statusString, std::string &accountHandle);
-                void channelGetListResponse(int statusCode, std::string &statusString);
-                void sessionCreateResponse(int statusCode, std::string &statusString, std::string &sessionHandle);
-                void sessionConnectResponse(int statusCode, std::string &statusString);
-                void sessionTerminateResponse(int statusCode, std::string &statusString);
+                void connectorCreateResponse(int statusCode, std::string &statusString, std::string &connectorHandle, std::string &versionID);
+                void loginResponse(int statusCode, std::string &statusString, std::string &accountHandle, int numberOfAliases);
+                void sessionCreateResponse(std::string &requestId, int statusCode, std::string &statusString, std::string &sessionHandle);
+                void sessionGroupAddSessionResponse(std::string &requestId, int statusCode, std::string &statusString, std::string &sessionHandle);
+                void sessionConnectResponse(std::string &requestId, int statusCode, std::string &statusString);
                 void logoutResponse(int statusCode, std::string &statusString);
                 void connectorShutdownResponse(int statusCode, std::string &statusString);
 
-                void loginStateChangeEvent(std::string &accountHandle, int statusCode, std::string &statusString, int state);
-                void sessionNewEvent(std::string &accountHandle, std::string &eventSessionHandle, int state, std::string &nameString, std::string &uriString);
-                void sessionStateChangeEvent(std::string &uriString, int statusCode, std::string &statusString, std::string &sessionHandle, int state,  bool isChannel, std::string &nameString);
-                void participantStateChangeEvent(std::string &uriString, int statusCode, std::string &statusString, int state,  std::string &nameString, std::string &displayNameString, int participantType);
-                void participantPropertiesEvent(std::string &uriString, int statusCode, std::string &statusString, bool isLocallyMuted, bool isModeratorMuted, bool isSpeaking, int volume, F32 energy);
+                void accountLoginStateChangeEvent(std::string &accountHandle, int statusCode, std::string &statusString, int state);
+                void mediaStreamUpdatedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, int statusCode, std::string &statusString, int state, bool incoming);
+                void textStreamUpdatedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, bool enabled, int state, bool incoming);
+                void sessionAddedEvent(std::string &uriString, std::string &alias, std::string &sessionHandle, std::string &sessionGroupHandle, bool isChannel, bool incoming, std::string &nameString, std::string &applicationString);
+                void sessionGroupAddedEvent(std::string &sessionGroupHandle);
+                void sessionRemovedEvent(std::string &sessionHandle, std::string &sessionGroupHandle);
+                void participantAddedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, std::string &nameString, std::string &displayNameString, int participantType);
+                void participantRemovedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, std::string &nameString);
+                void participantUpdatedEvent(std::string &sessionHandle, std::string &sessionGroupHandle, std::string &uriString, std::string &alias, bool isModeratorMuted, bool isSpeaking, int volume, F32 energy);
                 void auxAudioPropertiesEvent(F32 energy);
-        
+                void buddyPresenceEvent(std::string &uriString, std::string &alias, std::string &statusString, std::string &applicationString);
+                void messageEvent(std::string &sessionHandle, std::string &uriString, std::string &alias, std::string &messageHeader, std::string &messageBody, std::string &applicationString);
+                void sessionNotificationEvent(std::string &sessionHandle, std::string &uriString, std::string &notificationType);
+                void subscriptionEvent(std::string &buddyURI, std::string &subscriptionHandle, std::string &alias, std::string &displayName, std::string &applicationString, std::string &subscriptionType);
+                
+                void buddyListChanged();
                 void muteListChanged();
+                void updateFriends(U32 mask);
                 
                 /////////////////////////////
                 // Sending updates of current state
@@ -210,7 +189,6 @@ static	void updatePosition(void);
                 void setVoiceVolume(F32 volume);
                 void setMicGain(F32 volume);
                 void setUserVolume(const LLUUID& id, F32 volume); // set's volume for specified agent, from 0-1 (where .5 is nominal)
-                void setVivoxDebugServerName(std::string &serverName);
                 void setLipSyncEnabled(BOOL enabled);
                 BOOL lipSyncEnabled();
 
@@ -225,57 +203,261 @@ static	void updatePosition(void);
                 BOOL getIsSpeaking(const LLUUID& id);
                 BOOL getIsModeratorMuted(const LLUUID& id);
                 F32 getCurrentPower(const LLUUID& id);          // "power" is related to "amplitude" in a defined way.  I'm just not sure what the formula is...
-                BOOL getPTTPressed(const LLUUID& id);                   // This is the inverse of the "locally muted" property.
                 BOOL getOnMuteList(const LLUUID& id);
                 F32 getUserVolume(const LLUUID& id);
                 std::string getDisplayName(const LLUUID& id);
                 
                 // MBW -- XXX -- Not sure how to get this data out of the TVC
                 BOOL getUsingPTT(const LLUUID& id);
-                serviceType getServiceType(const LLUUID& id);   // type of chat the user is involved in (see bHear scope doc for definitions of A/B/C)
                 std::string getGroupID(const LLUUID& id);               // group ID if the user is in group chat (empty string if not applicable)
 
                 /////////////////////////////
                 BOOL getAreaVoiceDisabled();            // returns true if the area the avatar is in is speech-disabled.
                                                                                         // Use this to determine whether to show a "no speech" icon in the menu bar.
+                
+                /////////////////////////////
+                // Recording controls
+                void recordingLoopStart(int seconds = 3600, int deltaFramesPerControlFrame = 200);
+                void recordingLoopSave(const std::string& filename);
+                void recordingStop();
+                
+                // Playback controls
+                void filePlaybackStart(const std::string& filename);
+                void filePlaybackStop();
+                void filePlaybackSetPaused(bool paused);
+                void filePlaybackSetMode(bool vox = false, float speed = 1.0f);
+                
+                
+                // This is used by the string-keyed maps below, to avoid storing the string twice.
+                // The 'const std::string *' in the key points to a string actually stored in the object referenced by the map.
+                // The add and delete operations for each map allocate and delete in the right order to avoid dangling references.
+                // The default compare operation would just compare pointers, which is incorrect, so they must use this comparitor instead.
+                struct stringMapComparitor
+                {
+                        bool operator()(const std::string* a, const std::string * b) const
+                        {
+                                return a->compare(*b) < 0;
+                        }
+                };
 
+                struct uuidMapComparitor
+                {
+                        bool operator()(const LLUUID* a, const LLUUID * b) const
+                        {
+                                return *a < *b;
+                        }
+                };
+                
                 struct participantState
                 {
                 public:
                         participantState(const std::string &uri);
+
+                        bool updateMuteState();
+
                         std::string mURI;
-                        std::string mName;
+                        LLUUID mAvatarID;
+                        std::string mAccountName;
                         std::string mDisplayName;
-                        bool mPTT;
-                        bool mIsSpeaking;
-                        bool mIsModeratorMuted;
                         LLFrameTimer mSpeakingTimeout;
                         F32     mLastSpokeTimestamp;
                         F32 mPower;
                         int mVolume;
-                        serviceType mServiceType;
                         std::string mGroupID;
-                        bool mOnMuteList;               // true if this avatar is on the user's mute list (and should be muted)
                         int mUserVolume;
+                        bool mPTT;
+                        bool mIsSpeaking;
+                        bool mIsModeratorMuted;
+                        bool mOnMuteList;               // true if this avatar is on the user's mute list (and should be muted)
                         bool mVolumeDirty;              // true if this participant needs a volume command sent (either mOnMuteList or mUserVolume has changed)
                         bool mAvatarIDValid;
-                        LLUUID mAvatarID;
+                        bool mIsSelf;
+                };
+                typedef std::map<const std::string *, participantState*, stringMapComparitor> participantMap;
+
+                typedef std::map<const LLUUID *, participantState*, uuidMapComparitor> participantUUIDMap;
+        
+                enum streamState
+                {
+                        streamStateUnknown = 0,
+                        streamStateIdle = 1,
+                        streamStateConnected = 2,
+                        streamStateRinging = 3,
                 };
-                typedef std::map<std::string, participantState*> participantMap;
                 
-                participantState *findParticipant(const std::string &uri);
-                participantState *findParticipantByAvatar(LLVOAvatar *avatar);
+                struct sessionState
+                {
+                public:
+                        sessionState();
+                        ~sessionState();
+
+                        participantState *addParticipant(const std::string &uri);
+                        // Note: after removeParticipant returns, the participant* that was passed to it will have been deleted.
+                        // Take care not to use the pointer again after that.
+                        void removeParticipant(participantState *participant);
+                        void removeAllParticipants();
+
+                        participantState *findParticipant(const std::string &uri);
+                        participantState *findParticipantByID(const LLUUID& id);
+
+                        std::string mHandle;
+                        std::string mGroupHandle;
+                        std::string mSIPURI;
+                        std::string mAlias;
+                        std::string mName;
+                        std::string mAlternateSIPURI;
+                        std::string mHash;                      // Channel password
+                        std::string mErrorStatusString;
+                        std::queue<std::string> mTextMsgQueue;
+                        
+                        LLUUID          mIMSessionID;
+                        LLUUID          mCallerID;
+                        int                     mErrorStatusCode;
+                        int                     mMediaStreamState;
+                        int                     mTextStreamState;
+                        bool            mCreateInProgress;      // True if a Session.Create has been sent for this session and no response has been received yet.
+                        bool            mMediaConnectInProgress;        // True if a Session.MediaConnect has been sent for this session and no response has been received yet.
+                        bool            mVoiceInvitePending;    // True if a voice invite is pending for this session (usually waiting on a name lookup)
+                        bool            mTextInvitePending;             // True if a text invite is pending for this session (usually waiting on a name lookup)
+                        bool            mSynthesizedCallerID;   // True if the caller ID is a hash of the SIP URI -- this means we shouldn't do a name lookup.
+                        bool            mIsChannel;     // True for both group and spatial channels (false for p2p, PSTN)
+                        bool            mIsSpatial;     // True for spatial channels
+                        bool            mIsP2P;
+                        bool            mIncoming;
+                        bool            mVoiceEnabled;
+                        bool            mReconnect;     // Whether we should try to reconnect to this session if it's dropped
+                        // Set to true when the mute state of someone in the participant list changes.
+                        // The code will have to walk the list to find the changed participant(s).
+                        bool            mVolumeDirty;
+
+                        bool            mParticipantsChanged;
+                        participantMap mParticipantsByURI;
+                        participantUUIDMap mParticipantsByUUID;
+                };
+
                 participantState *findParticipantByID(const LLUUID& id);
-                
                 participantMap *getParticipantList(void);
+                
+                typedef std::map<const std::string*, sessionState*, stringMapComparitor> sessionMap;
+                typedef std::set<sessionState*> sessionSet;
+                                
+                typedef sessionSet::iterator sessionIterator;
+                sessionIterator sessionsBegin(void);
+                sessionIterator sessionsEnd(void);
+
+                sessionState *findSession(const std::string &handle);
+                sessionState *findSessionBeingCreatedByURI(const std::string &uri);
+                sessionState *findSession(const LLUUID &participant_id);
+                sessionState *findSessionByCreateID(const std::string &create_id);
+                
+                sessionState *addSession(const std::string &uri, const std::string &handle = LLStringUtil::null);
+                void setSessionHandle(sessionState *session, const std::string &handle = LLStringUtil::null);
+                void setSessionURI(sessionState *session, const std::string &uri);
+                void deleteSession(sessionState *session);
+                void deleteAllSessions(void);
+
+                void verifySessionState(void);
+
+                void joinedAudioSession(sessionState *session);
+                void leftAudioSession(sessionState *session);
+
+                // This is called in several places where the session _may_ need to be deleted.
+                // It contains logic for whether to delete the session or keep it around.
+                void reapSession(sessionState *session);
+                
+                // Returns true if the session seems to indicate we've moved to a region on a different voice server
+                bool sessionNeedsRelog(sessionState *session);
+                
+                struct buddyListEntry
+                {
+                        buddyListEntry(const std::string &uri);
+                        std::string mURI;
+                        std::string mDisplayName;
+                        LLUUID  mUUID;
+                        bool mOnlineSL;
+                        bool mOnlineSLim;
+                        bool mCanSeeMeOnline;
+                        bool mHasBlockListEntry;
+                        bool mHasAutoAcceptListEntry;
+                        bool mNameResolved;
+                        bool mInSLFriends;
+                        bool mInVivoxBuddies;
+                        bool mNeedsNameUpdate;
+                };
+
+                typedef std::map<const std::string*, buddyListEntry*, stringMapComparitor> buddyListMap;
+                
+                // This should be called when parsing a buddy list entry sent by SLVoice.               
+                void processBuddyListEntry(const std::string &uri, const std::string &displayName);
+
+                buddyListEntry *addBuddy(const std::string &uri);
+                buddyListEntry *addBuddy(const std::string &uri, const std::string &displayName);
+                buddyListEntry *findBuddy(const std::string &uri);
+                buddyListEntry *findBuddy(const LLUUID &id);
+                buddyListEntry *findBuddyByDisplayName(const std::string &name);
+                void deleteBuddy(const std::string &uri);
+                void deleteAllBuddies(void);
+
+                void deleteAllBlockRules(void);
+                void addBlockRule(const std::string &blockMask, const std::string &presenceOnly);
+                void deleteAllAutoAcceptRules(void);
+                void addAutoAcceptRule(const std::string &autoAcceptMask, const std::string &autoAddAsBuddy);
+                void accountListBlockRulesResponse(int statusCode, const std::string &statusString);                                            
+                void accountListAutoAcceptRulesResponse(int statusCode, const std::string &statusString);                                               
+                
+                /////////////////////////////
+                // session control messages
+                void connectorCreate();
+                void connectorShutdown();
 
+                void requestVoiceAccountProvision(S32 retries = 3);
+                void userAuthorized(
+                        const std::string& firstName,
+                        const std::string& lastName,
+                        const LLUUID &agentID);
+                void login(
+                        const std::string& account_name,
+                        const std::string& password,
+                        const std::string& voice_sip_uri_hostname,
+                        const std::string& voice_account_server_uri);
+                void loginSendMessage();
+                void logout();
+                void logoutSendMessage();
+
+                void accountListBlockRulesSendMessage();
+                void accountListAutoAcceptRulesSendMessage();
+                
+                void sessionGroupCreateSendMessage();
+                void sessionCreateSendMessage(sessionState *session, bool startAudio = true, bool startText = false);
+                void sessionGroupAddSessionSendMessage(sessionState *session, bool startAudio = true, bool startText = false);
+                void sessionMediaConnectSendMessage(sessionState *session);             // just joins the audio session
+                void sessionTextConnectSendMessage(sessionState *session);              // just joins the text session
+                void sessionTerminateSendMessage(sessionState *session);
+                void sessionMediaDisconnectSendMessage(sessionState *session);
+                void sessionTextDisconnectSendMessage(sessionState *session);
+
+                // Pokes the state machine to leave the audio session next time around.
+                void sessionTerminate();        
+                
+                // Pokes the state machine to shut down the connector and restart it.
+                void requestRelog();
+                
+                // Does the actual work to get out of the audio session
+                void leaveAudioSession();
+                
                 void addObserver(LLVoiceClientParticipantObserver* observer);
                 void removeObserver(LLVoiceClientParticipantObserver* observer);
 
-                void addStatusObserver(LLVoiceClientStatusObserver* observer);
-                void removeStatusObserver(LLVoiceClientStatusObserver* observer);
+                void addObserver(LLVoiceClientStatusObserver* observer);
+                void removeObserver(LLVoiceClientStatusObserver* observer);
+
+                void addObserver(LLFriendObserver* observer);
+                void removeObserver(LLFriendObserver* observer);
+                
+                void lookupName(const LLUUID &id);
+                static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
+                void avatarNameResolved(const LLUUID &id, const std::string &name);
                 
-//              static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
                 typedef std::vector<std::string> deviceList;
 
                 deviceList *getCaptureDevices();
@@ -287,8 +469,16 @@ static	void updatePosition(void);
                 void setSpatialChannel(
                         const std::string &uri,
                         const std::string &credentials);
-                void callUser(LLUUID &uuid);
-                void answerInvite(std::string &sessionHandle, LLUUID& other_user_id);
+                // start a voice session with the specified user
+                void callUser(const LLUUID &uuid);
+                
+                // Send a text message to the specified user, initiating the session if necessary.
+                bool sendTextMessage(const LLUUID& participant_id, const std::string& message);
+                
+                // close any existing text IM session with the specified user
+                void endUserIMSession(const LLUUID &uuid);
+                
+                bool answerInvite(std::string &sessionHandle);
                 void declineInvite(std::string &sessionHandle);
                 void leaveNonSpatialChannel();
 
@@ -301,33 +491,37 @@ static	void updatePosition(void);
                 bool inProximalChannel();
 
                 std::string sipURIFromID(const LLUUID &id);
-
+                                
+                // Returns true if the indicated user is online via SIP presence according to SLVoice.
+                // Note that we only get SIP presence data for other users that are in our vivox buddy list.
+                bool isOnlineSIP(const LLUUID &id);
+                
         private:
 
                 // internal state for a simple state machine.  This is used to deal with the asynchronous nature of some of the messages.
                 // Note: if you change this list, please make corresponding changes to LLVoiceClient::state2string().
                 enum state
                 {
+                        stateDisableCleanup,
                         stateDisabled,                          // Voice is turned off.
                         stateStart,                                     // Class is initialized, socket is created
                         stateDaemonLaunched,            // Daemon has been launched
                         stateConnecting,                        // connect() call has been issued
+                        stateConnected,                         // connection to the daemon has been made, send some initial setup commands.
                         stateIdle,                                      // socket is connected, ready for messaging
+                        stateMicTuningStart,
+                        stateMicTuningRunning,          
+                        stateMicTuningStop,
                         stateConnectorStart,            // connector needs to be started
                         stateConnectorStarting,         // waiting for connector handle
                         stateConnectorStarted,          // connector handle received
-                        stateMicTuningNoLogin,          // mic tuning before login
                         stateLoginRetry,                        // need to retry login (failed due to changing password)
                         stateLoginRetryWait,            // waiting for retry timer
                         stateNeedsLogin,                        // send login request
                         stateLoggingIn,                         // waiting for account handle
                         stateLoggedIn,                          // account handle received
+                        stateCreatingSessionGroup,      // Creating the main session group
                         stateNoChannel,                         // 
-                        stateMicTuningStart,
-                        stateMicTuningRunning,          
-                        stateMicTuningStop,
-                        stateSessionCreate,                     // need to send Session.Create command
-                        stateSessionConnect,            // need to send Session.Connect command
                         stateJoiningSession,            // waiting for session handle
                         stateSessionJoined,                     // session handle received
                         stateRunning,                           // in session, steady state
@@ -354,7 +548,7 @@ static	void updatePosition(void);
                 
                 state mState;
                 bool mSessionTerminateRequested;
-                bool mNonSpatialChannel;
+                bool mRelogRequested;
                 
                 void setState(state inState);
                 state getState(void)  { return mState; };
@@ -377,18 +571,7 @@ static	void updatePosition(void);
                 std::string mAccountDisplayName;
                 std::string mAccountFirstName;
                 std::string mAccountLastName;
-                
-                std::string mNextP2PSessionURI;         // URI of the P2P session to join next
-                std::string mNextSessionURI;            // URI of the session to join next
-                std::string mNextSessionHandle;         // Session handle of the session to join next
-                std::string mNextSessionHash;           // Password hash for the session to join next
-                bool mNextSessionSpatial;                       // Will next session be a spatial chat?
-                bool mNextSessionNoReconnect;           // Next session should not auto-reconnect (i.e. user -> user chat)
-                bool mNextSessionResetOnClose;          // If this is true, go back to spatial chat when the next session terminates.
-                
-                std::string mSessionStateEventHandle;   // session handle received in SessionStateChangeEvents
-                std::string mSessionStateEventURI;              // session URI received in SessionStateChangeEvents
-                
+                                
                 bool mTuningMode;
                 float mTuningEnergy;
                 std::string mTuningAudioFile;
@@ -399,32 +582,40 @@ static	void updatePosition(void);
                 state mTuningExitState;                                 // state to return to when we leave tuning mode.
                 
                 std::string mSpatialSessionURI;
-                
-                bool mSessionResetOnClose;
-                
-                int mVivoxErrorStatusCode;              
-                std::string mVivoxErrorStatusString;
+                std::string mSpatialSessionCredentials;
+
+                std::string mMainSessionGroupHandle; // handle of the "main" session group.
                 
                 std::string mChannelName;                       // Name of the channel to be looked up 
                 bool mAreaVoiceDisabled;
-                std::string mSessionURI;                        // URI of the session we're in.
-                bool mSessionP2P;                                       // true if this session is a p2p call
+                sessionState *mAudioSession;            // Session state for the current audio session
+                bool mAudioSessionChanged;                      // set to true when the above pointer gets changed, so observers can be notified.
+
+                sessionState *mNextAudioSession;        // Session state for the audio session we're trying to join
+
+//              std::string mSessionURI;                        // URI of the session we're in.
+//              std::string mSessionHandle;             // returned by ?
                 
                 S32 mCurrentParcelLocalID;                      // Used to detect parcel boundary crossings
                 std::string mCurrentRegionName;         // Used to detect parcel boundary crossings
                 
                 std::string mConnectorHandle;   // returned by "Create Connector" message
                 std::string mAccountHandle;             // returned by login message            
-                std::string mSessionHandle;             // returned by ?
+                int             mNumberOfAliases;
                 U32 mCommandCookie;
         
-                std::string mAccountServerName;
-                std::string mAccountServerURI;
+                std::string mVoiceAccountServerURI;
+                std::string mVoiceSIPURIHostName;
                 
                 int mLoginRetryCount;
                 
-                participantMap mParticipantMap;
-                bool mParticipantMapChanged;
+                sessionMap mSessionsByHandle;                           // Active sessions, indexed by session handle.  Sessions which are being initiated may not be in this map.
+                sessionSet mSessions;                                           // All sessions, not indexed.  This is the canonical session list.
+                
+                bool mBuddyListMapPopulated;
+                bool mBlockRulesListReceived;
+                bool mAutoAcceptRulesListReceived;
+                buddyListMap mBuddyListMap;
                 
                 deviceList mCaptureDevices;
                 deviceList mRenderDevices;
@@ -434,40 +625,41 @@ static	void updatePosition(void);
                 bool mCaptureDeviceDirty;
                 bool mRenderDeviceDirty;
                 
-                participantState *addParticipant(const std::string &uri);
-                // Note: after removeParticipant returns, the participant* that was passed to it will have been deleted.
-                // Take care not to use the pointer again after that.
-                void removeParticipant(participantState *participant);
-                void removeAllParticipants();
-
-                void updateMuteState(participantState *participant);
-
-                typedef std::map<std::string, std::string> channelMap;
-                channelMap mChannelMap;
-                
-                // These are used by the parser when processing a channel list response.
-                void clearChannelMap(void);
-                void addChannelMapEntry(std::string &name, std::string &uri);
-                std::string findChannelURI(std::string &name);
-                        
                 // This should be called when the code detects we have changed parcels.
                 // It initiates the call to the server that gets the parcel channel.
                 void parcelChanged();
                 
-        void switchChannel(std::string uri = std::string(), bool spatial = true, bool noReconnect = false, std::string hash = "");
-                void joinSession(std::string handle, std::string uri);
+        void switchChannel(std::string uri = std::string(), bool spatial = true, bool no_reconnect = false, bool is_p2p = false, std::string hash = "");
+                void joinSession(sessionState *session);
                 
-                std::string nameFromAvatar(LLVOAvatar *avatar);
-                std::string nameFromID(const LLUUID &id);
-                bool IDFromName(const std::string name, LLUUID &uuid);
-                std::string displayNameFromAvatar(LLVOAvatar *avatar);
+static  std::string nameFromAvatar(LLVOAvatar *avatar);
+static  std::string nameFromID(const LLUUID &id);
+static  bool IDFromName(const std::string name, LLUUID &uuid);
+static  std::string displayNameFromAvatar(LLVOAvatar *avatar);
                 std::string sipURIFromAvatar(LLVOAvatar *avatar);
                 std::string sipURIFromName(std::string &name);
+                
+                // Returns the name portion of the SIP URI if the string looks vaguely like a SIP URI, or an empty string if not.
+static  std::string nameFromsipURI(const std::string &uri);             
+
+                bool inSpatialChannel(void);
+                std::string getAudioSessionURI();
+                std::string getAudioSessionHandle();
                                 
                 void sendPositionalUpdate(void);
                 
                 void buildSetCaptureDevice(std::ostringstream &stream);
                 void buildSetRenderDevice(std::ostringstream &stream);
+                void buildLocalAudioUpdates(std::ostringstream &stream);
+                
+                void clearAllLists();
+                void checkFriend(const LLUUID& id);
+                void sendFriendsListUpdates();
+
+                // start a text IM session with the specified user
+                // This will be asynchronous, the session may be established at a future time.
+                sessionState* startUserIMSession(const LLUUID& uuid);
+                void sendQueuedTextMessages(sessionState *session);
                 
                 void enforceTether(void);
                 
@@ -491,10 +683,9 @@ static	void updatePosition(void);
                 bool            mPTTIsToggle;
                 bool            mUserPTTState;
                 bool            mMuteMic;
-                
-                // Set to true when the mute state of someone in the participant list changes.
-                // The code will have to walk the list to find the changed participant(s).
-                bool            mVolumeDirty;
+                                
+                // Set to true when the friends list is known to have changed.
+                bool            mFriendsListDirty;
                 
                 enum
                 {
@@ -522,14 +713,18 @@ static	void updatePosition(void);
                 BOOL            mLipSyncEnabled;
 
                 typedef std::set<LLVoiceClientParticipantObserver*> observer_set_t;
-                observer_set_t mObservers;
+                observer_set_t mParticipantObservers;
 
-                void notifyObservers();
+                void notifyParticipantObservers();
 
                 typedef std::set<LLVoiceClientStatusObserver*> status_observer_set_t;
                 status_observer_set_t mStatusObservers;
                 
                 void notifyStatusObservers(LLVoiceClientStatusObserver::EStatusType status);
+
+                typedef std::set<LLFriendObserver*> friend_observer_set_t;
+                friend_observer_set_t mFriendObservers;
+                void notifyFriendObservers();
 };
 
 extern LLVoiceClient *gVoiceClient;
diff --git a/linden/indra/newview/llvoiceremotectrl.cpp b/linden/indra/newview/llvoiceremotectrl.cpp
index 1f6edd4..3dc275f 100644
--- a/linden/indra/newview/llvoiceremotectrl.cpp
+++ b/linden/indra/newview/llvoiceremotectrl.cpp
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoiceremotectrl.h b/linden/indra/newview/llvoiceremotectrl.h
index b5e1b38..b2ff7b3 100644
--- a/linden/indra/newview/llvoiceremotectrl.h
+++ b/linden/indra/newview/llvoiceremotectrl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoicevisualizer.cpp b/linden/indra/newview/llvoicevisualizer.cpp
index f00247b..15e51fb 100644
--- a/linden/indra/newview/llvoicevisualizer.cpp
+++ b/linden/indra/newview/llvoicevisualizer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -378,20 +378,20 @@ void LLVoiceVisualizer::render()
                 //-----------------------------
                 // bind texture 0 (the dot)
                 //-----------------------------
-                mSoundSymbol.mTexture[0]->bind(); 
+                gGL.getTexUnit(0)->bind(mSoundSymbol.mTexture[0]);
                 
                 //-------------------------------------------------------------
                 // now render the dot
                 //-------------------------------------------------------------
                 gGL.color4fv( LLColor4( 1.0f, 1.0f, 1.0f, DOT_OPACITY ).mV );   
                 
-                gGL.begin( LLVertexBuffer::TRIANGLE_STRIP );
+                gGL.begin( LLRender::TRIANGLE_STRIP );
                         gGL.texCoord2i( 0,      0       ); gGL.vertex3fv( bottomLeft.mV );
                         gGL.texCoord2i( 1,      0       ); gGL.vertex3fv( bottomRight.mV );
                         gGL.texCoord2i( 0,      1       ); gGL.vertex3fv( topLeft.mV );
                 gGL.end();
 
-                gGL.begin( LLVertexBuffer::TRIANGLE_STRIP );
+                gGL.begin( LLRender::TRIANGLE_STRIP );
                         gGL.texCoord2i( 1,      0       ); gGL.vertex3fv( bottomRight.mV );
                         gGL.texCoord2i( 1,      1       ); gGL.vertex3fv( topRight.mV );
                         gGL.texCoord2i( 0,      1       ); gGL.vertex3fv( topLeft.mV );
@@ -503,18 +503,19 @@ void LLVoiceVisualizer::render()
                                 LLVector3 topRight              = mSoundSymbol.mPosition - l + u;
                                                         
                                 gGL.color4fv( LLColor4( red, green, blue, mSoundSymbol.mWaveOpacity[i] ).mV );          
-                                mSoundSymbol.mTexture[i]->bind();
+                                gGL.getTexUnit(0)->bind(mSoundSymbol.mTexture[i]);
+
                                 
                                 //---------------------------------------------------
                                 // now, render the mofo
                                 //---------------------------------------------------
-                                gGL.begin( LLVertexBuffer::TRIANGLE_STRIP );
+                                gGL.begin( LLRender::TRIANGLE_STRIP );
                                         gGL.texCoord2i( 0, 0 ); gGL.vertex3fv( bottomLeft.mV );
                                         gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV );
                                         gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV );
                                 gGL.end();
 
-                                gGL.begin( LLVertexBuffer::TRIANGLE_STRIP );
+                                gGL.begin( LLRender::TRIANGLE_STRIP );
                                         gGL.texCoord2i( 1, 0 ); gGL.vertex3fv( bottomRight.mV );
                                         gGL.texCoord2i( 1, 1 ); gGL.vertex3fv( topRight.mV );
                                         gGL.texCoord2i( 0, 1 ); gGL.vertex3fv( topLeft.mV );
@@ -550,8 +551,8 @@ VoiceGesticulationLevel LLVoiceVisualizer::getCurrentGesticulationLevel()
         //-----------------------------------------------------------------------------------------
         F32 range = mMaxGesticulationAmplitude - mMinGesticulationAmplitude;
         
-                        if ( mSpeakingAmplitude > mMinGesticulationAmplitude + range * 0.66666f )       { gesticulationLevel = VOICE_GESTICULATION_LEVEL_HIGH;          }
-        else    if ( mSpeakingAmplitude > mMinGesticulationAmplitude + range * 0.33333f )       { gesticulationLevel = VOICE_GESTICULATION_LEVEL_MEDIUM;        }
+                        if ( mSpeakingAmplitude > mMinGesticulationAmplitude + range * 0.5f     )       { gesticulationLevel = VOICE_GESTICULATION_LEVEL_HIGH;          }
+        else    if ( mSpeakingAmplitude > mMinGesticulationAmplitude + range * 0.25f    )       { gesticulationLevel = VOICE_GESTICULATION_LEVEL_MEDIUM;        }
         else    if ( mSpeakingAmplitude > mMinGesticulationAmplitude + range * 0.00000f )       { gesticulationLevel = VOICE_GESTICULATION_LEVEL_LOW;           }
 
         return gesticulationLevel;
diff --git a/linden/indra/newview/llvoicevisualizer.h b/linden/indra/newview/llvoicevisualizer.h
index 76eb282..1519a83 100644
--- a/linden/indra/newview/llvoicevisualizer.h
+++ b/linden/indra/newview/llvoicevisualizer.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoinventorylistener.cpp b/linden/indra/newview/llvoinventorylistener.cpp
index 78d3052..7adac80 100644
--- a/linden/indra/newview/llvoinventorylistener.cpp
+++ b/linden/indra/newview/llvoinventorylistener.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvoinventorylistener.h b/linden/indra/newview/llvoinventorylistener.h
index e19102c..a3567c6 100644
--- a/linden/indra/newview/llvoinventorylistener.h
+++ b/linden/indra/newview/llvoinventorylistener.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 11d7341..a91b59f 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -95,7 +95,7 @@ void LLVOPartGroup::setPixelAreaAndAngle(LLAgent &agent)
 {
         // mPixelArea is calculated during render
         F32 mid_scale = getMidScale();
-        F32 range = (getRenderPosition()-LLViewerCamera::getInstance()->getOrigin()).magVec();
+        F32 range = (getRenderPosition()-LLViewerCamera::getInstance()->getOrigin()).length();
 
         if (range < 0.001f || isHUDAttachment())                // range == zero
         {
@@ -133,15 +133,16 @@ F32 LLVOPartGroup::getPartSize(S32 idx)
         return 0.f;
 }
 
+LLVector3 LLVOPartGroup::getCameraPosition() const
+{
+        return gAgent.getCameraPositionAgent();
+}
+
 BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 {
         LLFastTimer ftm(LLFastTimer::FTM_UPDATE_PARTICLES);
 
         dirtySpatialGroup();
-
-        LLVector3 at;
-        LLVector3 position_agent;
-        LLVector3 camera_agent = LLViewerCamera::getInstance()->getOrigin();
         
         S32 num_parts = mViewerPartGroupp->getCount();
         LLFace *facep;
@@ -179,6 +180,8 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
         F32 pixel_meter_ratio = LLViewerCamera::getInstance()->getPixelMeterRatio();
         pixel_meter_ratio *= pixel_meter_ratio;
 
+        LLViewerPartSim::checkParticleCount(mViewerPartGroupp->mParticles.size()) ;
+
         S32 count=0;
         mDepth = 0.f;
         S32 i = 0 ;
@@ -187,9 +190,9 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 const LLViewerPart *part = mViewerPartGroupp->mParticles[i];
 
                 LLVector3 part_pos_agent(part->mPosAgent);
-                at = part_pos_agent - camera_agent;
+                LLVector3 at(part_pos_agent - LLViewerCamera::getInstance()->getOrigin());
 
-                F32 camera_dist_squared = at.magVecSquared();
+                F32 camera_dist_squared = at.lengthSquared();
                 F32 inv_camera_dist_squared;
                 if (camera_dist_squared > 1.f)
                         inv_camera_dist_squared = 1.f / camera_dist_squared;
@@ -278,36 +281,38 @@ void LLVOPartGroup::getGeometry(S32 idx,
 
         
         LLVector3 part_pos_agent(part.mPosAgent);
-        LLVector3 camera_agent = gAgent.getCameraPositionAgent();
+        LLVector3 camera_agent = getCameraPosition(); 
         LLVector3 at = part_pos_agent - camera_agent;
-        LLVector3 up, right;
+        LLVector3 up;
+        LLVector3 right;
 
         right = at % LLVector3(0.f, 0.f, 1.f);
-        right.normVec();
+        right.normalize();
         up = right % at;
-        up.normVec();
+        up.normalize();
 
         if (part.mFlags & LLPartData::LL_PART_FOLLOW_VELOCITY_MASK)
         {
                 LLVector3 normvel = part.mVelocity;
-                normvel.normVec();
+                normvel.normalize();
                 LLVector2 up_fracs;
                 up_fracs.mV[0] = normvel*right;
                 up_fracs.mV[1] = normvel*up;
-                up_fracs.normVec();
+                up_fracs.normalize();
                 LLVector3 new_up;
                 LLVector3 new_right;
                 new_up = up_fracs.mV[0] * right + up_fracs.mV[1]*up;
                 new_right = up_fracs.mV[1] * right - up_fracs.mV[0]*up;
                 up = new_up;
                 right = new_right;
-                up.normVec();
-                right.normVec();
+                up.normalize();
+                right.normalize();
         }
 
         right *= 0.5f*part.mScale.mV[0];
         up *= 0.5f*part.mScale.mV[1];
 
+
         const LLVector3& normal = -LLViewerCamera::getInstance()->getXAxis();
                 
         *verticesp++ = part_pos_agent + up - right;
@@ -355,6 +360,13 @@ LLParticlePartition::LLParticlePartition()
         mLODPeriod = 1;
 }
 
+LLHUDParticlePartition::LLHUDParticlePartition() :
+        LLParticlePartition()
+{
+        mDrawableType = LLPipeline::RENDER_TYPE_HUD;
+        mPartitionType = LLViewerRegion::PARTITION_HUD_PARTICLE;
+}
+
 void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count, U32& index_count)
 {
         group->mBufferUsage = mBufferUsage;
@@ -480,3 +492,24 @@ F32 LLParticlePartition::calcPixelArea(LLSpatialGroup* group, LLCamera& camera)
         return 1024.f;
 }
 
+U32 LLVOHUDPartGroup::getPartitionType() const
+{ 
+        // Commenting out and returning PARTITION_NONE because DEV-16909 
+        // (SVC-2396: Particles not handled properly as hud) didn't work completely 
+        // so this disables HUD particles until they can be fixed properly. -MG
+        //return LLViewerRegion::PARTITION_HUD_PARTICLE; 
+        return LLViewerRegion::PARTITION_NONE;
+}
+
+LLDrawable* LLVOHUDPartGroup::createDrawable(LLPipeline *pipeline)
+{
+        pipeline->allocDrawable(this);
+        mDrawable->setLit(FALSE);
+        mDrawable->setRenderType(LLPipeline::RENDER_TYPE_HUD);
+        return mDrawable;
+}
+
+LLVector3 LLVOHUDPartGroup::getCameraPosition() const
+{
+        return LLVector3(-1,0,0);
+}
diff --git a/linden/indra/newview/llvopartgroup.h b/linden/indra/newview/llvopartgroup.h
index 5fe6750..c5596bb 100644
--- a/linden/indra/newview/llvopartgroup.h
+++ b/linden/indra/newview/llvopartgroup.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,23 @@ protected:
         ~LLVOPartGroup();
 
         LLViewerPartGroup *mViewerPartGroupp;
+
+        virtual LLVector3 getCameraPosition() const;
+
+};
+
+
+class LLVOHUDPartGroup : public LLVOPartGroup
+{
+public:
+        LLVOHUDPartGroup(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp) : 
+          LLVOPartGroup(id, pcode, regionp)   
+        {
+        }
+protected:
+        LLDrawable* createDrawable(LLPipeline *pipeline);
+        U32 getPartitionType() const;
+        virtual LLVector3 getCameraPosition() const;
 };
 
 #endif // LL_LLVOPARTGROUP_H
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp
index 60f674e..336d409 100644
--- a/linden/indra/newview/llvosky.cpp
+++ b/linden/indra/newview/llvosky.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -294,7 +294,7 @@ void LLSkyTex::createGLImage(S32 which)
 
 void LLSkyTex::bindTexture(BOOL curr)
 {
-        mImageGL[getWhich(curr)]->bind();
+        gGL.getTexUnit(0)->bind(mImageGL[getWhich(curr)]);
 }
 
 /***************************************
@@ -308,7 +308,7 @@ S32 LLVOSky::sTileResX = sResolution/NUM_TILES_X;
 S32 LLVOSky::sTileResY = sResolution/NUM_TILES_Y;
 
 LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:       LLStaticViewerObject(id, pcode, regionp),
+:       LLStaticViewerObject(id, pcode, regionp, TRUE),
         mSun(SUN_DISK_RADIUS), mMoon(MOON_DISK_RADIUS),
         mBrightnessScale(1.f),
         mBrightnessScaleNew(0.f),
@@ -528,7 +528,7 @@ void LLVOSky::initSkyTextureDirs(const S32 side, const S32 tile)
                         coeff[x_coef] = F32((x<<1) + 1) * inv_res - 1.f;
                         coeff[y_coef] = F32((y<<1) + 1) * inv_res - 1.f;
                         LLVector3 dir(coeff[0], coeff[1], coeff[2]);
-                        dir.normVec();
+                        dir.normalize();
                         mSkyTex[side].setDir(dir, x, y);
                         mShinyTex[side].setDir(dir, x, y);
                 }
@@ -762,7 +762,7 @@ void LLVOSky::calcSkyColorWLVert(LLVector3 & Pn, LLColor3 & vary_HazeColor, LLCo
                 Pn *= (-32000.f / Pn[1]);
         }
 
-        Plen = Pn.magVec();
+        Plen = Pn.length();
         Pn /= Plen;
 
         // Initialize temp variables
@@ -1082,7 +1082,7 @@ BOOL LLVOSky::updateSky()
                         const static F32 COLOR_CHANGE_THRESHOLD = 0.01f;
 
                         LLVector3 direction = mSun.getDirection();
-                        direction.normVec();
+                        direction.normalize();
                         const F32 dot_lighting = direction * mLastLightingDirection;
 
                         LLColor3 delta_color;
@@ -1092,7 +1092,7 @@ BOOL LLVOSky::updateSky()
 
                         if ( mForceUpdate 
                                  || ((dot_lighting < LIGHT_DIRECTION_THRESHOLD)
-                                 || (delta_color.magVec() > COLOR_CHANGE_THRESHOLD)
+                                 || (delta_color.length() > COLOR_CHANGE_THRESHOLD)
                                  || !mInitialized)
                                 && !direction.isExactlyZero())
                         {
@@ -1336,8 +1336,8 @@ BOOL LLVOSky::updateGeometry(LLDrawable *drawable)
         const LLVector3 &look_at = LLViewerCamera::getInstance()->getAtAxis();
         LLVector3 right = look_at % LLVector3::z_axis;
         LLVector3 up = right % look_at;
-        right.normVec();
-        up.normVec();
+        right.normalize();
+        up.normalize();
 
         const static F32 elevation_factor = 0.0f/sResolution;
         const F32 cos_max_angle = cosHorizon(elevation_factor);
@@ -1417,8 +1417,8 @@ BOOL LLVOSky::updateHeavenlyBodyGeometry(LLDrawable *drawable, const S32 f, cons
 
         LLVector3 hb_right = to_dir % LLVector3::z_axis;
         LLVector3 hb_up = hb_right % to_dir;
-        hb_right.normVec();
-        hb_up.normVec();
+        hb_right.normalize();
+        hb_up.normalize();
 
         //const static F32 cos_max_turn = sqrt(3.f) / 2; // 30 degrees
         //const F32 cos_turn_right = 1. / (llmax(cos_max_turn, hb_right * right));
@@ -1601,8 +1601,8 @@ void LLVOSky::updateSunHaloGeometry(LLDrawable *drawable )
 
         const LLVector3 right = 2 * (v_corner[2] - v_corner[0]);
         LLVector3 up = 2 * (v_corner[2] - v_corner[3]);
-        up.normVec();
-        F32 size = right.magVec();
+        up.normalize();
+        F32 size = right.length();
         up = size * up;
         const LLVector3 draw_pos = 0.25 * (v_corner[0] + v_corner[1] + v_corner[2] + v_corner[3]);
         
@@ -1654,7 +1654,7 @@ void LLVOSky::updateSunHaloGeometry(LLDrawable *drawable )
 F32 dtReflection(const LLVector3& p, F32 cos_dir_from_top, F32 sin_dir_from_top, F32 diff_angl_dir)
 {
         LLVector3 P = p;
-        P.normVec();
+        P.normalize();
 
         const F32 cos_dir_angle = -P.mV[VZ];
         const F32 sin_dir_angle = sqrt(1 - cos_dir_angle * cos_dir_angle);
@@ -1679,9 +1679,9 @@ F32 dtClip(const LLVector3& v0, const LLVector3& v1, F32 far_clip2)
 {
         F32 dt_clip;
         const LLVector3 otrezok = v1 - v0;
-        const F32 A = otrezok.magVecSquared();
+        const F32 A = otrezok.lengthSquared();
         const F32 B = v0 * otrezok;
-        const F32 C = v0.magVecSquared() - far_clip2;
+        const F32 C = v0.lengthSquared() - far_clip2;
         const F32 det = sqrt(B*B - A*C);
         dt_clip = (-B - det) / A;
         if ((dt_clip < 0) || (dt_clip > 1))
@@ -1701,16 +1701,16 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         LLVector3 hb_pos = to_dir * (HORIZON_DIST - 10);
         LLVector3 to_dir_proj = to_dir;
         to_dir_proj.mV[VZ] = 0;
-        to_dir_proj.normVec();
+        to_dir_proj.normalize();
 
         LLVector3 Right = to_dir % LLVector3::z_axis;
         LLVector3 Up = Right % to_dir;
-        Right.normVec();
-        Up.normVec();
+        Right.normalize();
+        Up.normalize();
 
         // finding angle between  look direction and sprite.
         LLVector3 look_at_right = look_at % LLVector3::z_axis;
-        look_at_right.normVec();
+        look_at_right.normalize();
 
         const static F32 cos_horizon_angle = cosHorizon(0.0f/sResolution);
         //const static F32 horizon_angle = acos(cos_horizon_angle);
@@ -1745,7 +1745,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         else
                 dt_hor = llmax(0.0f, llmin(1.0f, dt_hor));
 
-        top_hb.normVec();
+        top_hb.normalize();
         const F32 cos_angle_of_view = fabs(top_hb.mV[VZ]);
         const F32 extension = llmin (5.0f, 1.0f / cos_angle_of_view);
 
@@ -1762,11 +1762,11 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         F32 cos_dir_from_top[2];
 
         LLVector3 dir = stretch_corner[0];
-        dir.normVec();
+        dir.normalize();
         cos_dir_from_top[0] = dir.mV[VZ];
 
         dir = stretch_corner[1];
-        dir.normVec();
+        dir.normalize();
         cos_dir_from_top[1] = dir.mV[VZ];
 
         const F32 sin_dir_from_top = sqrt(1 - cos_dir_from_top[0] * cos_dir_from_top[0]);
@@ -1789,7 +1789,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         for (vtx = 0; vtx < 2; ++vtx)
         {
                 LLVector3 light_proj = v_corner[vtx];
-                light_proj.normVec();
+                light_proj.normalize();
 
                 const F32 z = light_proj.mV[VZ];
                 const F32 sin_angle = sqrt(1 - z * z);
@@ -1813,9 +1813,9 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         S32 side = 0;
         LLVector3 refl_corn_norm[2];
         refl_corn_norm[0] = v_refl_corner[1];
-        refl_corn_norm[0].normVec();
+        refl_corn_norm[0].normalize();
         refl_corn_norm[1] = v_refl_corner[3];
-        refl_corn_norm[1].normVec();
+        refl_corn_norm[1].normalize();
 
         F32 cos_refl_look_at[2];
         cos_refl_look_at[0] = refl_corn_norm[0] * look_at;
@@ -1833,13 +1833,13 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
         F32 dt_clip;
         F32 vtx_near2, vtx_far2;
 
-        if ((vtx_far2 = v_refl_corner[side].magVecSquared()) > far_clip2)
+        if ((vtx_far2 = v_refl_corner[side].lengthSquared()) > far_clip2)
         {
                 // whole thing is sprite: reflection is beyond far clip plane.
                 dt_clip = 1.1f;
                 quads = 1;
         }
-        else if ((vtx_near2 = v_refl_corner[side+1].magVecSquared()) > far_clip2)
+        else if ((vtx_near2 = v_refl_corner[side+1].lengthSquared()) > far_clip2)
         {
                 // part is reflection, the rest is sprite.
                 dt_clip = dtClip(v_refl_corner[side + 1], v_refl_corner[side], far_clip2);
@@ -1903,7 +1903,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
                 {
                         for (S32 vtx = 0; vtx < 4; ++vtx)
                         {
-                                F32 ratio = far_clip / v_refl_corner[vtx].magVec();
+                                F32 ratio = far_clip / v_refl_corner[vtx].length();
                                 *(verticesp++) = v_refl_corner[vtx] = ratio * v_refl_corner[vtx] + mCameraPosAgent;
                         }
                         const LLVector3 draw_pos = 0.25 *
@@ -1912,10 +1912,10 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H,
                 }
                 else
                 {
-                        F32 ratio = far_clip / v_refl_corner[1].magVec();
+                        F32 ratio = far_clip / v_refl_corner[1].length();
                         v_sprite_corner[1] = v_refl_corner[1] * ratio;
 
-                        ratio = far_clip / v_refl_corner[3].magVec();
+                        ratio = far_clip / v_refl_corner[3].length();
                         v_sprite_corner[3] = v_refl_corner[3] * ratio;
 
                         v_refl_corner[1] = (1 - dt_clip) * v_refl_corner[1] + dt_clip * v_refl_corner[0];
@@ -2039,20 +2039,20 @@ void LLVOSky::updateFog(const F32 distance)
         LLVector3 tosun = getToSunLast();
         const F32 tosun_z = tosun.mV[VZ];
         tosun.mV[VZ] = 0.f;
-        tosun.normVec();
+        tosun.normalize();
         LLVector3 perp_tosun;
         perp_tosun.mV[VX] = -tosun.mV[VY];
         perp_tosun.mV[VY] = tosun.mV[VX];
         LLVector3 tosun_45 = tosun + perp_tosun;
-        tosun_45.normVec();
+        tosun_45.normalize();
 
         F32 delta = 0.06f;
         tosun.mV[VZ] = delta;
         perp_tosun.mV[VZ] = delta;
         tosun_45.mV[VZ] = delta;
-        tosun.normVec();
-        perp_tosun.normVec();
-        tosun_45.normVec();
+        tosun.normalize();
+        perp_tosun.normalize();
+        tosun_45.normalize();
 
         // Sky colors, just slightly above the horizon in the direction of the sun, perpendicular to the sun, and at a 45 degree angle to the sun.
         initAtmospherics();
@@ -2202,8 +2202,8 @@ F32 azimuth(const LLVector3 &v)
 
 void LLVOSky::initSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_ang_velocity)
 {
-        LLVector3 sun_direction = (sun_dir.magVec() == 0) ? LLVector3::x_axis : sun_dir;
-        sun_direction.normVec();
+        LLVector3 sun_direction = (sun_dir.length() == 0) ? LLVector3::x_axis : sun_dir;
+        sun_direction.normalize();
         mSun.setDirection(sun_direction);
         mSun.renewDirection();
         mSun.setAngularVelocity(sun_ang_velocity);
@@ -2222,8 +2222,8 @@ void LLVOSky::initSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_an
 
 void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_ang_velocity)
 {
-        LLVector3 sun_direction = (sun_dir.magVec() == 0) ? LLVector3::x_axis : sun_dir;
-        sun_direction.normVec();
+        LLVector3 sun_direction = (sun_dir.length() == 0) ? LLVector3::x_axis : sun_dir;
+        sun_direction.normalize();
 
         // Push the sun "South" as it approaches directly overhead so that we can always see bump mapping
         // on the upward facing faces of cubes.
@@ -2239,7 +2239,7 @@ void LLVOSky::setSunDirection(const LLVector3 &sun_dir, const LLVector3 &sun_ang
         // Blend between normal sun dir and adjusted sun dir based on how close we are
         // to having the sun overhead.
         mBumpSunDir = adjustedDir * sunDot + newDir * (1.0f - sunDot);
-        mBumpSunDir.normVec();
+        mBumpSunDir.normalize();
 
         F32 dp = mLastLightingDirection * sun_direction;
         mSun.setDirection(sun_direction);
diff --git a/linden/indra/newview/llvosky.h b/linden/indra/newview/llvosky.h
index b213322..25c075e 100644
--- a/linden/indra/newview/llvosky.h
+++ b/linden/indra/newview/llvosky.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 310a745..66c8dac 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -916,6 +916,97 @@ void LLVOSurfacePatch::getGeomSizesEast(const S32 stride, const S32 east_stride,
         }
 }
 
+BOOL LLVOSurfacePatch::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
+                                                                          LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
+        
+{
+
+        if (!lineSegmentBoundingBox(start, end))
+        {
+                return FALSE;
+        }
+
+        LLVector3 delta = end-start;
+                
+        LLVector3 pdelta = delta;
+        pdelta.mV[2] = 0;
+
+        F32 plength = pdelta.length();
+        
+        F32 tdelta = 1.f/plength;
+
+        LLVector3 origin = start - mRegionp->getOriginAgent();
+
+        if (mRegionp->getLandHeightRegion(origin) > origin.mV[2])
+        {
+                //origin is under ground, treat as no intersection
+                return FALSE;
+        }
+
+        //step one meter at a time until intersection point found
+
+        const LLVector3* ext = mDrawable->getSpatialExtents();
+        F32 rad = (delta*tdelta).magVecSquared();
+
+        F32 t = 0.f;
+        while ( t <= 1.f)
+        {
+                LLVector3 sample = origin + delta*t;
+                
+                if (AABBSphereIntersectR2(ext[0], ext[1], sample+mRegionp->getOriginAgent(), rad))
+                {
+                        F32 height = mRegionp->getLandHeightRegion(sample);
+                        if (height > sample.mV[2])
+                        { //ray went below ground, positive intersection
+                                //quick and dirty binary search to get impact point
+                                tdelta = -tdelta*0.5f;
+                                F32 err_dist = 0.001f;
+                                F32 dist = fabsf(sample.mV[2] - height);
+
+                                while (dist > err_dist && tdelta*tdelta > 0.0f)
+                                {
+                                        t += tdelta;
+                                        sample = origin+delta*t;
+                                        height = mRegionp->getLandHeightRegion(sample);
+                                        if ((tdelta < 0 && height < sample.mV[2]) ||
+                                                (height > sample.mV[2] && tdelta > 0))
+                                        { //jumped over intersection point, go back
+                                                tdelta = -tdelta;
+                                        }
+                                        tdelta *= 0.5f;
+                                        dist = fabsf(sample.mV[2] - height);
+                                }
+
+                                if (intersection)
+                                {
+                                        F32 height = mRegionp->getLandHeightRegion(sample);
+                                        if (fabsf(sample.mV[2]-height) < delta.length()*tdelta)
+                                        {
+                                                sample.mV[2] = mRegionp->getLandHeightRegion(sample);
+                                        }
+                                        *intersection = sample + mRegionp->getOriginAgent();
+                                }
+
+                                if (normal)
+                                {
+                                        *normal = mRegionp->getLand().resolveNormalGlobal(mRegionp->getPosGlobalFromRegion(sample));
+                                }
+
+                                return TRUE;
+                        }
+                }
+
+                t += tdelta;
+                if (t > 1 && t < 1.f+tdelta*0.99f)
+                { //make sure end point is checked (saves vertical lines coming up negative)
+                        t = 1.f;
+                }
+        }
+
+
+        return FALSE;
+}
+
 void LLVOSurfacePatch::updateSpatialExtents(LLVector3& newMin, LLVector3 &newMax)
 {
         LLVector3 posAgent = getPositionAgent();
diff --git a/linden/indra/newview/llvosurfacepatch.h b/linden/indra/newview/llvosurfacepatch.h
index 52c11c9..abd015d 100644
--- a/linden/indra/newview/llvosurfacepatch.h
+++ b/linden/indra/newview/llvosurfacepatch.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -85,6 +85,16 @@ public:
         void dirtyPatch();
         void dirtyGeom();
 
+        /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+                                                                                  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+                                                                                  BOOL pick_transparent = FALSE,
+                                                                                  S32* face_hit = NULL,                 // which face was hit
+                                                                                  LLVector3* intersection = NULL,       // return the intersection point
+                                                                                  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
+                                                                                  LLVector3* normal = NULL,             // return the surface normal at the intersection point
+                                                                                  LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
+                );
+
         BOOL                    mDirtiedPatch;
 protected:
         ~LLVOSurfacePatch();
diff --git a/linden/indra/newview/llvotextbubble.cpp b/linden/indra/newview/llvotextbubble.cpp
index 5424cc8..ba53bd3 100644
--- a/linden/indra/newview/llvotextbubble.cpp
+++ b/linden/indra/newview/llvotextbubble.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -118,30 +118,16 @@ BOOL LLVOTextBubble::idleUpdate(LLAgent &agent, LLWorld	&world, const F64 &time)
 void LLVOTextBubble::updateTextures(LLAgent &agent)
 {
         // Update the image levels of all textures...
-        // First we do some quick checks.
-        U32 i;
 
-        // This doesn't take into account whether the object is in front
-        // or behind...
-
-        LLVector3 position_local = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 dot_product = position_local * agent.getFrameAgent().getAtAxis();
-        F32 cos_angle = dot_product / position_local.magVec();
-
-        if (cos_angle > 1.f)
-        {
-                cos_angle = 1.f;
-        }
-
-        for (i = 0; i < getNumTEs(); i++)
+        for (U32 i = 0; i < getNumTEs(); i++)
         {
                 const LLTextureEntry *te = getTE(i);
                 F32 texel_area_ratio = fabs(te->mScaleS * te->mScaleT);
-
+                texel_area_ratio = llclamp(texel_area_ratio, .125f, 16.f);
                 LLViewerImage *imagep = getTEImage(i);
                 if (imagep)
                 {
-                        imagep->addTextureStats(mPixelArea, texel_area_ratio, cos_angle);
+                        imagep->addTextureStats(mPixelArea / texel_area_ratio);
                 }
         }
 }
diff --git a/linden/indra/newview/llvotextbubble.h b/linden/indra/newview/llvotextbubble.h
index cf50cb1..f4538ef 100644
--- a/linden/indra/newview/llvotextbubble.h
+++ b/linden/indra/newview/llvotextbubble.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index c86803d..23c92ea 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -273,9 +273,9 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys,
         // Do base class updates...
         U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
 
-        if (  (getVelocity().magVecSquared() > 0.f)
-                ||(getAcceleration().magVecSquared() > 0.f)
-                ||(getAngularVelocity().magVecSquared() > 0.f))
+        if (  (getVelocity().lengthSquared() > 0.f)
+                ||(getAcceleration().lengthSquared() > 0.f)
+                ||(getAngularVelocity().lengthSquared() > 0.f))
         {
                 llinfos << "ACK! Moving tree!" << llendl;
                 setVelocity(LLVector3::zero);
@@ -312,7 +312,7 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys,
         mTreeImagep = gImageList.getImage(sSpeciesTable[mSpecies]->mTextureID);
         if (mTreeImagep)
         {
-                mTreeImagep->bindTexture(0);
+                gGL.getTexUnit(0)->bind(mTreeImagep.get());
         }
         mBranchLength = sSpeciesTable[mSpecies]->mBranchLength;
         mTrunkLength = sSpeciesTable[mSpecies]->mTrunkLength;
@@ -359,14 +359,14 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
         mTrunkBend += mTrunkVel;
         mTrunkVel *= 0.99f;                                                                     //  Add damping
 
-        if (mTrunkBend.magVec() > 1.f)
+        if (mTrunkBend.length() > 1.f)
         {
-                mTrunkBend.normVec();
+                mTrunkBend.normalize();
         }
 
-        if (mTrunkVel.magVec() > 1.f)
+        if (mTrunkVel.length() > 1.f)
         {
-                mTrunkVel.normVec();
+                mTrunkVel.normalize();
         }
 
         return TRUE;
@@ -391,7 +391,7 @@ void LLVOTree::setPixelAreaAndAngle(LLAgent &agent)
         
         // This should be the camera's center, as soon as we move to all region-local.
         LLVector3 relative_position = getPositionAgent() - agent.getCameraPositionAgent();
-        F32 range = relative_position.magVec();                         // ugh, square root
+        F32 range = relative_position.length();                         // ugh, square root
 
         F32 max_scale = mBillboardScale * getMaxScale();
         F32 area = max_scale * (max_scale*mBillboardRatio);
@@ -713,9 +713,9 @@ BOOL LLVOTree::updateGeometry(LLDrawable *drawable)
                                 LLVector2 tc;
                                 // This isn't totally accurate.  Should compute based on slope as well.
                                 start_radius = r0 * (1.f + 1.2f*fabs(z - 0.66f*height)/height);
-                                nvec.setVec(    cos(nangle * DEG_TO_RAD)*start_radius*nvec_scale, 
-                                                                sin(nangle * DEG_TO_RAD)*start_radius*nvec_scale, 
-                                                                z*nvec_scalez); 
+                                nvec.set(       cos(nangle * DEG_TO_RAD)*start_radius*nvec_scale, 
+                                                        sin(nangle * DEG_TO_RAD)*start_radius*nvec_scale, 
+                                                        z*nvec_scalez); 
                                 // First and last slice at 0 radius (to bring in top/bottom of structure)
                                 radius = start_radius + turbulence3((F32*)&nvec.mV, (F32)fractal_depth)*noise_scale;
 
@@ -918,7 +918,7 @@ void LLVOTree::updateRadius()
 
 void LLVOTree::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
 {
-        F32 radius = getScale().magVec()*0.05f;
+        F32 radius = getScale().length()*0.05f;
         LLVector3 center = getRenderPosition();
 
         F32 sz = mBillboardScale*mBillboardRatio*radius*0.5f; 
@@ -926,11 +926,53 @@ void LLVOTree::updateSpatialExtents(LLVector3& newMin, LLVector3& newMax)
 
         center += LLVector3(0, 0, size.mV[2]) * getRotation();
         
-        newMin.setVec(center-size);
-        newMax.setVec(center+size);
+        newMin.set(center-size);
+        newMax.set(center+size);
         mDrawable->setPositionGroup(center);
 }
 
+BOOL LLVOTree::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
+                                                                          LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
+        
+{
+
+        if (!lineSegmentBoundingBox(start, end))
+        {
+                return FALSE;
+        }
+
+        const LLVector3* ext = mDrawable->getSpatialExtents();
+
+        LLVector3 center = (ext[1]+ext[0])*0.5f;
+        LLVector3 size = (ext[1]-ext[0]);
+
+        LLQuaternion quat = getRotation();
+
+        center -= LLVector3(0,0,size.magVec() * 0.25f)*quat;
+
+        size.scaleVec(LLVector3(0.25f, 0.25f, 1.f));
+        size.mV[0] = llmin(size.mV[0], 1.f);
+        size.mV[1] = llmin(size.mV[1], 1.f);
+
+        LLVector3 pos, norm;
+                
+        if (linesegment_tetrahedron(start, end, center, size, quat, pos, norm))
+        {
+                if (intersection)
+                {
+                        *intersection = pos;
+                }
+
+                if (normal)
+                {
+                        *normal = norm;
+                }
+                return TRUE;
+        }
+        
+        return FALSE;
+}
+
 U32 LLVOTree::getPartitionType() const
 { 
         return LLViewerRegion::PARTITION_TREE; 
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 180e5b0..f34371e 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,17 @@ public:
 
         U32 drawBranchPipeline(LLMatrix4& matrix, U16* indicesp, S32 trunk_LOD, S32 stop_level, U16 depth, U16 trunk_depth,  F32 scale, F32 twist, F32 droop,  F32 branches, F32 alpha);
  
+
+         /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+                                                                                  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+                                                                                  BOOL pick_transparent = FALSE,
+                                                                                  S32* face_hit = NULL,                 // which face was hit
+                                                                                  LLVector3* intersection = NULL,       // return the intersection point
+                                                                                  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
+                                                                                  LLVector3* normal = NULL,             // return the surface normal at the intersection point
+                                                                                  LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
+                );
+
         static S32 sMaxTreeSpecies;
 
         struct TreeSpeciesData
diff --git a/linden/indra/newview/llvotreenew.h b/linden/indra/newview/llvotreenew.h
index 5006c55..5288106 100644
--- a/linden/indra/newview/llvotreenew.h
+++ b/linden/indra/newview/llvotreenew.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 9d8369f..ad44356 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -68,8 +68,7 @@
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
-// sadly - we can't lower sculptie rez below b/c residents have a LOT of content that depends on the 128
-const S32 SCULPT_REZ = 128;
+const S32 MAX_SCULPT_REZ = 128;
 
 BOOL gAnimateTextures = TRUE;
 extern BOOL gHideSelectedObjects;
@@ -90,7 +89,7 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
         mLOD = MIN_LOD;
         mSculptLevel = -2;
         mTextureAnimp = NULL;
-        mVObjRadius = LLVector3(1,1,0.5f).magVec();
+        mVObjRadius = LLVector3(1,1,0.5f).length();
         mNumFaces = 0;
         mLODChanged = FALSE;
         mSculptChanged = FALSE;
@@ -498,6 +497,7 @@ void LLVOVolume::updateTextures()
                 else if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY))
                 {
                         F32 pri = imagep->getDecodePriority();
+                        pri = llmax(pri, 0.0f);
                         if (pri < min_vsize) min_vsize = pri;
                         if (pri > max_vsize) max_vsize = pri;
                 }
@@ -516,7 +516,10 @@ void LLVOVolume::updateTextures()
                 mSculptTexture = gImageList.getImage(id);
                 if (mSculptTexture.notNull())
                 {
-                        mSculptTexture->addTextureStats(SCULPT_REZ * SCULPT_REZ);
+                        S32 lod = llmin(mLOD, 3);
+                        F32 lodf = ((F32)(lod + 1.0f)/4.f); 
+                        F32 tex_size = lodf * MAX_SCULPT_REZ;
+                        mSculptTexture->addTextureStats(2.f * tex_size * tex_size);
                         mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
                                                                                                 (S32)LLViewerImage::BOOST_SCULPTED));
                 }
@@ -577,7 +580,7 @@ F32 LLVOVolume::getTextureVirtualSize(LLFace* face)
 
         //get area of circle in texture space
         LLVector2 tdim = face->mTexExtents[1] - face->mTexExtents[0];
-        F32 texel_area = (tdim * 0.5f).magVecSquared()*3.14159f;
+        F32 texel_area = (tdim * 0.5f).lengthSquared()*3.14159f;
         if (texel_area <= 0)
         {
                 // Probably animated, use default
@@ -605,7 +608,7 @@ BOOL LLVOVolume::setMaterial(const U8 material)
 void LLVOVolume::setTexture(const S32 face)
 {
         llassert(face < getNumTEs());
-        LLViewerImage::bindTexture(getTEImage(face));
+        gGL.getTexUnit(0)->bind(getTEImage(face));
 }
 
 void LLVOVolume::setScale(const LLVector3 &scale, BOOL damped)
@@ -759,10 +762,10 @@ void LLVOVolume::sculpt()
                         // corrupted volume... don't update the sculpty
                         return;
                 }
-                else if (current_discard > max_discard)
+                else if (current_discard > MAX_DISCARD_LEVEL)
                 {
                         llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
-                                << " is more than than allowed max of " << max_discard << llendl;
+                                << " is more than than allowed max of " << MAX_DISCARD_LEVEL << llendl;
                         
                         // corrupted volume... don't update the sculpty                 
                         return;
@@ -828,7 +831,7 @@ BOOL LLVOVolume::calcLOD()
 
         S32 cur_detail = 0;
         
-        F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).magVec();
+        F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
         F32 distance = mDrawable->mDistanceWRTCamera;
         distance *= sDistanceFactor;
                         
@@ -1687,7 +1690,7 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
 
                 //transform view vector into volume space
                 view_vector -= getRenderPosition();
-                mDrawable->mDistanceWRTCamera = view_vector.magVec();
+                mDrawable->mDistanceWRTCamera = view_vector.length();
                 LLQuaternion worldRot = getRenderRotation();
                 view_vector = view_vector * ~worldRot;
                 if (!isVolumeGlobal())
@@ -1728,7 +1731,7 @@ void LLVOVolume::updateRadius()
                 return;
         }
         
-        mVObjRadius = getScale().magVec();
+        mVObjRadius = getScale().length();
         mDrawable->setRadius(mVObjRadius);
 }
 
@@ -1841,7 +1844,7 @@ F32 LLVOVolume::getBinRadius()
         }
         else if (shrink_wrap)
         {
-                radius = (ext[1]-ext[0]).magVec()*0.5f;
+                radius = (ext[1]-ext[0]).length()*0.5f;
         }
         else if (mDrawable->isStatic())
         {
@@ -1934,10 +1937,20 @@ LLVector3 LLVOVolume::volumeDirectionToAgent(const LLVector3& dir) const
 }
 
 
-BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, S32 *face_hitp,
+BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
                                                                           LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
         
 {
+        if (!mbCanSelect ||
+                (gHideSelectedObjects && isSelected()) ||
+                        mDrawable->isDead() || 
+                        !gPipeline.hasRenderType(mDrawable->getRenderType()))
+        {
+                return FALSE;
+        }
+
+        BOOL ret = FALSE;
+
         LLVolume* volume = getVolume();
         if (volume)
         {       
@@ -1946,38 +1959,91 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
                 v_start = agentPositionToVolume(start);
                 v_end = agentPositionToVolume(end);
                 
-                S32 face_hit = volume->lineSegmentIntersect(v_start, v_end, face,
-                                                                                                        intersection, tex_coord, normal, bi_normal);
-                if (face_hit >= 0)
+                LLVector3 p;
+                LLVector3 n;
+                LLVector2 tc;
+                LLVector3 bn;
+
+                if (intersection != NULL)
                 {
-                        if (face_hitp != NULL)
-                        {
-                                *face_hitp = face_hit;
-                        }
+                        p = *intersection;
+                }
+
+                if (tex_coord != NULL)
+                {
+                        tc = *tex_coord;
+                }
+
+                if (normal != NULL)
+                {
+                        n = *normal;
+                }
+
+                if (bi_normal != NULL)
+                {
+                        bn = *bi_normal;
+                }
+
+                S32 face_hit = -1;
+
+                S32 start_face, end_face;
+                if (face == -1)
+                {
+                        start_face = 0;
+                        end_face = volume->getNumFaces();
+                }
+                else
+                {
+                        start_face = face;
+                        end_face = face+1;
+                }
+
+                for (S32 i = start_face; i < end_face; ++i)
+                {
+                        face_hit = volume->lineSegmentIntersect(v_start, v_end, i,
+                                                                                                        &p, &tc, &n, &bn);
                         
-                        if (intersection != NULL)
+                        if (face_hit >= 0 && mDrawable->getNumFaces() > face_hit)
                         {
-                                *intersection = volumePositionToAgent(*intersection);  // must map back to agent space
-                        }
+                                LLFace* face = mDrawable->getFace(face_hit);
+                        
+                                if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n)))
+                                {
+                                        v_end = p;
+                                        if (face_hitp != NULL)
+                                        {
+                                                *face_hitp = face_hit;
+                                        }
+                                        
+                                        if (intersection != NULL)
+                                        {
+                                                *intersection = volumePositionToAgent(p);  // must map back to agent space
+                                        }
 
-                        if (normal != NULL)
-                        {
-                                *normal = volumeDirectionToAgent(*normal);
-                                (*normal).normVec();
-                        }
+                                        if (normal != NULL)
+                                        {
+                                                *normal = volumeDirectionToAgent(n);
+                                                (*normal).normVec();
+                                        }
 
-                        if (bi_normal != NULL)
-                        {
-                                *bi_normal = volumeDirectionToAgent(*bi_normal);
-                                (*bi_normal).normVec();
-                        }
+                                        if (bi_normal != NULL)
+                                        {
+                                                *bi_normal = volumeDirectionToAgent(bn);
+                                                (*bi_normal).normVec();
+                                        }
 
-                        
-                        return TRUE;
+                                        if (tex_coord != NULL)
+                                        {
+                                                *tex_coord = tc;
+                                        }
+                                        
+                                        ret = TRUE;
+                                }
+                        }
                 }
         }
-        
-        return FALSE;
+                
+        return ret;
 }
 
 U32 LLVOVolume::getPartitionType() const
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index d8828f0..b80171e 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -114,6 +114,7 @@ public:
 
         /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
                                                                                   S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+                                                                                  BOOL pick_transparent = FALSE,
                                                                                   S32* face_hit = NULL,                 // which face was hit
                                                                                   LLVector3* intersection = NULL,       // return the intersection point
                                                                                   LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index 1ab6fbd..421c283 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvowater.h b/linden/indra/newview/llvowater.h
index fce5258..6fe2d97 100644
--- a/linden/indra/newview/llvowater.h
+++ b/linden/indra/newview/llvowater.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp
index 159603e..8f9b58b 100644
--- a/linden/indra/newview/llvowlsky.cpp
+++ b/linden/indra/newview/llvowlsky.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -87,7 +87,7 @@ inline U32 LLVOWLSky::getStarsNumIndices(void)
 }
 
 LLVOWLSky::LLVOWLSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-        : LLStaticViewerObject(id, pcode, regionp)
+        : LLStaticViewerObject(id, pcode, regionp, TRUE)
 {
         initStars();
 }
@@ -488,7 +488,7 @@ void LLVOWLSky::drawStars(void)
         if (mStarsVerts.notNull())
         {
                 mStarsVerts->setBuffer(LLDrawPoolWLSky::STAR_VERTEX_DATA_MASK);
-                mStarsVerts->draw(LLVertexBuffer::POINTS, getStarsNumIndices(), 0);
+                mStarsVerts->draw(LLRender::POINTS, getStarsNumIndices(), 0);
         }
 }
 
@@ -513,7 +513,7 @@ void LLVOWLSky::drawDome(void)
                 strips_segment->setBuffer(data_mask);
 
                 strips_segment->drawRange(
-                        LLVertexBuffer::TRIANGLE_STRIP, 
+                        LLRender::TRIANGLE_STRIP, 
                         0, strips_segment->getRequestedVerts()-1, strips_segment->getRequestedIndices(), 
                         0);
                 gPipeline.addTrianglesDrawn(strips_segment->getRequestedIndices() - 2);
diff --git a/linden/indra/newview/llvowlsky.h b/linden/indra/newview/llvowlsky.h
index 3a5cb3a..b507ba3 100644
--- a/linden/indra/newview/llvowlsky.h
+++ b/linden/indra/newview/llvowlsky.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwatchdog.cpp b/linden/indra/newview/llwatchdog.cpp
index 55975ee..cc49848 100644
--- a/linden/indra/newview/llwatchdog.cpp
+++ b/linden/indra/newview/llwatchdog.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,6 +35,15 @@
 
 const U32 WATCHDOG_SLEEP_TIME_USEC = 1000000;
 
+void default_killer_callback()
+{
+#ifdef LL_WINDOWS
+        RaiseException(0,0,0,0);
+#else
+        raise(SIGQUIT);
+#endif
+}
+
 // This class runs the watchdog timing thread.
 class LLWatchdogTimerThread : public LLThread
 {
@@ -52,7 +61,7 @@ public:
         void stop() 
         {
                 mStopping = true; 
-                ms_sleep(1);
+                mSleepMsecs = 1;
         }
     
         /* virtual */ void run()
@@ -146,7 +155,8 @@ void LLWatchdogTimeout::ping(const std::string& state)
 LLWatchdog::LLWatchdog() :
         mSuspectsAccessMutex(NULL),
         mTimer(NULL),
-        mLastClockCount(0)
+        mLastClockCount(0),
+        mKillerCallback(&default_killer_callback)
 {
 }
 
@@ -168,8 +178,9 @@ void LLWatchdog::remove(LLWatchdogEntry* e)
         unlockThread();
 }
 
-void LLWatchdog::init()
+void LLWatchdog::init(killer_event_callback func)
 {
+        mKillerCallback = func;
         if(!mSuspectsAccessMutex && !mTimer)
         {
                 mSuspectsAccessMutex = new LLMutex(NULL);
@@ -238,11 +249,7 @@ void LLWatchdog::run()
                         }
 
                         llinfos << "Watchdog detected error:" << llendl;
-#ifdef LL_WINDOWS
-                        RaiseException(0,0,0,0);
-#else
-                        raise(SIGQUIT);
-#endif
+                        mKillerCallback();
                 }
         }
 
diff --git a/linden/indra/newview/llwatchdog.h b/linden/indra/newview/llwatchdog.h
index d196486..d102a4a 100644
--- a/linden/indra/newview/llwatchdog.h
+++ b/linden/indra/newview/llwatchdog.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,6 +32,8 @@
 #ifndef LL_LLTHREADWATCHDOG_H
 #define LL_LLTHREADWATCHDOG_H
 
+#include <boost/function.hpp>
+
 #ifndef LL_TIMER_H                                      
         #include "lltimer.h"
 #endif
@@ -85,7 +87,9 @@ public:
         void add(LLWatchdogEntry* e);
         void remove(LLWatchdogEntry* e);
 
-        void init();
+        typedef boost::function<void (void)> killer_event_callback;
+
+        void init(killer_event_callback func = NULL);
         void run();
         void cleanup();
     
@@ -98,6 +102,8 @@ private:
         LLMutex* mSuspectsAccessMutex;
         LLWatchdogTimerThread* mTimer;
         U64 mLastClockCount;
+
+        killer_event_callback mKillerCallback;
 };
 
 #endif // LL_LLTHREADWATCHDOG_H
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index f4f1163..83bf555 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -89,48 +89,57 @@ LLWaterParamManager::~LLWaterParamManager()
 void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
         std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
-        LL_INFOS2("AppInit", "Shaders") << "Loading water settings from " << path_name << LL_ENDL;
-
-        //mParamList.clear();
-        
+        LL_INFOS2("AppInit", "Shaders") << "Loading Default water settings from " << path_name << LL_ENDL;
+                        
         bool found = true;                      
         while(found) 
         {
                 std::string name;
                 found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
-
-                LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
-                
-                // if we have one
-                if(found) 
+                if(found)
                 {
+
+                        name=name.erase(name.length()-4);
+
                         // bugfix for SL-46920: preventing filenames that break stuff.
                         char * curl_str = curl_unescape(name.c_str(), name.size());
                         std::string unescaped_name(curl_str);
                         curl_free(curl_str);
                         curl_str = NULL;
 
-                        // not much error checking here since we're getting rid of this
-                        std::string water_name = unescaped_name.substr(0, unescaped_name.size() - 4);
-                
-                        std::string cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", name));
-                        LL_DEBUGS2("AppInit", "Shaders") << "Loading water from " << cur_path << LL_ENDL;
+                        LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
+                        loadPreset(unescaped_name,FALSE);
+                }
+        }
+
+        // And repeat for user presets, note the user presets will modify any system presets already loaded
+
+        std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
+        LL_INFOS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
                         
-                        llifstream water_xml(cur_path);
-                        if (water_xml)
-                        {
-                                LLSD water_data(LLSD::emptyMap());
-                                LLPointer<LLSDParser> parser = new LLSDXMLParser();
-                                parser->parse(water_xml, water_data, LLSDSerialize::SIZE_UNLIMITED);
+        found = true;                   
+        while(found) 
+        {
+                std::string name;
+                found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
+                if(found)
+                {
+                        name=name.erase(name.length()-4);
 
-                                addParamSet(water_name, water_data);
-                                water_xml.close();
-                        }
+                        // bugfix for SL-46920: preventing filenames that break stuff.
+                        char * curl_str = curl_unescape(name.c_str(), name.size());
+                        std::string unescaped_name(curl_str);
+                        curl_free(curl_str);
+                        curl_str = NULL;
+
+                        LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
+                        loadPreset(unescaped_name,FALSE);
                 }
         }
+
 }
 
-void LLWaterParamManager::loadPreset(const std::string & name)
+void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 {
         // bugfix for SL-46920: preventing filenames that break stuff.
         char * curl_str = curl_escape(name.c_str(), name.size());
@@ -142,8 +151,17 @@ void LLWaterParamManager::loadPreset(const std::string & name)
 
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
         llinfos << "Loading water settings from " << pathName << llendl;
-
-        llifstream presetsXML(pathName);
+        
+        std::ifstream presetsXML;
+        presetsXML.open(pathName.c_str());
+        
+        // That failed, try loading from the users area instead.
+        if(!presetsXML)
+        {
+                pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename);
+                llinfos << "Loading User water setting from " << pathName << llendl;
+                presetsXML.open(pathName.c_str());
+        }
 
         if (presetsXML)
         {
@@ -170,10 +188,12 @@ void LLWaterParamManager::loadPreset(const std::string & name)
                 return;
         }
 
-        getParamSet(name, mCurParams);
-
-        propagateParameters();
-}
+        if(propagate)
+        {
+                getParamSet(name, mCurParams);
+                propagateParameters();
+        }
+}       
 
 void LLWaterParamManager::savePreset(const std::string & name)
 {
@@ -187,7 +207,7 @@ void LLWaterParamManager::savePreset(const std::string & name)
 
         // make an empty llsd
         LLSD paramsData(LLSD::emptyMap());
-        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
+        std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", escaped_filename));
 
         // fill it with LLSD windlight params
         paramsData = mParamList[name].getAll();
@@ -390,7 +410,8 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 
         if(delete_from_disk)
         {
-                std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
+
+                std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
                 
                 // use full curl escaped name
                 char * curl_str = curl_escape(name.c_str(), name.size());
diff --git a/linden/indra/newview/llwaterparammanager.h b/linden/indra/newview/llwaterparammanager.h
index 872725e..0b98560 100644
--- a/linden/indra/newview/llwaterparammanager.h
+++ b/linden/indra/newview/llwaterparammanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -228,7 +228,8 @@ public:
         void loadAllPresets(const std::string & fileName);
 
         /// load an individual preset into the sky
-        void loadPreset(const std::string & name);
+
+        void loadPreset(const std::string & name,bool propagate=true);
 
         /// save the parameter presets to file
         void savePreset(const std::string & name);
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index e7a05f4..a66d363 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index 17ee1df..4069550 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index a746ebd..6bdc50f 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 00a53d3..ea16d20 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index cf5d91b..2d4f26a 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwearablelist.h b/linden/indra/newview/llwearablelist.h
index 1ee03e8..b85b775 100644
--- a/linden/indra/newview/llwearablelist.h
+++ b/linden/indra/newview/llwearablelist.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llweb.cpp b/linden/indra/newview/llweb.cpp
index a3ccab3..2eee2d3 100644
--- a/linden/indra/newview/llweb.cpp
+++ b/linden/indra/newview/llweb.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llweb.h b/linden/indra/newview/llweb.h
index 8dbddaf..3028721 100644
--- a/linden/indra/newview/llweb.h
+++ b/linden/indra/newview/llweb.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index c4a2b2b..7a9194c 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -483,13 +483,7 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
 
 void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in )
 {
-        std::string language = gSavedSettings.getString("Language");
-        
-        if(language == "default")
-        {
-                language = gSavedSettings.getString("SystemLanguage");
-        }
-
+        std::string language = LLUI::getLanguage();
         std::string delim = gDirUtilp->getDirDelimiter();
         std::string filename;
 
@@ -596,14 +590,14 @@ void LLWebBrowserCtrl::draw()
                 }
 
                 // scale texture to fit the space using texture coords
-                mWebBrowserImage->bindTexture();
+                gGL.getTexUnit(0)->bind(mWebBrowserImage->getTexture());
                 gGL.color4fv( LLColor4::white.mV );
                 F32 max_u = ( F32 )mWebBrowserImage->getBrowserWidth() / ( F32 )mWebBrowserImage->getWidth();
                 F32 max_v = ( F32 )mWebBrowserImage->getBrowserHeight() / ( F32 )mWebBrowserImage->getHeight();
 
                 // draw the browser
                 gGL.setSceneBlendType(LLRender::BT_REPLACE);
-                gGL.begin( LLVertexBuffer::QUADS );
+                gGL.begin( LLRender::QUADS );
                 {
                         // render using web browser reported width and height, instead of trying to invert GL scale
                         gGL.texCoord2f( max_u, max_v );
diff --git a/linden/indra/newview/llwebbrowserctrl.h b/linden/indra/newview/llwebbrowserctrl.h
index 8a31421..e4ecea7 100644
--- a/linden/indra/newview/llwebbrowserctrl.h
+++ b/linden/indra/newview/llwebbrowserctrl.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwind.cpp b/linden/indra/newview/llwind.cpp
index 3b18835..06684ec 100644
--- a/linden/indra/newview/llwind.cpp
+++ b/linden/indra/newview/llwind.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwind.h b/linden/indra/newview/llwind.h
index 5481fdc..bffb810 100644
--- a/linden/indra/newview/llwind.h
+++ b/linden/indra/newview/llwind.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index e48b7bf..129d925 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -42,6 +42,7 @@
 #pragma warning(disable: 4200)  //nonstandard extension used : zero-sized array in struct/union
 #pragma warning(disable: 4100)  //unreferenced formal parameter
 
+
 /*
 LLSD Block for Windows Dump Information
 <llsd>
@@ -120,8 +121,18 @@ MODULE32_NEST	Module32Next_;
 #define CALL_TRACE_MAX  ((DUMP_SIZE_MAX - 2000) / (MAX_PATH + 40))      //max number of traced calls
 #define NL                              L"\r\n" //new line
 
-BOOL WINAPI Get_Module_By_Ret_Addr(PBYTE Ret_Addr, LPWSTR Module_Name, PBYTE & Module_Addr);
 
+typedef struct STACK
+{
+        STACK * Ebp;
+        PBYTE   Ret_Addr;
+        DWORD   Param[0];
+} STACK, * PSTACK;
+
+BOOL WINAPI Get_Module_By_Ret_Addr(PBYTE Ret_Addr, LPWSTR Module_Name, PBYTE & Module_Addr);
+void WINAPI Get_Call_Stack(const EXCEPTION_RECORD* exception_record, 
+                                                   const CONTEXT* context_record, 
+                                                   LLSD& info);
 
 void printError( CHAR* msg )
 {
@@ -184,69 +195,6 @@ BOOL GetProcessThreadIDs(DWORD process_id, std::vector<DWORD>& thread_ids)
   return( TRUE );
 }
 
-void WINAPI GetCallStackData(const CONTEXT* context_struct, LLSD& info)
-{       
-    // Fill Str with call stack info.
-    // pException can be either GetExceptionInformation() or NULL.
-    // If pException = NULL - get current call stack.
-
-    LPWSTR      Module_Name = new WCHAR[MAX_PATH];
-        PBYTE   Module_Addr = 0;
-        
-        typedef struct STACK
-        {
-                STACK * Ebp;
-                PBYTE   Ret_Addr;
-                DWORD   Param[0];
-        } STACK, * PSTACK;
-
-        PSTACK  Ebp;
-
-    if(context_struct)
-    {
-        Ebp = (PSTACK)context_struct->Ebp;
-    }
-    else
-    {
-        // The context struct is NULL, 
-        // so we will use the current stack.
-        Ebp = (PSTACK)&context_struct - 1;
-
-        // Skip frame of GetCallStackData().
-                if (!IsBadReadPtr(Ebp, sizeof(PSTACK)))
-                        Ebp = Ebp->Ebp;         //caller ebp
-    }
-
-        // Trace CALL_TRACE_MAX calls maximum - not to exceed DUMP_SIZE_MAX.
-        // Break trace on wrong stack frame.
-        for (int Ret_Addr_I = 0, i = 0;
-                (Ret_Addr_I < CALL_TRACE_MAX) && !IsBadReadPtr(Ebp, sizeof(PSTACK)) && !IsBadCodePtr(FARPROC(Ebp->Ret_Addr));
-                Ret_Addr_I++, Ebp = Ebp->Ebp, ++i)
-        {
-                // If module with Ebp->Ret_Addr found.
-
-                if (Get_Module_By_Ret_Addr(Ebp->Ret_Addr, Module_Name, Module_Addr))
-                {
-                        // Save module's address and full path.
-                        info["CallStack"][i]["ModuleName"] = ll_convert_wide_to_string(Module_Name);
-                        info["CallStack"][i]["ModuleAddress"] = (int)Module_Addr;
-                        info["CallStack"][i]["CallOffset"] = (int)(Ebp->Ret_Addr - Module_Addr);
-
-                        LLSD params;
-                        // Save 5 params of the call. We don't know the real number of params.
-                        if (!IsBadReadPtr(Ebp, sizeof(PSTACK) + 5 * sizeof(DWORD)))
-                        {
-                                for(int j = 0; j < 5; ++j)
-                                {
-                                        params[j] = (int)Ebp->Param[j];
-                                }
-                        }
-                        info["CallStack"][i]["Parameters"] = params;
-                }
-                info["CallStack"][i]["ReturnAddress"] = (int)Ebp->Ret_Addr;                     
-        }
-}
-
 BOOL GetThreadCallStack(DWORD thread_id, LLSD& info)
 {
     if(GetCurrentThreadId() == thread_id)
@@ -271,7 +219,7 @@ BOOL GetThreadCallStack(DWORD thread_id, LLSD& info)
         context_struct.ContextFlags = CONTEXT_FULL;
         if(GetThreadContext(thread_handle, &context_struct))
         {
-            GetCallStackData(&context_struct, info);
+            Get_Call_Stack(NULL, &context_struct, info);
             result = true;
         }
         ResumeThread(thread_handle);
@@ -326,35 +274,143 @@ BOOL WINAPI Get_Module_By_Ret_Addr(PBYTE Ret_Addr, LPWSTR Module_Name, PBYTE & M
         return found;
 } //Get_Module_By_Ret_Addr
 
+bool has_valid_call_before(PDWORD cur_stack_loc)
+{
+        PBYTE p_first_byte = (PBYTE)(*cur_stack_loc - 1);
+        PBYTE p_second_byte = (PBYTE)(*cur_stack_loc -2);
+        PBYTE p_fifth_byte = (PBYTE)(*cur_stack_loc - 5);
+        PBYTE p_sixth_byte = (PBYTE)(*cur_stack_loc - 6);
+
+        // make sure we can read it
+        if(IsBadReadPtr(p_sixth_byte, 6 * sizeof(BYTE)))
+        {
+                return false;
+        }
+
+        // check for 9a + 4 bytes
+        if(*p_fifth_byte == 0x9A)
+        {
+                return true;
+        }
+
+        // Check for E8 + 4 bytes and last byte is 00 or FF
+        if(*p_fifth_byte == 0xE8 && (*p_first_byte == 0x00 || *p_first_byte == 0xFF))
+        {
+                return true;
+        }
+        
+        // the other is six bytes
+        if(*p_sixth_byte == 0xFF || *p_second_byte == 0xFF)
+        {
+                return true;
+        }
+
+        return false;
+}
+
+PBYTE get_valid_frame(PBYTE esp)
+{
+        PDWORD cur_stack_loc = NULL;
+        const int max_search = 400;
+        WCHAR   module_name[MAX_PATH];
+        PBYTE   module_addr = 0;
+
+        // round to highest multiple of four
+        esp = (esp + (4 - ((int)esp % 4)) % 4);
+
+        // scroll through stack a few hundred places.
+        for (cur_stack_loc = (PDWORD) esp; cur_stack_loc < (PDWORD)esp + max_search; cur_stack_loc += 1)
+        {
+                // if you can read the pointer,
+                if (IsBadReadPtr(cur_stack_loc, sizeof(PDWORD)))
+                {
+                        continue;
+                }
+
+                //  check if it's in a module
+                if (!Get_Module_By_Ret_Addr((PBYTE)*cur_stack_loc, module_name, module_addr))
+                {
+                        continue;
+                }
+
+                // check if the code before the instruction ptr is a call 
+                if(!has_valid_call_before(cur_stack_loc))
+                {
+                        continue;
+                }
+                
+                // if these all pass, return that ebp, otherwise continue till we're dead
+                return (PBYTE)(cur_stack_loc - 1);
+        }
+
+        return NULL;
+}
+
+bool shouldUseStackWalker(PSTACK Ebp, int max_depth)
+{
+        WCHAR   Module_Name[MAX_PATH];
+        PBYTE   Module_Addr = 0;
+        int depth = 0;
+
+        while (depth < max_depth) 
+        {
+                if (IsBadReadPtr(Ebp, sizeof(PSTACK)) || 
+                        IsBadReadPtr(Ebp->Ebp, sizeof(PSTACK)) ||
+                        Ebp->Ebp < Ebp ||
+                        Ebp->Ebp - Ebp > 0xFFFFFF ||
+                        IsBadCodePtr(FARPROC(Ebp->Ebp->Ret_Addr)) ||
+                        !Get_Module_By_Ret_Addr(Ebp->Ebp->Ret_Addr, Module_Name, Module_Addr))
+                {
+                        return true;
+                }
+                depth++;
+                Ebp = Ebp->Ebp;
+        }
+
+        return false;
+}
+
 //******************************************************************
-void WINAPI Get_Call_Stack(PEXCEPTION_POINTERS pException, LLSD& info)
+void WINAPI Get_Call_Stack(const EXCEPTION_RECORD* exception_record, 
+                                                   const CONTEXT* context_record, 
+                                                   LLSD& info)
 //******************************************************************
 // Fill Str with call stack info.
 // pException can be either GetExceptionInformation() or NULL.
 // If pException = NULL - get current call stack.
-{       
+{
         LPWSTR  Module_Name = new WCHAR[MAX_PATH];
         PBYTE   Module_Addr = 0;
-        
-        typedef struct STACK
-        {
-                STACK * Ebp;
-                PBYTE   Ret_Addr;
-                DWORD   Param[0];
-        } STACK, * PSTACK;
+        LLSD params;
+        PBYTE   Esp = NULL;
+        LLSD tmp_info;
+
+        bool fake_frame = false;
+        bool ebp_used = false;
+        const int HEURISTIC_MAX_WALK = 20;
+        int heuristic_walk_i = 0;
+        int Ret_Addr_I = 0;
 
         STACK   Stack = {0, 0};
         PSTACK  Ebp;
 
-        if (pException)         //fake frame for exception address
+        if (exception_record && context_record)         //fake frame for exception address
         {
-                Stack.Ebp = (PSTACK)pException->ContextRecord->Ebp;
-                Stack.Ret_Addr = (PBYTE)pException->ExceptionRecord->ExceptionAddress;
+                Stack.Ebp = (PSTACK)(context_record->Ebp);
+                Stack.Ret_Addr = (PBYTE)exception_record->ExceptionAddress;
                 Ebp = &Stack;
+                Esp = (PBYTE) context_record->Esp;
+                fake_frame = true;
+        }
+        else if(context_record)
+        {
+        Ebp = (PSTACK)(context_record->Ebp);
+                Esp = (PBYTE)(context_record->Esp);
         }
         else
         {
-                Ebp = (PSTACK)&pException - 1;  //frame addr of Get_Call_Stack()
+                Ebp = (PSTACK)&exception_record - 1;    //frame addr of Get_Call_Stack()
+                Esp = (PBYTE)&exception_record;
 
                 // Skip frame of Get_Call_Stack().
                 if (!IsBadReadPtr(Ebp, sizeof(PSTACK)))
@@ -363,22 +419,21 @@ void WINAPI Get_Call_Stack(PEXCEPTION_POINTERS pException, LLSD& info)
 
         // Trace CALL_TRACE_MAX calls maximum - not to exceed DUMP_SIZE_MAX.
         // Break trace on wrong stack frame.
-        for (int Ret_Addr_I = 0, i = 0;
-                (Ret_Addr_I < CALL_TRACE_MAX) && !IsBadReadPtr(Ebp, sizeof(PSTACK)) && !IsBadCodePtr(FARPROC(Ebp->Ret_Addr));
-                Ret_Addr_I++, Ebp = Ebp->Ebp, ++i)
+        for (Ret_Addr_I = 0;
+                heuristic_walk_i < HEURISTIC_MAX_WALK && 
+                Ret_Addr_I < CALL_TRACE_MAX && !IsBadReadPtr(Ebp, sizeof(PSTACK)) && !IsBadCodePtr(FARPROC(Ebp->Ret_Addr));
+                Ret_Addr_I++)
         {
                 // If module with Ebp->Ret_Addr found.
-
                 if (Get_Module_By_Ret_Addr(Ebp->Ret_Addr, Module_Name, Module_Addr))
                 {
                         // Save module's address and full path.
-                        info["CallStack"][i]["ModuleName"] = ll_convert_wide_to_string(Module_Name);
-                        info["CallStack"][i]["ModuleAddress"] = (int)Module_Addr;
-                        info["CallStack"][i]["CallOffset"] = (int)(Ebp->Ret_Addr - Module_Addr);
+                        tmp_info["CallStack"][Ret_Addr_I]["ModuleName"] = ll_convert_wide_to_string(Module_Name);
+                        tmp_info["CallStack"][Ret_Addr_I]["ModuleAddress"] = (int)Module_Addr;
+                        tmp_info["CallStack"][Ret_Addr_I]["CallOffset"] = (int)(Ebp->Ret_Addr - Module_Addr);
 
-                        LLSD params;
                         // Save 5 params of the call. We don't know the real number of params.
-                        if (pException && !Ret_Addr_I)  //fake frame for exception address
+                        if (fake_frame && !Ret_Addr_I)  //fake frame for exception address
                                 params[0] = "Exception Offset";
                         else if (!IsBadReadPtr(Ebp, sizeof(PSTACK) + 5 * sizeof(DWORD)))
                         {
@@ -387,10 +442,64 @@ void WINAPI Get_Call_Stack(PEXCEPTION_POINTERS pException, LLSD& info)
                                         params[j] = (int)Ebp->Param[j];
                                 }
                         }
-                        info["CallStack"][i]["Parameters"] = params;
+                        tmp_info["CallStack"][Ret_Addr_I]["Parameters"] = params;
                 }
-                info["CallStack"][i]["ReturnAddress"] = (int)Ebp->Ret_Addr;                     
+
+                tmp_info["CallStack"][Ret_Addr_I]["ReturnAddress"] = (int)Ebp->Ret_Addr;
+
+                // get ready for next frame
+                // Set ESP to just after return address.  Not the real esp, but just enough after the return address
+                if(!fake_frame) {
+                        Esp = (PBYTE)Ebp + 8;
+                } 
+                else
+                {
+                        fake_frame = false;
+                }
+
+                // is next ebp valid?
+                // only run if we've never found a good ebp
+                // and make sure the one after is valid as well
+                if(     !ebp_used && 
+                        shouldUseStackWalker(Ebp, 2))
+                {
+                        heuristic_walk_i++;
+                        PBYTE new_ebp = get_valid_frame(Esp);
+                        if (new_ebp != NULL)
+                        {
+                                Ebp = (PSTACK)new_ebp;
+                        }
+                }
+                else
+                {
+                        ebp_used = true;
+                        Ebp = Ebp->Ebp;
+                }
+        }
+/* TODO remove or turn this code back on to edit the stack after i see a few raw ones. -Palmer
+        // Now go back through and edit out heuristic stacks that could very well be bogus.
+        // Leave the top and the last 3 stack chosen by the heuristic, however.
+        if(heuristic_walk_i > 2)
+        {
+                info["CallStack"][0] = tmp_info["CallStack"][0];
+                std::string ttest = info["CallStack"][0]["ModuleName"];
+                for(int cur_frame = 1; 
+                        (cur_frame + heuristic_walk_i - 2 < Ret_Addr_I); 
+                        ++cur_frame)
+                {
+                        // edit out the middle heuristic found frames
+                        info["CallStack"][cur_frame] = tmp_info["CallStack"][cur_frame + heuristic_walk_i - 2];
+                }
+        }
+        else
+        {
+                info = tmp_info;
         }
+*/
+        info = tmp_info;
+        info["HeuristicWalkI"] = heuristic_walk_i;
+        info["EbpUsed"] = ebp_used;
+
 } //Get_Call_Stack
 
 //***********************************
@@ -429,7 +538,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
         FILETIME        Last_Write_Time;
         FILETIME        Local_File_Time;
         SYSTEMTIME      T;
-        
+
         Str = new WCHAR[DUMP_SIZE_MAX];
         Str_Len = 0;
         if (!Str)
@@ -439,6 +548,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
         
         GetModuleFileName(NULL, Str, MAX_PATH);
         info["Process"] = ll_convert_wide_to_string(Str);
+        info["ThreadID"] = (S32)GetCurrentThreadId();
 
         // If exception occurred.
         if (pException)
@@ -506,7 +616,7 @@ LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException)
         } //if (pException)
         
         // Save call stack info.
-        Get_Call_Stack(pException, info);
+        Get_Call_Stack(pException->ExceptionRecord, pException->ContextRecord, info);
 
         return info;
 } //Get_Exception_Info
@@ -552,6 +662,58 @@ void LLMemoryReserve::release()
 
 static LLMemoryReserve gEmergencyMemoryReserve;
 
+#ifndef _M_IX86
+        #error "The following code only works for x86!"
+#endif
+LPTOP_LEVEL_EXCEPTION_FILTER WINAPI MyDummySetUnhandledExceptionFilter(
+        LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter)
+{
+        if(lpTopLevelExceptionFilter ==  gFilterFunc)
+                return gFilterFunc;
+
+        llinfos << "Someone tried to set the exception filter. Listing call stack modules" << llendl;
+        LLSD cs_info;
+        Get_Call_Stack(NULL, NULL, cs_info);
+        
+        if(cs_info.has("CallStack") && cs_info["CallStack"].isArray())
+        {
+                LLSD cs = cs_info["CallStack"];
+                for(LLSD::array_iterator i = cs.beginArray(); 
+                        i != cs.endArray(); 
+                        ++i)
+                {
+                        llinfos << "Module: " << (*i)["ModuleName"] << llendl;
+                }
+        }
+        
+        return gFilterFunc;
+}
+
+BOOL PreventSetUnhandledExceptionFilter()
+{
+        HMODULE hKernel32 = LoadLibrary(_T("kernel32.dll"));
+        if (hKernel32 == NULL) 
+                return FALSE;
+
+        void *pOrgEntry = GetProcAddress(hKernel32, "SetUnhandledExceptionFilter");
+        if(pOrgEntry == NULL) 
+                return FALSE;
+        
+        unsigned char newJump[ 100 ];
+        DWORD dwOrgEntryAddr = (DWORD)pOrgEntry;
+        dwOrgEntryAddr += 5; // add 5 for 5 op-codes for jmp far
+        void *pNewFunc = &MyDummySetUnhandledExceptionFilter;
+        DWORD dwNewEntryAddr = (DWORD) pNewFunc;
+        DWORD dwRelativeAddr = dwNewEntryAddr - dwOrgEntryAddr;
+
+        newJump[ 0 ] = 0xE9;  // JMP absolute
+        memcpy(&newJump[ 1 ], &dwRelativeAddr, sizeof(pNewFunc));
+        SIZE_T bytesWritten;
+        BOOL bRet = WriteProcessMemory(GetCurrentProcess(),
+        pOrgEntry, newJump, sizeof(pNewFunc) + 1, &bytesWritten);
+        return bRet;
+}
+
 // static
 void  LLWinDebug::initExceptionHandler(LPTOP_LEVEL_EXCEPTION_FILTER filter_func)
 {
@@ -602,6 +764,9 @@ void  LLWinDebug::initExceptionHandler(LPTOP_LEVEL_EXCEPTION_FILTER filter_func)
     LPTOP_LEVEL_EXCEPTION_FILTER prev_filter;
         prev_filter = SetUnhandledExceptionFilter(filter_func);
 
+        // *REMOVE:Mani
+        //PreventSetUnhandledExceptionFilter();
+
         if(prev_filter != gFilterFunc)
         {
                 LL_WARNS("AppInit") 
@@ -737,3 +902,10 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop
         LLSDSerialize::toPrettyXML(info, out_file);
         out_file.close();
 }
+
+void LLWinDebug::clearCrashStacks()
+{
+        LLSD info;
+        std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "SecondLifeException.log");
+        LLFile::remove(dump_path);
+}
diff --git a/linden/indra/newview/llwindebug.h b/linden/indra/newview/llwindebug.h
index eef2340..13a580c 100644
--- a/linden/indra/newview/llwindebug.h
+++ b/linden/indra/newview/llwindebug.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2004&license=viewergpl$
  * 
- * Copyright (c) 2004-2008, Linden Research, Inc.
+ * Copyright (c) 2004-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -39,7 +39,6 @@ class LLWinDebug
 {
 public:
 
-
         /** 
         * @brief initialize the llwindebug exception filter callback
         * 
@@ -66,6 +65,8 @@ public:
         static bool checkExceptionHandler();
 
         static void generateCrashStacks(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
+        static void clearCrashStacks(); // Delete the crash stack file(s).
+
         static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
 private:
 };
diff --git a/linden/indra/newview/llwlanimator.cpp b/linden/indra/newview/llwlanimator.cpp
index d87c379..4a4ec2f 100644
--- a/linden/indra/newview/llwlanimator.cpp
+++ b/linden/indra/newview/llwlanimator.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwlanimator.h b/linden/indra/newview/llwlanimator.h
index 18c730a..16cd6c5 100644
--- a/linden/indra/newview/llwlanimator.h
+++ b/linden/indra/newview/llwlanimator.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwldaycycle.cpp b/linden/indra/newview/llwldaycycle.cpp
index 2bf9e58..e7168fb 100644
--- a/linden/indra/newview/llwldaycycle.cpp
+++ b/linden/indra/newview/llwldaycycle.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwldaycycle.h b/linden/indra/newview/llwldaycycle.h
index 1438306..d344067 100644
--- a/linden/indra/newview/llwldaycycle.h
+++ b/linden/indra/newview/llwldaycycle.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 1707fe9..c1723f7 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -106,84 +106,65 @@ LLWLParamManager::~LLWLParamManager()
 
 void LLWLParamManager::loadPresets(const std::string& file_name)
 {
-        // if fileName exists, use legacy loading form the big file, otherwise, search the sky 
-        // directory, and add the list
-        if(file_name != "") 
+        std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
+        LL_INFOS2("AppInit", "Shaders") << "Loading Default WindLight settings from " << path_name << LL_ENDL;
+                        
+        bool found = true;                      
+        while(found) 
         {
-                std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", file_name));
-                LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
-
-                llifstream presetsXML(path_name);
-        
-                if (presetsXML)
+                std::string name;
+                found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
+                if(found)
                 {
-                        LLSD paramsData(LLSD::emptyMap());
 
-                        LLPointer<LLSDParser> parser = new LLSDXMLParser();
+                        name=name.erase(name.length()-4);
 
-                        parser->parse(presetsXML, paramsData, LLSDSerialize::SIZE_UNLIMITED);
+                        // bugfix for SL-46920: preventing filenames that break stuff.
+                        char * curl_str = curl_unescape(name.c_str(), name.size());
+                        std::string unescaped_name(curl_str);
+                        curl_free(curl_str);
+                        curl_str = NULL;
 
-                        LLSD::map_const_iterator endParams = paramsData.endMap();
-                        for(LLSD::map_const_iterator curParams = paramsData.beginMap();
-                                curParams != endParams;
-                                ++curParams)
-                        {
-                                addParamSet(curParams->first, curParams->second);
-                        }
+                        LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
+                        loadPreset(unescaped_name,FALSE);
                 }
         }
-        
-        // otherwise, search the sky directory and find things there
-        else
+
+        // And repeat for user presets, note the user presets will modify any system presets already loaded
+
+        std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
+        LL_INFOS2("AppInit", "Shaders") << "Loading User WindLight settings from " << path_name2 << LL_ENDL;
+                        
+        found = true;                   
+        while(found) 
         {
-                std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
-                LL_INFOS2("AppInit", "Shaders") << "Loading WindLight settings from " << path_name << LL_ENDL;
-        
-                //mParamList.clear();
-                
-                bool found = true;                      
-                while(found) 
+                std::string name;
+                found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
+                if(found)
                 {
-                        std::string name;
-                        found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
+                        name=name.erase(name.length()-4);
+
+                        // bugfix for SL-46920: preventing filenames that break stuff.
+                        char * curl_str = curl_unescape(name.c_str(), name.size());
+                        std::string unescaped_name(curl_str);
+                        curl_free(curl_str);
+                        curl_str = NULL;
 
                         LL_DEBUGS2("AppInit", "Shaders") << "name: " << name << LL_ENDL;
-                        
-                        // if we have one
-                        if(found) 
-                        {
-                                // bugfix for SL-46920: preventing filenames that break stuff.
-                                char * curl_str = curl_unescape(name.c_str(), name.size());
-                                std::string unescaped_name(curl_str);
-                                curl_free(curl_str);
-                                curl_str = NULL;
-
-                                // not much error checking here since we're getting rid of this
-                                std::string sky_name = unescaped_name.substr(0, unescaped_name.size() - 4);
-                        
-                                std::string cur_path(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", name));
-                                LL_DEBUGS2("AppInit", "Shaders") << "Loading sky from " << cur_path << LL_ENDL;
-                                
-                                llifstream sky_xml(cur_path);
-                                if (sky_xml)
-                                {
-                                        LLSD sky_data(LLSD::emptyMap());
-                                        LLPointer<LLSDParser> parser = new LLSDXMLParser();
-                                        parser->parse(sky_xml, sky_data, LLSDSerialize::SIZE_UNLIMITED);
-
-                                        addParamSet(sky_name, sky_data);
-                                        sky_xml.close();
-                                }
-                        }
+                        loadPreset(unescaped_name,FALSE);
                 }
         }
+
 }
 
 void LLWLParamManager::savePresets(const std::string & fileName)
 {
+        //Nobody currently calls me, but if they did, then its reasonable to write the data out to the user's folder
+        //and not over the RO system wide version.
+
         LLSD paramsData(LLSD::emptyMap());
         
-        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", fileName));
+        std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", fileName));
 
         for(std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.begin();
                 mIt != mParamList.end();
@@ -201,8 +182,9 @@ void LLWLParamManager::savePresets(const std::string & fileName)
         presetsXML.close();
 }
 
-void LLWLParamManager::loadPreset(const std::string & name)
+void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 {
+        
         // bugfix for SL-46920: preventing filenames that break stuff.
         char * curl_str = curl_escape(name.c_str(), name.size());
         std::string escaped_filename(curl_str);
@@ -214,7 +196,16 @@ void LLWLParamManager::loadPreset(const std::string & name)
         std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
         llinfos << "Loading WindLight sky setting from " << pathName << llendl;
 
-        llifstream presetsXML(pathName);
+        llifstream presetsXML;
+        presetsXML.open(pathName.c_str());
+
+        // That failed, try loading from the users area instead.
+        if(!presetsXML)
+        {
+                pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename);
+                llinfos << "Loading User WindLight sky setting from " << pathName << llendl;
+                presetsXML.open(pathName.c_str());
+        }
 
         if (presetsXML)
         {
@@ -241,10 +232,13 @@ void LLWLParamManager::loadPreset(const std::string & name)
                 return;
         }
 
-        getParamSet(name, mCurParams);
-
-        propagateParameters();
-}
+        
+        if(propagate)
+        {
+                getParamSet(name, mCurParams);
+                propagateParameters();
+        }
+}       
 
 void LLWLParamManager::savePreset(const std::string & name)
 {
@@ -258,7 +252,7 @@ void LLWLParamManager::savePreset(const std::string & name)
 
         // make an empty llsd
         LLSD paramsData(LLSD::emptyMap());
-        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
+        std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename));
 
         // fill it with LLSD windlight params
         paramsData = mParamList[name].getAll();
@@ -533,7 +527,7 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
         
         if(delete_from_disk)
         {
-                std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
+                std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
                 
                 // use full curl escaped name
                 char * curl_str = curl_escape(name.c_str(), name.size());
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 7094051..1d9291c 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -135,7 +135,7 @@ public:
         void savePresets(const std::string & fileName);
 
         /// load an individual preset into the sky
-        void loadPreset(const std::string & name);
+        void loadPreset(const std::string & name,bool propogate=true);
 
         /// save the parameter presets to file
         void savePreset(const std::string & name);
@@ -195,7 +195,6 @@ public:
         // singleton pattern implementation
         static LLWLParamManager * instance();
 
-
 public:
 
         // helper variables
diff --git a/linden/indra/newview/llwlparamset.cpp b/linden/indra/newview/llwlparamset.cpp
index 5cb93fb..023d5b1 100644
--- a/linden/indra/newview/llwlparamset.cpp
+++ b/linden/indra/newview/llwlparamset.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 721627a..b9a3013 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 4dee103..04f9e25 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -32,6 +32,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llworld.h"
+#include "llrender.h"
 
 #include "indra_constants.h"
 #include "llstl.h"
@@ -108,7 +109,7 @@ LLWorld::LLWorld() :
         *(default_texture++) = MAX_WATER_COLOR.mV[3];
         
         mDefaultWaterTexturep = new LLViewerImage(raw, FALSE);
-        mDefaultWaterTexturep->bind();
+        gGL.getTexUnit(0)->bind(mDefaultWaterTexturep.get());
         mDefaultWaterTexturep->setClamp(TRUE, TRUE);
 
 }
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 8936a58..7e50bc4 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 1048fe9..7311989 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -498,7 +498,8 @@ void LLWorldMap::processMapLayerReply(LLMessageSystem* msg, void**)
                 new_layer.LayerDefined = TRUE;
                 msg->getUUIDFast(_PREHASH_LayerData, _PREHASH_ImageID, new_layer.LayerImageID, block);
                 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
-                new_layer.LayerImage->bindTexture(0);
+                
+                gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
                 new_layer.LayerImage->setClamp(TRUE, TRUE);
                 
                 U32 left, right, top, bottom;
@@ -610,7 +611,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
                         siminfo->mWaterHeight = (F32) water_height;
                         siminfo->mMapImageID[agent_flags] = image_id;
                         siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
-                        siminfo->mCurrentImage->bindTexture(0);
+                        gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
                         siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                         
                         if (siminfo->mMapImageID[2].notNull())
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index e522acc..33039a5 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 0d266dd..244ee22 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -303,7 +303,7 @@ void LLWorldMapView::draw()
 
         LLLocalClipRect clip(getLocalRect());
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
                 glMatrixMode(GL_MODELVIEW);
 
@@ -379,7 +379,7 @@ void LLWorldMapView::draw()
                 
                 // Draw using the texture.  If we don't clamp we get artifact at
                 // the edge.
-                LLViewerImage::bindTexture(current_image);
+                gGL.getTexUnit(0)->bind(current_image);
 
                 // Draw map image into RGB
                 //gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -387,7 +387,7 @@ void LLWorldMapView::draw()
                 gGL.setColorMask(true, false);
                 gGL.color4f(1.f, 1.f, 1.f, layer_alpha);
 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                         gGL.texCoord2f(0.0f, 1.0f);
                         gGL.vertex3f(left, top, -1.0f);
                         gGL.texCoord2f(0.0f, 0.0f);
@@ -403,7 +403,7 @@ void LLWorldMapView::draw()
                 gGL.setColorMask(false, true);
                 gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                         gGL.texCoord2f(0.0f, 1.0f);
                         gGL.vertex2f(left, top);
                         gGL.texCoord2f(0.0f, 0.0f);
@@ -436,7 +436,7 @@ void LLWorldMapView::draw()
                 if (info->mOverlayImage.isNull() && info->mMapImageID[2].notNull())
                 {
                         info->mOverlayImage = gImageList.getImage(info->mMapImageID[2], MIPMAP_TRUE, FALSE);
-                        info->mOverlayImage->bind(0);
+                        gGL.getTexUnit(0)->bind(info->mOverlayImage.get());
                         info->mOverlayImage->setClamp(TRUE, TRUE);
                 }
                 
@@ -538,13 +538,13 @@ void LLWorldMapView::draw()
                         // Draw using the texture.  If we don't clamp we get artifact at
                         // the edge.
                         LLGLSUIDefault gls_ui;
-                        LLViewerImage::bindTexture(simimage);
+                        gGL.getTexUnit(0)->bind(simimage);
 
                         gGL.setSceneBlendType(LLRender::BT_ALPHA);
                         F32 alpha = sim_alpha * info->mAlpha;
                         gGL.color4f(1.f, 1.0f, 1.0f, alpha);
 
-                        gGL.begin(LLVertexBuffer::QUADS);
+                        gGL.begin(LLRender::QUADS);
                                 gGL.texCoord2f(0.f, 1.f);
                                 gGL.vertex3f(left, top, 0.f);
                                 gGL.texCoord2f(0.f, 0.f);
@@ -557,9 +557,9 @@ void LLWorldMapView::draw()
 
                         if (gSavedSettings.getBOOL("MapShowLandForSale") && overlayimage && overlayimage->getHasGLTexture())
                         {
-                                LLViewerImage::bindTexture(overlayimage);
+                                gGL.getTexUnit(0)->bind(overlayimage);
                                 gGL.color4f(1.f, 1.f, 1.f, alpha);
-                                gGL.begin(LLVertexBuffer::QUADS);
+                                gGL.begin(LLRender::QUADS);
                                         gGL.texCoord2f(0.f, 1.f);
                                         gGL.vertex3f(left, top, -0.5f);
                                         gGL.texCoord2f(0.f, 0.f);
@@ -579,8 +579,8 @@ void LLWorldMapView::draw()
                                 gGL.setColorMask(false, true);
                                 gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
-                                LLGLSNoTexture gls_no_texture;
-                                gGL.begin(LLVertexBuffer::QUADS);
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+                                gGL.begin(LLRender::QUADS);
                                         gGL.vertex2f(left, top);
                                         gGL.vertex2f(left, bottom);
                                         gGL.vertex2f(right, bottom);
@@ -598,8 +598,8 @@ void LLWorldMapView::draw()
                         gGL.blendFunc(LLRender::BF_DEST_ALPHA, LLRender::BF_SOURCE_ALPHA);
                         gGL.color4f(0.2f, 0.0f, 0.0f, 0.4f);
 
-                        LLGLSNoTexture gls_no_texture;
-                        gGL.begin(LLVertexBuffer::QUADS);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+                        gGL.begin(LLRender::QUADS);
                                 gGL.vertex2f(left, top);
                                 gGL.vertex2f(left, bottom);
                                 gGL.vertex2f(right, bottom);
@@ -614,9 +614,9 @@ void LLWorldMapView::draw()
                 {
                         gGL.blendFunc(LLRender::BF_DEST_ALPHA, LLRender::BF_ZERO);
                         
-                        LLGLSNoTexture gls_no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         gGL.color3f(1.f, 0.f, 0.f);
-                        gGL.begin(LLVertexBuffer::LINES);
+                        gGL.begin(LLRender::LINES);
                                 gGL.vertex2f(left, top);
                                 gGL.vertex2f(right, bottom);
                                 gGL.vertex2f(left, bottom);
@@ -685,7 +685,7 @@ void LLWorldMapView::draw()
         // Draw background rectangle
         LLGLSUIDefault gls_ui;
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.setAlphaRejectSettings(LLRender::CF_GREATER_EQUAL, 0.f);
                 gGL.blendFunc(LLRender::BF_ONE_MINUS_DEST_ALPHA, LLRender::BF_DEST_ALPHA);
                 gGL.color4fv( mBackgroundColor.mV );
@@ -971,7 +971,7 @@ void LLWorldMapView::drawFrustum()
         F32 ctr_x = getRect().getWidth() * 0.5f + sPanX;
         F32 ctr_y = getRect().getHeight() * 0.5f + sPanY;
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         // Since we don't rotate the map, we have to rotate the frustum.
         gGL.pushMatrix();
@@ -980,7 +980,7 @@ void LLWorldMapView::drawFrustum()
 
                 // Draw triangle with more alpha in far pixels to make it 
                 // fade out in distance.
-                gGL.begin( LLVertexBuffer::TRIANGLES  );
+                gGL.begin( LLRender::TRIANGLES  );
                         gGL.color4f(1.f, 1.f, 1.f, 0.25f);
                         gGL.vertex2f( 0, 0 );
 
@@ -1186,11 +1186,11 @@ static void drawDot(F32 x_pixels, F32 y_pixels,
                 F32 top =               y_pixels + dot_radius;
                 F32 bottom =    y_pixels - dot_radius;
 
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( color.mV );
                 LLUI::setLineWidth(1.5f);
                 F32 h_bar = relative_z > HEIGHT_THRESHOLD ? top : bottom; // horizontal bar Y
-                gGL.begin( LLVertexBuffer::LINES );
+                gGL.begin( LLRender::LINES );
                         gGL.vertex2f(center, top);
                         gGL.vertex2f(left, h_bar);
                         gGL.vertex2f(right, h_bar);
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 53f0bdd..7e94e19 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index f58a506..1324c61 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/llxmlrpctransaction.h b/linden/indra/newview/llxmlrpctransaction.h
index 843ca24..eb096f9 100644
--- a/linden/indra/newview/llxmlrpctransaction.h
+++ b/linden/indra/newview/llxmlrpctransaction.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/lsl_guide.html b/linden/indra/newview/lsl_guide.html
deleted file mode 100644
index aa660b8..0000000
--- a/linden/indra/newview/lsl_guide.html
+++ /dev/null
@@ -1,22078 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Linden Scripting Language Guide</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"></HEAD
-><BODY
-CLASS="book"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
-><DIV
-CLASS="BOOK"
-><A
-NAME="AEN1"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="title"
-><A
-NAME="AEN2"
->Linden Scripting Language Guide</A
-></H1
-><H3
-CLASS="author"
-><A
-NAME="AEN4"
-></A
->Aaron Brashears</H3
-><H3
-CLASS="author"
-><A
-NAME="AEN7"
-></A
->Andrew Meadows</H3
-><H3
-CLASS="author"
-><A
-NAME="AEN10"
-></A
->Cory Ondrejka</H3
-><H3
-CLASS="author"
-><A
-NAME="AEN13"
-></A
->Doug Soo</H3
-><H3
-CLASS="author"
-><A
-NAME="AEN16"
-></A
->Donald Kjer</H3
-><P
-CLASS="copyright"
->Copyright &copy; 2007 Linden Lab</P
-><DIV
-CLASS="legalnotice"
-><P
-></P
-><A
-NAME="AEN22"
-></A
-><P
-><SPAN
-CLASS="trademark"
->Linden Lab</SPAN
->&reg; and
-      <SPAN
-CLASS="trademark"
->Second Life</SPAN
->&reg; are registered
-      trademarks of Linden Research, Inc.</P
-><P
-></P
-></DIV
-><HR></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->1. <A
-HREF="#AEN27"
->Introduction</A
-></DT
-><DT
->2. <A
-HREF="#AEN33"
->Getting Started</A
-></DT
-><DD
-><DL
-><DT
->2.1. <A
-HREF="#AEN36"
->Hello Avatar</A
-></DT
-><DD
-><DL
-><DT
->2.1.1. <A
-HREF="#AEN50"
->Creating the Script</A
-></DT
-><DT
->2.1.2. <A
-HREF="#AEN56"
->Default State</A
-></DT
-><DT
->2.1.3. <A
-HREF="#AEN67"
->Functions</A
-></DT
-><DT
->2.1.4. <A
-HREF="#AEN82"
->Touch Event</A
-></DT
-><DT
->2.1.5. <A
-HREF="#AEN90"
->Try it Out</A
-></DT
-></DL
-></DD
-><DT
->2.2. <A
-HREF="#AEN103"
->Using The Built-In Editor</A
-></DT
-><DT
->2.3. <A
-HREF="#AEN106"
->Using Alternative Editors</A
-></DT
-></DL
-></DD
-><DT
->3. <A
-HREF="#AEN109"
->Basics</A
-></DT
-><DD
-><DL
-><DT
->3.1. <A
-HREF="#AEN112"
->Comments</A
-></DT
-><DT
->3.2. <A
-HREF="#AEN129"
->Arithmetic Operations</A
-></DT
-><DD
-><DL
-><DT
->3.2.1. <A
-HREF="#AEN132"
->Assignment</A
-></DT
-><DT
->3.2.2. <A
-HREF="#AEN139"
->Hexadecimal Entry</A
-></DT
-><DT
->3.2.3. <A
-HREF="#AEN145"
->Binary Arithmetic Operators</A
-></DT
-><DT
->3.2.4. <A
-HREF="#AEN185"
->Boolean Operators</A
-></DT
-><DT
->3.2.5. <A
-HREF="#AEN217"
->Bitwise Operators</A
-></DT
-></DL
-></DD
-><DT
->3.3. <A
-HREF="#AEN237"
->Types</A
-></DT
-><DD
-><DL
-><DT
->3.3.1. <A
-HREF="#AEN318"
->Type Conversion</A
-></DT
-></DL
-></DD
-><DT
->3.4. <A
-HREF="#AEN360"
->Global Functions</A
-></DT
-><DT
->3.5. <A
-HREF="#AEN365"
->Global Variables</A
-></DT
-><DT
->3.6. <A
-HREF="#AEN373"
->Local Variables</A
-></DT
-></DL
-></DD
-><DT
->4. <A
-HREF="#AEN378"
->Flow Control</A
-></DT
-><DD
-><DL
-><DT
->4.1. <A
-HREF="#AEN381"
->Conditional Statements</A
-></DT
-><DT
->4.2. <A
-HREF="#AEN394"
->Loop Constructs</A
-></DT
-><DD
-><DL
-><DT
->4.2.1. <A
-HREF="#AEN397"
->for loop</A
-></DT
-><DT
->4.2.2. <A
-HREF="#AEN403"
->do-while loop</A
-></DT
-><DT
->4.2.3. <A
-HREF="#AEN409"
->while loop</A
-></DT
-></DL
-></DD
-><DT
->4.3. <A
-HREF="#AEN415"
->Jumps</A
-></DT
-><DT
->4.4. <A
-HREF="#AEN421"
->State Change</A
-></DT
-></DL
-></DD
-><DT
->5. <A
-HREF="#AEN427"
->States</A
-></DT
-><DD
-><DL
-><DT
->5.1. <A
-HREF="#AEN431"
->state_entry()</A
-></DT
-><DT
->5.2. <A
-HREF="#AEN440"
->state_exit()</A
-></DT
-><DT
->5.3. <A
-HREF="#AEN449"
->States vs. Global variables</A
-></DT
-></DL
-></DD
-><DT
->6. <A
-HREF="#AEN452"
->Math</A
-></DT
-><DD
-><DL
-><DT
->6.1. <A
-HREF="#AEN454"
->Tables of Functions</A
-></DT
-></DL
-></DD
-><DT
->7. <A
-HREF="#AEN561"
->Strings</A
-></DT
-><DD
-><DL
-><DT
->7.1. <A
-HREF="#AEN563"
->Tables of Functions</A
-></DT
-></DL
-></DD
-><DT
->8. <A
-HREF="#AEN605"
->Lists</A
-></DT
-><DD
-><DL
-><DT
->8.1. <A
-HREF="#AEN607"
->Tables of Functions</A
-></DT
-></DL
-></DD
-><DT
->9. <A
-HREF="#AEN670"
->Communication</A
-></DT
-><DD
-><DL
-><DT
->9.1. <A
-HREF="#AEN672"
->Tables of Functions</A
-></DT
-></DL
-></DD
-><DT
->10. <A
-HREF="#AEN715"
->Inventory</A
-></DT
-><DD
-><DL
-><DT
->10.1. <A
-HREF="#AEN717"
->Tables of Functions</A
-></DT
-></DL
-></DD
-><DT
->11. <A
-HREF="#AEN768"
->Vehicles</A
-></DT
-><DD
-><DL
-><DT
->11.1. <A
-HREF="#AEN790"
->Overview</A
-></DT
-><DT
->11.2. <A
-HREF="#AEN801"
->Warnings</A
-></DT
-><DT
->11.3. <A
-HREF="#AEN815"
->Definitions</A
-></DT
-><DT
->11.4. <A
-HREF="#AEN826"
->Setting the Vehicle Type</A
-></DT
-><DT
->11.5. <A
-HREF="#AEN837"
->Linear and Angular Deflection</A
-></DT
-><DT
->11.6. <A
-HREF="#AEN853"
->Moving and Steering the Vehicle</A
-></DT
-><DT
->11.7. <A
-HREF="#AEN866"
->The Linear Motor</A
-></DT
-><DT
->11.8. <A
-HREF="#AEN898"
->The Angular Motor</A
-></DT
-><DT
->11.9. <A
-HREF="#AEN921"
->Using the Camera to Steer</A
-></DT
-><DT
->11.10. <A
-HREF="#AEN938"
->The Vertical Attractor</A
-></DT
-><DT
->11.11. <A
-HREF="#AEN949"
->Banking</A
-></DT
-><DT
->11.12. <A
-HREF="#AEN956"
->Friction Timescales</A
-></DT
-><DT
->11.13. <A
-HREF="#AEN972"
->Buoyancy</A
-></DT
-><DT
->11.14. <A
-HREF="#AEN979"
->Hover</A
-></DT
-><DT
->11.15. <A
-HREF="#AEN990"
->Reference Frame</A
-></DT
-></DL
-></DD
-><DT
->A. <A
-HREF="#AEN999"
->Linden Library Functions</A
-></DT
-><DD
-><DL
-><DT
->A.1. <A
-HREF="#AEN1002"
->llAbs</A
-></DT
-><DT
->A.2. <A
-HREF="#AEN1012"
->llAcos</A
-></DT
-><DT
->A.3. <A
-HREF="#AEN1022"
->llAddToLandPassList</A
-></DT
-><DT
->A.4. <A
-HREF="#AEN1035"
->llAdjustSoundVolume</A
-></DT
-><DT
->A.5. <A
-HREF="#AEN1047"
->llAllowInventoryDrop</A
-></DT
-><DT
->A.6. <A
-HREF="#AEN1057"
->llAngleBetween</A
-></DT
-><DT
->A.7. <A
-HREF="#AEN1070"
->llApplyImpulse</A
-></DT
-><DT
->A.8. <A
-HREF="#AEN1083"
->llApplyRotationalImpulse</A
-></DT
-><DT
->A.9. <A
-HREF="#AEN1096"
->llAsin</A
-></DT
-><DT
->A.10. <A
-HREF="#AEN1106"
->llAtan2</A
-></DT
-><DT
->A.11. <A
-HREF="#AEN1119"
->llAttachToAvatar</A
-></DT
-><DT
->A.12. <A
-HREF="#AEN1134"
->llAvatarOnSitTarget</A
-></DT
-><DT
->A.13. <A
-HREF="#AEN1144"
->llAxes2Rot</A
-></DT
-><DT
->A.14. <A
-HREF="#AEN1160"
->llAxisAngle2Rot</A
-></DT
-><DT
->A.15. <A
-HREF="#AEN1173"
->llBase64ToString</A
-></DT
-><DT
->A.16. <A
-HREF="#AEN1182"
->llBreakAllLinks</A
-></DT
-><DT
->A.17. <A
-HREF="#AEN1191"
->llBreakLink</A
-></DT
-><DT
->A.18. <A
-HREF="#AEN1202"
->llCSV2List</A
-></DT
-><DT
->A.19. <A
-HREF="#AEN1212"
->llCeil</A
-></DT
-><DT
->A.20. <A
-HREF="#AEN1222"
->llCloseRemoteDataChannel</A
-></DT
-><DT
->A.21. <A
-HREF="#AEN1231"
->llCloud</A
-></DT
-><DT
->A.22. <A
-HREF="#AEN1241"
->llCollisionFilter</A
-></DT
-><DT
->A.23. <A
-HREF="#AEN1260"
->llCollisionSound</A
-></DT
-><DT
->A.24. <A
-HREF="#AEN1272"
->llCollisionSprite</A
-></DT
-><DT
->A.25. <A
-HREF="#AEN1282"
->llCos</A
-></DT
-><DT
->A.26. <A
-HREF="#AEN1292"
->llCreateLink</A
-></DT
-><DT
->A.27. <A
-HREF="#AEN1306"
->llDeleteSubList</A
-></DT
-><DT
->A.28. <A
-HREF="#AEN1326"
->llDeleteSubString</A
-></DT
-><DT
->A.29. <A
-HREF="#AEN1345"
->llDetachFromAvatar</A
-></DT
-><DT
->A.30. <A
-HREF="#lib_lldetected"
->llDetectedGrab</A
-></DT
-><DT
->A.31. <A
-HREF="#AEN1365"
->llDetectedGroup</A
-></DT
-><DT
->A.32. <A
-HREF="#AEN1375"
->llDetectedKey</A
-></DT
-><DT
->A.33. <A
-HREF="#AEN1386"
->llDetectedLinkNumber</A
-></DT
-><DT
->A.34. <A
-HREF="#AEN1395"
->llDetectedName</A
-></DT
-><DT
->A.35. <A
-HREF="#AEN1406"
->llDetectedOwner</A
-></DT
-><DT
->A.36. <A
-HREF="#AEN1417"
->llDetectedPos</A
-></DT
-><DT
->A.37. <A
-HREF="#AEN1428"
->llDetectedRot</A
-></DT
-><DT
->A.38. <A
-HREF="#AEN1439"
->llDetectedType</A
-></DT
-><DT
->A.39. <A
-HREF="#AEN1453"
->llDetectedVel</A
-></DT
-><DT
->A.40. <A
-HREF="#AEN1464"
->llDialog</A
-></DT
-><DT
->A.41. <A
-HREF="#AEN1481"
->llDie</A
-></DT
-><DT
->A.42. <A
-HREF="#AEN1489"
->llDumpList2String</A
-></DT
-><DT
->A.43. <A
-HREF="#AEN1500"
->llEscapeURL</A
-></DT
-><DT
->A.44. <A
-HREF="#AEN1510"
->llEdgeOfWorld</A
-></DT
-><DT
->A.45. <A
-HREF="#AEN1523"
->llEjectFromLand</A
-></DT
-><DT
->A.46. <A
-HREF="#AEN1533"
->llEmail</A
-></DT
-><DT
->A.47. <A
-HREF="#AEN1549"
->llEuler2Rot</A
-></DT
-><DT
->A.48. <A
-HREF="#AEN1559"
->llFabs</A
-></DT
-><DT
->A.49. <A
-HREF="#AEN1569"
->llFloor</A
-></DT
-><DT
->A.50. <A
-HREF="#AEN1579"
->llFrand</A
-></DT
-><DT
->A.51. <A
-HREF="#AEN1589"
->llGetAccel</A
-></DT
-><DT
->A.52. <A
-HREF="#AEN1597"
->llGetAttached</A
-></DT
-><DT
->A.53. <A
-HREF="#AEN1605"
->llGetAgentInfo</A
-></DT
-><DT
->A.54. <A
-HREF="#AEN1616"
->llGetAgentSize</A
-></DT
-><DT
->A.55. <A
-HREF="#AEN1626"
->llGetAlpha</A
-></DT
-><DT
->A.56. <A
-HREF="#AEN1638"
->llGetAndResetTime</A
-></DT
-><DT
->A.57. <A
-HREF="#AEN1648"
->llGetAnimation</A
-></DT
-><DT
->A.58. <A
-HREF="#AEN1658"
->llGetAnimationList</A
-></DT
-><DT
->A.59. <A
-HREF="#AEN1668"
->llGetBoundingBox</A
-></DT
-><DT
->A.60. <A
-HREF="#AEN1678"
->llGetCenterOfMass</A
-></DT
-><DT
->A.61. <A
-HREF="#AEN1686"
->llGetColor</A
-></DT
-><DT
->A.62. <A
-HREF="#AEN1698"
->llGetCreator</A
-></DT
-><DT
->A.63. <A
-HREF="#AEN1706"
->llGetDate</A
-></DT
-><DT
->A.64. <A
-HREF="#AEN1714"
->llGetEnergy</A
-></DT
-><DT
->A.65. <A
-HREF="#AEN1722"
->llGetForce</A
-></DT
-><DT
->A.66. <A
-HREF="#AEN1730"
->llGetFreeMemory</A
-></DT
-><DT
->A.67. <A
-HREF="#AEN1738"
->llGetGeometricCenter</A
-></DT
-><DT
->A.68. <A
-HREF="#AEN1746"
->llGetGMTclock</A
-></DT
-><DT
->A.69. <A
-HREF="#AEN1754"
->llGetInventoryCreator</A
-></DT
-><DT
->A.70. <A
-HREF="#AEN1764"
->llGetInventoryKey</A
-></DT
-><DT
->A.71. <A
-HREF="#AEN1774"
->llGetInventoryName</A
-></DT
-><DT
->A.72. <A
-HREF="#AEN1789"
->llGetInventoryNumber</A
-></DT
-><DT
->A.73. <A
-HREF="#AEN1801"
->llGetInventoryPermMask</A
-></DT
-><DT
->A.74. <A
-HREF="#AEN1816"
->llGetInventoryType</A
-></DT
-><DT
->A.75. <A
-HREF="#AEN1828"
->llGetKey</A
-></DT
-><DT
->A.76. <A
-HREF="#AEN1836"
->llGetLandOwnerAt</A
-></DT
-><DT
->A.77. <A
-HREF="#AEN1847"
->llGetLinkKey</A
-></DT
-><DT
->A.78. <A
-HREF="#AEN1857"
->llGetLinkName</A
-></DT
-><DT
->A.79. <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-></DT
-><DT
->A.80. <A
-HREF="#AEN1875"
->llGetListEntryType</A
-></DT
-><DT
->A.81. <A
-HREF="#AEN1889"
->llGetListLength</A
-></DT
-><DT
->A.82. <A
-HREF="#AEN1899"
->llGetLocalPos</A
-></DT
-><DT
->A.83. <A
-HREF="#AEN1907"
->llGetLocalRot</A
-></DT
-><DT
->A.84. <A
-HREF="#AEN1915"
->llGetMass</A
-></DT
-><DT
->A.85. <A
-HREF="#AEN1923"
->llGetObjectMass</A
-></DT
-><DT
->A.86. <A
-HREF="#AEN1933"
->llGetNextEmail</A
-></DT
-><DT
->A.87. <A
-HREF="#AEN1946"
->llGetNotecardLine</A
-></DT
-><DT
->A.88. <A
-HREF="#AEN1964"
->llGetNumberOfNotecardLines</A
-></DT
-><DT
->A.89. <A
-HREF="#AEN1977"
->llGetNumberOfPrims</A
-></DT
-><DT
->A.90. <A
-HREF="#AEN1985"
->llGetNumberOfSides</A
-></DT
-><DT
->A.91. <A
-HREF="#AEN1993"
->llGetObjectDesc</A
-></DT
-><DT
->A.92. <A
-HREF="#AEN2001"
->llGetObjectName</A
-></DT
-><DT
->A.93. <A
-HREF="#AEN2009"
->llGetObjectPermMask</A
-></DT
-><DT
->A.94. <A
-HREF="#AEN2022"
->llGetOmega</A
-></DT
-><DT
->A.95. <A
-HREF="#AEN2030"
->llGetOwner</A
-></DT
-><DT
->A.96. <A
-HREF="#AEN2038"
->llGetOwnerKey</A
-></DT
-><DT
->A.97. <A
-HREF="#AEN2048"
->llGetPermissions</A
-></DT
-><DT
->A.98. <A
-HREF="#AEN2058"
->llGetPermissionsKey</A
-></DT
-><DT
->A.99. <A
-HREF="#AEN2067"
->llGetPos</A
-></DT
-><DT
->A.100. <A
-HREF="#AEN2075"
->llGetPrimitiveParams</A
-></DT
-><DT
->A.101. <A
-HREF="#AEN2092"
->llGetRegionCorner</A
-></DT
-><DT
->A.102. <A
-HREF="#AEN2100"
->llGetRegionFPS</A
-></DT
-><DT
->A.103. <A
-HREF="#AEN2108"
->llGetRegionName</A
-></DT
-><DT
->A.104. <A
-HREF="#AEN2116"
->llGetRegionTimeDilation</A
-></DT
-><DT
->A.105. <A
-HREF="#AEN2124"
->llGetRootPosition</A
-></DT
-><DT
->A.106. <A
-HREF="#AEN2132"
->llGetRootRotation</A
-></DT
-><DT
->A.107. <A
-HREF="#AEN2140"
->llGetRot</A
-></DT
-><DT
->A.108. <A
-HREF="#AEN2148"
->llGetScale</A
-></DT
-><DT
->A.109. <A
-HREF="#AEN2156"
->llGetScriptName</A
-></DT
-><DT
->A.110. <A
-HREF="#AEN2164"
->llGetStartParameter</A
-></DT
-><DT
->A.111. <A
-HREF="#AEN2174"
->llGetScriptState</A
-></DT
-><DT
->A.112. <A
-HREF="#AEN2184"
->llGetStatus</A
-></DT
-><DT
->A.113. <A
-HREF="#AEN2195"
->llGetSubString</A
-></DT
-><DT
->A.114. <A
-HREF="#AEN2214"
->llGetSunDirection</A
-></DT
-><DT
->A.115. <A
-HREF="#AEN2222"
->llGetTexture</A
-></DT
-><DT
->A.116. <A
-HREF="#AEN2232"
->llGetTextureOffset</A
-></DT
-><DT
->A.117. <A
-HREF="#AEN2242"
->llGetTextureRot</A
-></DT
-><DT
->A.118. <A
-HREF="#AEN2252"
->llGetTextureScale</A
-></DT
-><DT
->A.119. <A
-HREF="#AEN2262"
->llGetTime</A
-></DT
-><DT
->A.120. <A
-HREF="#AEN2273"
->llGetTimeOfDay</A
-></DT
-><DT
->A.121. <A
-HREF="#AEN2281"
->llGetTimestamp</A
-></DT
-><DT
->A.122. <A
-HREF="#AEN2289"
->llGetTorque</A
-></DT
-><DT
->A.123. <A
-HREF="#AEN2297"
->llGetVel</A
-></DT
-><DT
->A.124. <A
-HREF="#AEN2306"
->llGetWallclock</A
-></DT
-><DT
->A.125. <A
-HREF="#AEN2314"
->llGiveInventory</A
-></DT
-><DT
->A.126. <A
-HREF="#AEN2326"
->llGiveInventoryList</A
-></DT
-><DT
->A.127. <A
-HREF="#AEN2342"
->llGiveMoney</A
-></DT
-><DT
->A.128. <A
-HREF="#AEN2356"
->llGround</A
-></DT
-><DT
->A.129. <A
-HREF="#AEN2366"
->llGroundContour</A
-></DT
-><DT
->A.130. <A
-HREF="#AEN2376"
->llGroundNormal</A
-></DT
-><DT
->A.131. <A
-HREF="#AEN2386"
->llGroundRepel</A
-></DT
-><DT
->A.132. <A
-HREF="#AEN2405"
->llGroundSlope</A
-></DT
-><DT
->A.133. <A
-HREF="#AEN2415"
->llInsertString</A
-></DT
-><DT
->A.134. <A
-HREF="#AEN2431"
->llInstantMessage</A
-></DT
-><DT
->A.135. <A
-HREF="#AEN2444"
->llKey2Name</A
-></DT
-><DT
->A.136. <A
-HREF="#AEN2454"
->llList2CSV</A
-></DT
-><DT
->A.137. <A
-HREF="#AEN2464"
->llList2Float</A
-></DT
-><DT
->A.138. <A
-HREF="#AEN2477"
->llList2Integer</A
-></DT
-><DT
->A.139. <A
-HREF="#AEN2490"
->llList2Key</A
-></DT
-><DT
->A.140. <A
-HREF="#AEN2503"
->llList2List</A
-></DT
-><DT
->A.141. <A
-HREF="#AEN2526"
->llList2ListStrided</A
-></DT
-><DT
->A.142. <A
-HREF="#AEN2544"
->llList2Rot</A
-></DT
-><DT
->A.143. <A
-HREF="#AEN2557"
->llList2String</A
-></DT
-><DT
->A.144. <A
-HREF="#AEN2570"
->llList2Vector</A
-></DT
-><DT
->A.145. <A
-HREF="#AEN2583"
->llListFindList</A
-></DT
-><DT
->A.146. <A
-HREF="#AEN2598"
->llListInsertList</A
-></DT
-><DT
->A.147. <A
-HREF="#AEN2614"
->llListRandomize</A
-></DT
-><DT
->A.148. <A
-HREF="#AEN2629"
->llListReplaceList</A
-></DT
-><DT
->A.149. <A
-HREF="#AEN2648"
->llListSort</A
-></DT
-><DT
->A.150. <A
-HREF="#AEN2665"
->llListen</A
-></DT
-><DT
->A.151. <A
-HREF="#AEN2686"
->llListenControl</A
-></DT
-><DT
->A.152. <A
-HREF="#AEN2701"
->llListenRemove</A
-></DT
-><DT
->A.153. <A
-HREF="#AEN2712"
->llLoadURL</A
-></DT
-><DT
->A.154. <A
-HREF="#AEN2731"
->llLog</A
-></DT
-><DT
->A.155. <A
-HREF="#AEN2742"
->llLog10</A
-></DT
-><DT
->A.156. <A
-HREF="#AEN2753"
->llLookAt</A
-></DT
-><DT
->A.157. <A
-HREF="#AEN2773"
->llLoopSound</A
-></DT
-><DT
->A.158. <A
-HREF="#AEN2790"
->llLoopSoundMaster</A
-></DT
-><DT
->A.159. <A
-HREF="#AEN2802"
->llLoopSoundSlave</A
-></DT
-><DT
->A.160. <A
-HREF="#AEN2814"
->llMakeExplosion</A
-></DT
-><DT
->A.161. <A
-HREF="#AEN2836"
->llMakeFire</A
-></DT
-><DT
->A.162. <A
-HREF="#AEN2858"
->llMakeFountain</A
-></DT
-><DT
->A.163. <A
-HREF="#AEN2880"
->llMakeSmoke</A
-></DT
-><DT
->A.164. <A
-HREF="#AEN2902"
->llMD5String</A
-></DT
-><DT
->A.165. <A
-HREF="#AEN2919"
->llMessageLinked</A
-></DT
-><DT
->A.166. <A
-HREF="#AEN2940"
->llMinEventDelay</A
-></DT
-><DT
->A.167. <A
-HREF="#AEN2949"
->llModifyLand</A
-></DT
-><DT
->A.168. <A
-HREF="#AEN2963"
->llModPow</A
-></DT
-><DT
->A.169. <A
-HREF="#AEN2980"
->llMoveToTarget</A
-></DT
-><DT
->A.170. <A
-HREF="#AEN2995"
->llOffsetTexture</A
-></DT
-><DT
->A.171. <A
-HREF="#AEN3011"
->llOpenRemoteDataChannel</A
-></DT
-><DT
->A.172. <A
-HREF="#AEN3019"
->llOverMyLand</A
-></DT
-><DT
->A.173. <A
-HREF="#AEN3031"
->llParcelMediaCommandList</A
-></DT
-><DT
->A.174. <A
-HREF="#AEN3091"
->llParcelMediaQuery</A
-></DT
-><DT
->A.175. <A
-HREF="#AEN3105"
->llParseString2List</A
-></DT
-><DT
->A.176. <A
-HREF="#AEN3127"
->llParseStringKeepNulls</A
-></DT
-><DT
->A.177. <A
-HREF="#AEN3149"
->llParticleSystem</A
-></DT
-><DT
->A.178. <A
-HREF="#AEN3162"
->llPassCollisions</A
-></DT
-><DT
->A.179. <A
-HREF="#AEN3173"
->llPassTouches</A
-></DT
-><DT
->A.180. <A
-HREF="#AEN3184"
->llPlaySound</A
-></DT
-><DT
->A.181. <A
-HREF="#AEN3198"
->llPlaySoundSlave</A
-></DT
-><DT
->A.182. <A
-HREF="#AEN3210"
->llPointAt</A
-></DT
-><DT
->A.183. <A
-HREF="#AEN3220"
->llPow</A
-></DT
-><DT
->A.184. <A
-HREF="#AEN3233"
->llPreloadSound</A
-></DT
-><DT
->A.185. <A
-HREF="#AEN3243"
->llPushObject</A
-></DT
-><DT
->A.186. <A
-HREF="#AEN3261"
->llReleaseControls</A
-></DT
-><DT
->A.187. <A
-HREF="#AEN3271"
->llRemoteDataReply</A
-></DT
-><DT
->A.188. <A
-HREF="#AEN3284"
->llRemoteDataSetRegion</A
-></DT
-><DT
->A.189. <A
-HREF="#AEN3292"
->llRemoteLoadScript</A
-></DT
-><DT
->A.190. <A
-HREF="#AEN3300"
->llRemoteLoadScriptPin</A
-></DT
-><DT
->A.191. <A
-HREF="#AEN3325"
->llRemoveInventory</A
-></DT
-><DT
->A.192. <A
-HREF="#AEN3335"
->llRemoveVehicleFlags</A
-></DT
-><DT
->A.193. <A
-HREF="#AEN3346"
->llRequestAgentData</A
-></DT
-><DT
->A.194. <A
-HREF="#AEN3363"
->llRequestInventoryData</A
-></DT
-><DT
->A.195. <A
-HREF="#AEN3375"
->llRequestPermissions</A
-></DT
-><DT
->A.196. <A
-HREF="#AEN3391"
->llRequestSimulatorData</A
-></DT
-><DT
->A.197. <A
-HREF="#AEN3408"
->llResetScript</A
-></DT
-><DT
->A.198. <A
-HREF="#AEN3416"
->llResetOtherScript</A
-></DT
-><DT
->A.199. <A
-HREF="#AEN3426"
->llResetTime</A
-></DT
-><DT
->A.200. <A
-HREF="#AEN3434"
->llRezAtRoot</A
-></DT
-><DT
->A.201. <A
-HREF="#AEN3461"
->llRezObject</A
-></DT
-><DT
->A.202. <A
-HREF="#AEN3486"
->llRot2Angle</A
-></DT
-><DT
->A.203. <A
-HREF="#AEN3496"
->llRot2Axis</A
-></DT
-><DT
->A.204. <A
-HREF="#AEN3506"
->llRot2Euler</A
-></DT
-><DT
->A.205. <A
-HREF="#AEN3516"
->llRot2Fwd</A
-></DT
-><DT
->A.206. <A
-HREF="#AEN3526"
->llRot2Left</A
-></DT
-><DT
->A.207. <A
-HREF="#AEN3536"
->llRot2Up</A
-></DT
-><DT
->A.208. <A
-HREF="#AEN3546"
->llRotBetween</A
-></DT
-><DT
->A.209. <A
-HREF="#AEN3559"
->llRotLookAt</A
-></DT
-><DT
->A.210. <A
-HREF="#AEN3579"
->llRotTarget</A
-></DT
-><DT
->A.211. <A
-HREF="#AEN3593"
->llRotTargetRemove</A
-></DT
-><DT
->A.212. <A
-HREF="#AEN3603"
->llRotateTexture</A
-></DT
-><DT
->A.213. <A
-HREF="#AEN3618"
->llRound</A
-></DT
-><DT
->A.214. <A
-HREF="#AEN3628"
->llSameGroup</A
-></DT
-><DT
->A.215. <A
-HREF="#AEN3640"
->llSay</A
-></DT
-><DT
->A.216. <A
-HREF="#AEN3654"
->llScaleTexture</A
-></DT
-><DT
->A.217. <A
-HREF="#AEN3671"
->llScriptDanger</A
-></DT
-><DT
->A.218. <A
-HREF="#AEN3680"
->llSendRemoteData</A
-></DT
-><DT
->A.219. <A
-HREF="#AEN3693"
->llSensor</A
-></DT
-><DT
->A.220. <A
-HREF="#AEN3720"
->llSensorRemove</A
-></DT
-><DT
->A.221. <A
-HREF="#AEN3728"
->llSensorRepeat</A
-></DT
-><DT
->A.222. <A
-HREF="#AEN3758"
->llSetAlpha</A
-></DT
-><DT
->A.223. <A
-HREF="#AEN3773"
->llSetBuoyancy</A
-></DT
-><DT
->A.224. <A
-HREF="#AEN3782"
->llSetCameraAtOffset</A
-></DT
-><DT
->A.225. <A
-HREF="#AEN3791"
->llSetClickAction</A
-></DT
-><DT
->A.226. <A
-HREF="#AEN3800"
->llForceMouselook</A
-></DT
-><DT
->A.227. <A
-HREF="#AEN3809"
->llSetCameraEyeOffset</A
-></DT
-><DT
->A.228. <A
-HREF="#AEN3818"
->llSetColor</A
-></DT
-><DT
->A.229. <A
-HREF="#AEN3832"
->llSetDamage</A
-></DT
-><DT
->A.230. <A
-HREF="#AEN3841"
->llSetForce</A
-></DT
-><DT
->A.231. <A
-HREF="#AEN3855"
->llSetForceAndTorque</A
-></DT
-><DT
->A.232. <A
-HREF="#AEN3872"
->llSetHoverHeight</A
-></DT
-><DT
->A.233. <A
-HREF="#AEN3887"
->llSetLinkAlpha</A
-></DT
-><DT
->A.234. <A
-HREF="#AEN3906"
->llSetLinkColor</A
-></DT
-><DT
->A.235. <A
-HREF="#AEN3925"
->llSetLinkPrimitiveParams</A
-></DT
-><DT
->A.236. <A
-HREF="#AEN3941"
->llSetLinkTexture</A
-></DT
-><DT
->A.237. <A
-HREF="#AEN3960"
->llSetLocalRot</A
-></DT
-><DT
->A.238. <A
-HREF="#AEN3969"
->llSetObjectDesc</A
-></DT
-><DT
->A.239. <A
-HREF="#AEN3979"
->llSetObjectName</A
-></DT
-><DT
->A.240. <A
-HREF="#AEN3989"
->llSetParcelMusicURL</A
-></DT
-><DT
->A.241. <A
-HREF="#AEN3999"
->llSetPayPrice</A
-></DT
-><DT
->A.242. <A
-HREF="#AEN4011"
->llSetPos</A
-></DT
-><DT
->A.243. <A
-HREF="#AEN4020"
->llSetPrimitiveParams</A
-></DT
-><DT
->A.244. <A
-HREF="#AEN4034"
->llSetRemoteScriptAccessPin</A
-></DT
-><DT
->A.245. <A
-HREF="#AEN4043"
->llSetRot</A
-></DT
-><DT
->A.246. <A
-HREF="#AEN4052"
->llSetScale</A
-></DT
-><DT
->A.247. <A
-HREF="#AEN4061"
->llSetScriptState</A
-></DT
-><DT
->A.248. <A
-HREF="#AEN4072"
->llSetSitText</A
-></DT
-><DT
->A.249. <A
-HREF="#AEN4082"
->llSetSoundQueueing</A
-></DT
-><DT
->A.250. <A
-HREF="#AEN4095"
->llSetStatus</A
-></DT
-><DT
->A.251. <A
-HREF="#AEN4110"
->llSetText</A
-></DT
-><DT
->A.252. <A
-HREF="#AEN4126"
->llSetTexture</A
-></DT
-><DT
->A.253. <A
-HREF="#AEN4140"
->llSetTextureAnim</A
-></DT
-><DT
->A.254. <A
-HREF="#AEN4188"
->llSetTimerEvent</A
-></DT
-><DT
->A.255. <A
-HREF="#AEN4200"
->llSetTorque</A
-></DT
-><DT
->A.256. <A
-HREF="#AEN4214"
->llSetTouchText</A
-></DT
-><DT
->A.257. <A
-HREF="#AEN4224"
->llSetVehicleFlags</A
-></DT
-><DT
->A.258. <A
-HREF="#AEN4235"
->llSetVehicleFloatParam</A
-></DT
-><DT
->A.259. <A
-HREF="#AEN4249"
->llSetVehicleType</A
-></DT
-><DT
->A.260. <A
-HREF="#AEN4260"
->llSetVehicleRotationParam</A
-></DT
-><DT
->A.261. <A
-HREF="#AEN4274"
->llSetVehicleVectorParam</A
-></DT
-><DT
->A.262. <A
-HREF="#AEN4288"
->llShout</A
-></DT
-><DT
->A.263. <A
-HREF="#AEN4302"
->llSin</A
-></DT
-><DT
->A.264. <A
-HREF="#AEN4312"
->llSitTarget</A
-></DT
-><DT
->A.265. <A
-HREF="#AEN4325"
->llSleep</A
-></DT
-><DT
->A.266. <A
-HREF="#AEN4335"
->llSqrt</A
-></DT
-><DT
->A.267. <A
-HREF="#AEN4346"
->llStartAnimation</A
-></DT
-><DT
->A.268. <A
-HREF="#AEN4578"
->llStopAnimation</A
-></DT
-><DT
->A.269. <A
-HREF="#AEN4588"
->llStopHover</A
-></DT
-><DT
->A.270. <A
-HREF="#AEN4596"
->llStopLookAt</A
-></DT
-><DT
->A.271. <A
-HREF="#AEN4604"
->llStopMoveToTarget</A
-></DT
-><DT
->A.272. <A
-HREF="#AEN4612"
->llStopPointAt</A
-></DT
-><DT
->A.273. <A
-HREF="#AEN4620"
->llStopSound</A
-></DT
-><DT
->A.274. <A
-HREF="#AEN4631"
->llStringLength</A
-></DT
-><DT
->A.275. <A
-HREF="#AEN4641"
->llSubStringIndex</A
-></DT
-><DT
->A.276. <A
-HREF="#AEN4652"
->llStringToBase64</A
-></DT
-><DT
->A.277. <A
-HREF="#AEN4661"
->llTakeControls</A
-></DT
-><DT
->A.278. <A
-HREF="#AEN4678"
->llTan</A
-></DT
-><DT
->A.279. <A
-HREF="#AEN4688"
->llTarget</A
-></DT
-><DT
->A.280. <A
-HREF="#AEN4701"
->llTargetOmega</A
-></DT
-><DT
->A.281. <A
-HREF="#AEN4718"
->llTargetRemove</A
-></DT
-><DT
->A.282. <A
-HREF="#AEN4728"
->llTeleportAgentHome</A
-></DT
-><DT
->A.283. <A
-HREF="#AEN4737"
->llToLower</A
-></DT
-><DT
->A.284. <A
-HREF="#AEN4746"
->llToUpper</A
-></DT
-><DT
->A.285. <A
-HREF="#AEN4756"
->llTriggerSound</A
-></DT
-><DT
->A.286. <A
-HREF="#AEN4770"
->llTriggerSoundLimited</A
-></DT
-><DT
->A.287. <A
-HREF="#AEN4790"
->llUnescapeURL</A
-></DT
-><DT
->A.288. <A
-HREF="#AEN4800"
->llUnSit</A
-></DT
-><DT
->A.289. <A
-HREF="#AEN4810"
->llVecDist</A
-></DT
-><DT
->A.290. <A
-HREF="#AEN4823"
->llVecMag</A
-></DT
-><DT
->A.291. <A
-HREF="#AEN4833"
->llVecNorm</A
-></DT
-><DT
->A.292. <A
-HREF="#AEN4843"
->llVolumeDetect</A
-></DT
-><DT
->A.293. <A
-HREF="#AEN4852"
->llWater</A
-></DT
-><DT
->A.294. <A
-HREF="#AEN4862"
->llWhisper</A
-></DT
-><DT
->A.295. <A
-HREF="#AEN4876"
->llWind</A
-></DT
-><DT
->A.296. <A
-HREF="#AEN4886"
->llXorBase64Strings</A
-></DT
-></DL
-></DD
-><DT
->B. <A
-HREF="#AEN4899"
->Events</A
-></DT
-><DD
-><DL
-><DT
->B.1. <A
-HREF="#AEN4902"
->at_rot_target</A
-></DT
-><DT
->B.2. <A
-HREF="#AEN4916"
->at_target</A
-></DT
-><DT
->B.3. <A
-HREF="#AEN4930"
->attach</A
-></DT
-><DT
->B.4. <A
-HREF="#AEN4940"
->changed</A
-></DT
-><DT
->B.5. <A
-HREF="#AEN4951"
->collision</A
-></DT
-><DT
->B.6. <A
-HREF="#AEN4961"
->collision_end</A
-></DT
-><DT
->B.7. <A
-HREF="#AEN4971"
->collision_start</A
-></DT
-><DT
->B.8. <A
-HREF="#AEN4981"
->control</A
-></DT
-><DT
->B.9. <A
-HREF="#AEN4997"
->dataserver</A
-></DT
-><DT
->B.10. <A
-HREF="#AEN5012"
->email</A
-></DT
-><DT
->B.11. <A
-HREF="#AEN5030"
->land_collision</A
-></DT
-><DT
->B.12. <A
-HREF="#AEN5039"
->land_collision_end</A
-></DT
-><DT
->B.13. <A
-HREF="#AEN5048"
->land_collision_start</A
-></DT
-><DT
->B.14. <A
-HREF="#AEN5057"
->link_message</A
-></DT
-><DT
->B.15. <A
-HREF="#AEN5073"
->listen</A
-></DT
-><DT
->B.16. <A
-HREF="#AEN5092"
->money</A
-></DT
-><DT
->B.17. <A
-HREF="#AEN5105"
->moving_end</A
-></DT
-><DT
->B.18. <A
-HREF="#AEN5113"
->moving_start</A
-></DT
-><DT
->B.19. <A
-HREF="#AEN5121"
->no_sensor</A
-></DT
-><DT
->B.20. <A
-HREF="#AEN5130"
->not_at_rot_target</A
-></DT
-><DT
->B.21. <A
-HREF="#AEN5139"
->not_at_target</A
-></DT
-><DT
->B.22. <A
-HREF="#AEN5148"
->object_rez</A
-></DT
-><DT
->B.23. <A
-HREF="#AEN5159"
->on_rez</A
-></DT
-><DT
->B.24. <A
-HREF="#AEN5171"
->run_time_permissions</A
-></DT
-><DT
->B.25. <A
-HREF="#AEN5183"
->sensor</A
-></DT
-><DT
->B.26. <A
-HREF="#AEN5195"
->state_entry</A
-></DT
-><DT
->B.27. <A
-HREF="#AEN5203"
->state_exit</A
-></DT
-><DT
->B.28. <A
-HREF="#AEN5211"
->timer</A
-></DT
-><DT
->B.29. <A
-HREF="#AEN5220"
->touch</A
-></DT
-><DT
->B.30. <A
-HREF="#AEN5231"
->touch_end</A
-></DT
-><DT
->B.31. <A
-HREF="#AEN5242"
->touch_start</A
-></DT
-><DT
->B.32. <A
-HREF="#AEN5253"
->remote_data</A
-></DT
-></DL
-></DD
-><DT
->C. <A
-HREF="#AEN5292"
->Constants</A
-></DT
-><DD
-><DL
-><DT
->C.1. <A
-HREF="#AEN5295"
->Boolean Constants</A
-></DT
-><DT
->C.2. <A
-HREF="#AEN5304"
->Status Constants</A
-></DT
-><DT
->C.3. <A
-HREF="#AEN5338"
->Object Type Constants</A
-></DT
-><DT
->C.4. <A
-HREF="#AEN5360"
->Permission Constants</A
-></DT
-><DT
->C.5. <A
-HREF="#AEN5411"
->Inventory Constants</A
-></DT
-><DT
->C.6. <A
-HREF="#AEN5434"
->Pay Price Constants</A
-></DT
-><DT
->C.7. <A
-HREF="#AEN5448"
->Attachment Constants</A
-></DT
-><DT
->C.8. <A
-HREF="#AEN5574"
->Land Constants</A
-></DT
-><DT
->C.9. <A
-HREF="#AEN5616"
->Link Constants</A
-></DT
-><DT
->C.10. <A
-HREF="#AEN5643"
->Control Constants</A
-></DT
-><DT
->C.11. <A
-HREF="#AEN5690"
->Change Constants</A
-></DT
-><DT
->C.12. <A
-HREF="#AEN5733"
->Type Constants</A
-></DT
-><DT
->C.13. <A
-HREF="#AEN5767"
->Agent Info Constants</A
-></DT
-><DT
->C.14. <A
-HREF="#AEN5817"
->Texture Animation
-    Constants</A
-></DT
-><DT
->C.15. <A
-HREF="#AEN5851"
->Particle System Constants</A
-></DT
-><DT
->C.16. <A
-HREF="#AEN6005"
->Agent Data Constants</A
-></DT
-><DT
->C.17. <A
-HREF="#AEN6041"
->Float Constants</A
-></DT
-><DT
->C.18. <A
-HREF="#AEN6070"
->Key Constant</A
-></DT
-><DT
->C.19. <A
-HREF="#AEN6073"
->Miscellaneous Integer Constants</A
-></DT
-><DT
->C.20. <A
-HREF="#AEN6076"
->Miscellaneous String
-    Constants</A
-></DT
-><DT
->C.21. <A
-HREF="#AEN6080"
->Vector Constant</A
-></DT
-><DT
->C.22. <A
-HREF="#AEN6083"
->Rotation Constant</A
-></DT
-><DT
->C.23. <A
-HREF="#AEN6086"
->Simulator Data Constants</A
-></DT
-><DT
->C.24. <A
-HREF="#AEN6112"
->Vehicle Parameters</A
-></DT
-><DT
->C.25. <A
-HREF="#AEN6231"
->Vehicle Flags</A
-></DT
-><DT
->C.26. <A
-HREF="#AEN6288"
->Vehicle Types</A
-></DT
-><DT
->C.27. <A
-HREF="#AEN6323"
->Primitive Constants</A
-></DT
-><DT
->C.28. <A
-HREF="#AEN6409"
->XML-RPC Constants</A
-></DT
-><DT
->C.29. <A
-HREF="#AEN6412"
->Permission Mask Constants</A
-></DT
-><DT
->C.30. <A
-HREF="#AEN6459"
->Parcel Media Constants</A
-></DT
-><DT
->C.31. <A
-HREF="#AEN6521"
->Click Action Constants</A
-></DT
-></DL
-></DD
-></DL
-></DIV
-><DIV
-CLASS="LOT"
-><DL
-CLASS="LOT"
-><DT
-><B
->List of Tables</B
-></DT
-><DT
->3-1. <A
-HREF="#AEN148"
->Binary Arithmetic Operators</A
-></DT
-><DT
->3-2. <A
-HREF="#AEN188"
->Boolean Operators</A
-></DT
-><DT
->3-3. <A
-HREF="#AEN220"
->Bitwise Operators</A
-></DT
-><DT
->3-4. <A
-HREF="#AEN258"
->Vector Arithmetic Operators</A
-></DT
-><DT
->3-5. <A
-HREF="#AEN282"
->Rotation Arithmetic Operators</A
-></DT
-><DT
->6-1. <A
-HREF="#AEN456"
->Trigonometry Functions</A
-></DT
-><DT
->6-2. <A
-HREF="#AEN505"
->Vector Functions</A
-></DT
-><DT
->6-3. <A
-HREF="#AEN521"
->Rotation Functions</A
-></DT
-><DT
->7-1. <A
-HREF="#AEN565"
->String Functions</A
-></DT
-><DT
->8-1. <A
-HREF="#AEN609"
->List Functions</A
-></DT
-><DT
->9-1. <A
-HREF="#AEN674"
->In World Functions</A
-></DT
-><DT
->9-2. <A
-HREF="#AEN699"
->Messaging Functions</A
-></DT
-><DT
->10-1. <A
-HREF="#AEN719"
->Inventory Functions</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN27"
-></A
->Chapter 1. Introduction</H1
-><P
->The Linden Scripting Language (LSL) is a simple, powerful
-  language used to attach behaviors to the objects found in Second
-  Life. It follows the familiar syntax of a c/Java style language,
-  with an implicit state machine for every script.</P
-><P
->Multiple scripts may also be attached to the same object,
-  allowing a style of small, single-function scripts to evolve.  This
-  leads to scripts that perform specific functions ("hover", "follow",
-  etc.) and allows them to be combined to form new behaviors.</P
-><P
->The text of the script is compiled into an executable byte
-  code, much like Java.  This byte code is then run within a virtual
-  machine on the simulator.  Each script receives a time slice of the
-  total simulator time allocated to scripts, so a simulator with many
-  scripts would allow each individual script less time rather than
-  degrading its own performance.  In addition, each script executes
-  within its own chunk of memory, preventing scripts from writing into
-  protected simulator memory or into other scripts, making it much
-  harder for scripts to crash the simulator.</P
-><P
->This tutorial introduces the reader to the basic features of
-  LSL, how to edit and apply your scripts, and a complete reference
-  for standard linden constants, events, and library functions.</P
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN33"
-></A
->Chapter 2. Getting Started</H1
-><P
->You're probably wondering what you can do with LSL, and how
-  quickly you can do it. We'll start with some simple examples, dissect
-  them, and introduce you the script development process while
-  we're at it.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN36"
->2.1. Hello Avatar</A
-></H2
-><P
->Continuing a long tradition of getting started by looking at
-    a script that says "Hello", we'll do just that. Though obviously
-    not a particularly useful example on it's own, this example will
-    introduce us to:</P
-><P
-></P
-><UL
-><LI
-><P
->Creating a basic script</P
-></LI
-><LI
-><P
->Script states</P
-></LI
-><LI
-><P
->Calling functions</P
-></LI
-><LI
-><P
->Script events</P
-></LI
-><LI
-><P
->Applying a script to an object</P
-></LI
-></UL
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN50"
->2.1.1. Creating the Script</A
-></H3
-><P
->Start by opening your inventory and selecting 'Create|New
-      Script' from the inventory pull down menu. This will create an
-      empty script called 'New Script' in your 'Scripts'
-      folder. Double click on the text or icon of the script to open
-      the script in the built in editor. When you open the script, the
-      viewer will automatically insert a basic skeleton for lsl. It
-      should look like:</P
-><P
-><PRE
-CLASS="programlisting"
->&#13;default
-{
-    state_entry()
-    {
-        llSay(0, "Hello, Avatar!");
-    }
-
-    touch_start(integer total_number)
-    {
-        llSay(0, "Touched.");
-    }
-}
-      </PRE
-></P
-><P
->A casual inspection of this script reveals that this script
-      probably says 'Hello, Avatar!' when it enters some state, and it
-      says 'Touched.' when it is touched. But since this is also
-      probably the first time you have seen a script we'll dissect this
-      short listing, explaining each segment individually.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN56"
->2.1.2. Default State</A
-></H3
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN59"
-></A
-><PRE
-CLASS="programlisting"
->&#13;default
-{
-...
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-><P
->All LSL scripts have a simple implicit state machine with
-      one or more states. All scripts must have a default state, so
-      if there is only one state, it will be the 'default'
-      state. When a script is first started or reset, it will start
-      out in the default state.</P
-><P
->The default state is declared by placing the default at
-      the root level of the document, and marking the beginning with
-      an open brace '{' and ending with a close brace '}'. Because of
-      it's privileged status, you do not declare that it is fact a
-      state like you normally would with other states.</P
-><P
->Every time you enter a state, the script engine will
-      automatically call the state_entry() event and execute the code
-      found there. On state exit, the script engine will automatically
-      call the state_exit() event before calling the next state's
-      state_entry handler. In our example, we call the 
-          <A
-HREF="#AEN3640"
->llSay()</A
->
-      function in state_entry() and do not bother to define a
-      state_exit() handler. the state entry and exit handlers are a
-      convenient place to initialize state data and clean up state
-      specific data such as listen event callback.</P
-><P
->You can read more about the default state, and how to
-      create and utilize other states in the <A
-HREF="#AEN427"
->states chapter</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN67"
->2.1.3. Functions</A
-></H3
-><P
->The language comes with well over 200 <A
-HREF="#AEN999"
->built in functions</A
-> which allow scripts and
-      objects to interact with their environment. All of the built in
-      functions start with 'll'.</P
-><P
->The example calls the <A
-HREF="#AEN3640"
->llSay()</A
-> 
-          function twice, which is used to emit text on the specified channel.
-          </P
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN73"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSay</CODE
->(
-            integer channel
-            string text
-          );</CODE
-></P
-><P
-></P
-></DIV
-><P
->Say text on channel. Channel 0 is the public chat channel
-      that all avatars see as chat text. Channels 1 to 2,147,483,648
-      are private channels that aren't sent to avatars but other
-      scripts can listen for.</P
-><P
->You can define your own functions as long as the name does
-      not conflict with a reserved word, built in constant, or built
-      in function.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN82"
->2.1.4. Touch Event</A
-></H3
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN85"
-></A
-><PRE
-CLASS="programlisting"
->&#13;touch_start(integer total_number)
-{
-    llSay(0, "Touched.");
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-><P
->There are many <A
-HREF="#AEN4899"
->events</A
-> that can 
-          be detected in your scripts by declaring a handler. The 
-          <A
-HREF="#AEN5242"
-> touch_start()</A
-> 
-          event is raised when a
-      user touches the object through the user interface.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN90"
->2.1.5. Try it Out</A
-></H3
-><P
->Now that we have seen the default script, and examined it
-      in some detail, it is time to see the script in action. Save
-      the script by clicking on <SPAN
-CLASS="guibutton"
->Save</SPAN
->. During
-      the save process, the editor will save the text of the script
-      and compile the script into bytecode and then save that. When
-      you see message 'Compile successful!' in the preview window, you
-      know the compile and save is done.</P
-><P
->To test the script you will have to apply it to an object
-      in the world. Create a new object in the world by
-      <SPAN
-CLASS="mousebutton"
->context clicking</SPAN
-> in the main world
-      view and selecting <SPAN
-CLASS="guimenu"
->Create</SPAN
->. When the wand
-      appears, you can create a simple primitive by
-      <SPAN
-CLASS="mousebutton"
->clicking</SPAN
-> in the world. Once the
-      object appears, you can drag your newly created script onto the
-      object to start the script.</P
-><P
->Soon after dragging the script onto the object, you will
-      see the message <SAMP
-CLASS="computeroutput"
->Object: Hello
-      Avatar!</SAMP
-></P
-><P
->Make sure the touch event is working by
-      <SPAN
-CLASS="mousebutton"
->clicking</SPAN
-> on the object. You should
-      see the message <SAMP
-CLASS="computeroutput"
->Touched printed into the chat
-      history.</SAMP
-></P
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN103"
->2.2. Using The Built-In Editor</A
-></H2
-><P
->The built in editor comes with most of the typical features
-    you would expect from a basic text editor. Highlight text with the
-    mouse, or by holding down the shift key while using the arrow
-    keys. You can cut, copy, paste, and delete your selection using
-    the 'Edit' pull down menu or by pressing the usual shortcut
-    key.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN106"
->2.3. Using Alternative Editors</A
-></H2
-><P
->Since the built-in editor supports pasting text from the
-    clipboard, you can employ a different editor to edit your scripts,
-    copying them into Second Life when you're ready to save them.</P
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN109"
-></A
->Chapter 3. Basics</H1
-><P
->Now that we have seen a very simple script in action, we need
-  to look at the our toolchest for writing scripts. The next set of
-  tools we will consider are the basic building blocks for programming
-  a script, and will be used in every non-trivial script you write.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN112"
->3.1. Comments</A
-></H2
-><P
->Commenting your scripts is a good idea, and will help when
-    you update and modify the script, or when you adapt parts of it
-    into other scripts. Unless the meaning is obvious, you should add
-    comments:</P
-><P
-><P
-></P
-><UL
-><LI
-><P
->at the start of the script to explain the
-        purpose of the script</P
-></LI
-><LI
-><P
->before every global variable to describe what
-        it holds</P
-></LI
-><LI
-><P
->before every global function to describe what
-        it does</P
-></LI
-><LI
-><P
->sprinkled through your script wherever the code
-        solves a problem that took you more than a few minutes to
-        figure out.</P
-></LI
-></UL
-></P
-><P
->LSL uses Java/C++ style single line comments.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN127"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// This script toggles a the rotation of an object
-
-// g_is_rotating stores the current state of the rotation. TRUE is
-// rotating, FALSE otherwise.
-integer g_is_rotating = FALSE;
-default
-{
-    // toggle state during the touch handler
-    touch(integer num)
-    {
-        if(g_is_rotating)
-        {
-            // turn off rotation
-            llTargetOmega(&#60;0,0,1&#62;, 0, 0);
-            g_is_rotating = FALSE;
-        }
-        else
-        {
-            // rotate around the positive z axis - up.
-            llTargetOmega(&#60;0,0,1&#62;, 4, 1);
-            g_is_rotating = TRUE;
-        }
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN129"
->3.2. Arithmetic Operations</A
-></H2
-><P
->Most of the common arithmetic operations are supported in
-    lsl, and follow the C/Java syntax.</P
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN132"
->3.2.1. Assignment</A
-></H3
-><P
->The most common arithmetic operation is assignment,
-      denoted with the '=' sign. Loosely translated, it means, take
-      what you find on the right hand side of the equal sign and
-      assign it to the left hand side. Any expression that evaluates
-      to a basic type can be used as the right hand side of an
-      assignment, but the left hand side must be a normal
-      variable.</P
-><P
->All basic types support assignment '=', equality '==' and
-      inequality '!=' operators.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN137"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// variables to hold a information about the target
-key g_target;
-vector g_target_postion;
-float g_target_distance;
-
-// function that demonstrates assignment
-set_globals(key target, vector pos)
-{
-    g_target = target;
-    g_target_position = pos;
-
-    // assignment from the return value of a function
-    vector my_pos = llGetPos(); 
-    g_target_distance = llVecDist(g_target_position, my_pos);
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN139"
->3.2.2. Hexadecimal Entry</A
-></H3
-><P
->Integers may be entered in hex form (e.g. 0xffff).  For example:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN143"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer Mask = 0xff;  // Equivalent to integer Mask = 255;
-integer Bit  = 0x0100 // Equivalent to integer Mask = 256;
-        </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN145"
->3.2.3. Binary Arithmetic Operators</A
-></H3
-><P
->Binary arithmetic operators behave like a function call
-      that accepts two parameters of the same type, and then return
-      that type; however, the syntax is slightly different.</P
-><DIV
-CLASS="table"
-><A
-NAME="AEN148"
-></A
-><P
-><B
->Table 3-1. Binary Arithmetic Operators</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><THEAD
-><TR
-><TH
->Operator</TH
-><TH
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
->+</TD
-><TD
->Addition</TD
-></TR
-><TR
-><TD
->-</TD
-><TD
->Subtraction</TD
-></TR
-><TR
-><TD
->*</TD
-><TD
->Multiplication</TD
-></TR
-><TR
-><TD
->/</TD
-><TD
->Division</TD
-></TR
-><TR
-><TD
->%</TD
-><TD
->Modulo (remainder)</TD
-></TR
-><TR
-><TD
->^</TD
-><TD
->Exclusive OR</TD
-></TR
-><TR
-><TD
->&#60;&#60;</TD
-><TD
->Shift Left</TD
-></TR
-><TR
-><TD
->&#62;&#62;</TD
-><TD
->Shift Right</TD
-></TR
-></TBODY
-></TABLE
-></DIV
-><P
->Where noted, each type may have a special interpretation
-      of a binary arithmetic operator. See the <A
-HREF="#AEN237"
->lsl types</A
-> section for more
-      details.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN183"
-></A
-><PRE
-CLASS="programlisting"
->&#13;      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN185"
->3.2.4. Boolean Operators</A
-></H3
-><P
-></P
-><DIV
-CLASS="table"
-><A
-NAME="AEN188"
-></A
-><P
-><B
->Table 3-2. Boolean Operators</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><THEAD
-><TR
-><TH
->Operator</TH
-><TH
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
->&#60;</TD
-><TD
->Operator returns TRUE if the left hand side is less
-              than the right hand side.</TD
-></TR
-><TR
-><TD
->&#62;</TD
-><TD
->Operator returns TRUE if the left hand side is greater
-              than the right hand side.</TD
-></TR
-><TR
-><TD
->&#60;=</TD
-><TD
->Operator returns TRUE if the left hand side is less
-              than or equal to the right hand side.</TD
-></TR
-><TR
-><TD
->&#62;=</TD
-><TD
->Operator returns TRUE if the left hand side is greater
-              than or equal to the right hand side.</TD
-></TR
-><TR
-><TD
->&#38;&#38;</TD
-><TD
->Operator returns TRUE if the left hand side and right
-              hand side are both true.</TD
-></TR
-><TR
-><TD
->||</TD
-><TD
->Operator returns TRUE if either the left hand or right
-              hand side are true.</TD
-></TR
-><TR
-><TD
->!</TD
-><TD
->Unary operator returns the logical negation of the
-              expression to the right.</TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN217"
->3.2.5. Bitwise Operators</A
-></H3
-><P
-></P
-><DIV
-CLASS="table"
-><A
-NAME="AEN220"
-></A
-><P
-><B
->Table 3-3. Bitwise Operators</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><THEAD
-><TR
-><TH
->Operator</TH
-><TH
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
->&#38;</TD
-><TD
->Returns the bitwise and of the left and right hand
-              side.</TD
-></TR
-><TR
-><TD
->|</TD
-><TD
->Returns the bitwise or of the left and right hand
-              side.</TD
-></TR
-><TR
-><TD
->~</TD
-><TD
->Unary operator returns the bitwise complement of the
-              expression to the right.</TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN237"
->3.3. Types</A
-></H2
-><P
->Variables, return values, and parameters have type
-    information. LSL provides a small set of basic types that are used
-    throughout the language.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->LSL Types</B
-></P
-><DL
-><DT
->integer</DT
-><DD
-><P
->A signed, 32-bit integer value with valid range from
-          -2147483648 to 2147483647.</P
-></DD
-><DT
->float</DT
-><DD
-><P
->An IEEE 32-bit floating point value with
-        values ranging from 1.175494351E-38 to
-        3.402823466E+38.</P
-></DD
-><DT
->key</DT
-><DD
-><P
->A unique identifier that can be used to
-        reference objects and agents in Second Life.</P
-></DD
-><DT
->vector</DT
-><DD
-><P
->3 floats that are used together as a single
-        item. A vector can be used to represent a 3 dimensional
-        position, direction, velocity, force, impulse, or a
-        color. Each component can be accessed via '.x', '.y', and
-        '.z'.</P
-><DIV
-CLASS="table"
-><A
-NAME="AEN258"
-></A
-><P
-><B
->Table 3-4. Vector Arithmetic Operators</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><THEAD
-><TR
-><TH
->Operator</TH
-><TH
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
->+</TD
-><TD
->Add two vectors together</TD
-></TR
-><TR
-><TD
->-</TD
-><TD
->Subtract one vector from another</TD
-></TR
-><TR
-><TD
->*</TD
-><TD
->Vector dot product</TD
-></TR
-><TR
-><TD
->%</TD
-><TD
->Vector cross product</TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DD
-><DT
->rotation</DT
-><DD
-><P
->4 floats that are used together as a single
-        item to represent a rotation. This data is interpreted as a
-        quaternion. Each component can be accessed via '.x', '.y',
-        '.z', and '.s'.</P
-><DIV
-CLASS="table"
-><A
-NAME="AEN282"
-></A
-><P
-><B
->Table 3-5. Rotation Arithmetic Operators</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><COL><THEAD
-><TR
-><TH
->Operator</TH
-><TH
->Meaning</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
->+</TD
-><TD
->Add two rotations together</TD
-></TR
-><TR
-><TD
->-</TD
-><TD
->Subtract one rotation from another</TD
-></TR
-><TR
-><TD
->*</TD
-><TD
->Rotate the first rotation by the second</TD
-></TR
-><TR
-><TD
->/</TD
-><TD
->Rotate the first rotation by the inverse of the second</TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DD
-><DT
->list</DT
-><DD
-><P
->A heterogeneous list of the other data types. Lists are
-        created via comma separated values of the other data types
-        enclosed by '[' and ']'.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN307"
-></A
-><PRE
-CLASS="programlisting"
->&#13;string StringVar = "Hello, Carbon Unit";
-list MyList = [ 1234, ZERO_ROTATION, StringVar ];
-        </PRE
-><P
-></P
-></DIV
->
-        Yields the list: <SAMP
-CLASS="computeroutput"
->[ 1234, &#60;0,0,0,1&#62;, "Hello,
-        Carbon Unit" ]</SAMP
->
-        </P
-><P
->Lists can be combined with other lists. For example:
-        <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN311"
-></A
-><PRE
-CLASS="programlisting"
->&#13;MyList = 3.14159 + MyList;
-        </PRE
-><P
-></P
-></DIV
->
-        Yields the list: <SAMP
-CLASS="computeroutput"
->[ 3.14159, 1234, &#60;0,0,0,1&#62;,
-        "Hello, Carbon Unit" ]</SAMP
->
-         And similarly, 
-        <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN314"
-></A
-><PRE
-CLASS="programlisting"
->&#13;MyList = MyList + MyList;
-        </PRE
-><P
-></P
-></DIV
->
-        Yields: <SAMP
-CLASS="computeroutput"
->[ 3.14159, 1234, &#60;0,0,0,1&#62;, "Hello,
-        Carbon Unit", 3.14159, 1234, &#60;0,0,0,1&#62;, "Hello, Carbon Unit"
-        ]</SAMP
->
-        </P
-><P
->Library functions exist used to copy data from lists,
-        sort lists, copy/remove sublists.</P
-></DD
-></DL
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN318"
->3.3.1. Type Conversion</A
-></H3
-><P
->Type conversion can either occur implicitly or explicitly.
-      Explicit type casts are accomplished using C syntax:
-      <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN321"
-></A
-><PRE
-CLASS="programlisting"
->&#13;float foo_float = 1.0;
-integer  foo_int = (integer)foo_float;
-      </PRE
-><P
-></P
-></DIV
->
-      </P
-><DIV
-CLASS="section"
-><HR><H4
-CLASS="section"
-><A
-NAME="AEN323"
->3.3.1.1. Implicit Casting</A
-></H4
-><P
->LSL only supports two implicit type casts: integer to
-        float and string to key. Thus, any place you see a float
-        specified you can supply an integer, and any place you see a
-        key specified, you can supply a string.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H4
-CLASS="section"
-><A
-NAME="AEN326"
->3.3.1.2. Explicit Casting</A
-></H4
-><P
->LSL supports the following explicit casts:
-          <P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Integer to String</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Float to Integer</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Float to String</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Vector to String</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Rotation to String</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Integer to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Float to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Key to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->String to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Vector to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->Rotation to List</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->String to Integer</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->String to Float</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->String to Vector</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->String to Rotation</P
-></LI
-></UL
->
-        </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN360"
->3.4. Global Functions</A
-></H2
-><P
->Global functions are also declared much like Java/C, with
-    the exception that no 'void' return value exists. Instead, if no
-    return value is needed, just don't specify one:
-
-    <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN363"
-></A
-><PRE
-CLASS="programlisting"
->&#13;make_physical_and_spin(vector torque)
-{
-    // double the torque
-    vector double_torque = 2.0*torque;
-    llSetStatus(STATUS_PHYSICS, TRUE);
-    llApplyTorque(double_torque);
-}    
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN365"
->3.5. Global Variables</A
-></H2
-><P
->Global variables and functions are accessible from anywhere
-    in the file. Global variables are declared much like Java or C,
-    although only one declaration may be made per line:
-    <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN368"
-></A
-><PRE
-CLASS="programlisting"
->&#13;vector gStartPosition;
-    </PRE
-><P
-></P
-></DIV
-></P
-><P
->Global variables may also be initialized if desired,
-    although uninitialized global and local variables are initialized
-    to legal zero values:
-    <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN371"
-></A
-><PRE
-CLASS="programlisting"
->&#13;vector gStartPosition = &#60;10.0,10.0,10.0&#62;
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN373"
->3.6. Local Variables</A
-></H2
-><P
->Local variables are scoped below their declaration within
-    the block of code they are declared in and may be declared within
-    any block of code. Thus the following code is legal and will work
-    like C:
-    <DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN376"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer test_function()
-{
-    // Test vector that we can use anywhere in the function
-    vector test = &#60;1,2,3&#62;;
-    integer j;
-    for (j = 0; j &#60; 10; j++)
-    {
-        // This vector is a different variable than the one declared above
-        // This IS NOT good coding practice
-        vector test = &#60;j, j, j&#62;;
-    }
-    // this test fails
-    if (test == &#60;9,9,9&#62;)
-    {
-        // never reached
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN378"
-></A
->Chapter 4. Flow Control</H1
-><P
->LSL comes with a complete complement of constructs meant to
-  deal with conditional processing, looping, as well as simply jumping
-  to a different point in the script.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN381"
->4.1. Conditional Statements</A
-></H2
-><P
->The 'if' statement operates and has the 
-        same syntax as the Java/C version.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN385"
-></A
-><PRE
-CLASS="programlisting"
->&#13;check_message(string message)
-{
-    if(message == "open")
-    {
-        open();
-    }
-    else if(message == "close")
-    {
-        close();
-    }
-    else
-    {
-        llSay(0, "Unknown command: " + message);
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-><P
->The statements between the open and close curly brace are
-    performed if the conditional inside the parentheses evaluates to a
-    non-zero integer. Once a conditional is determined to be true
-    (non-zero), no further processing of 'else' conditionals will be
-    considered.  The <A
-HREF="#AEN6070"
->NULL_KEY</A
-> constant
-    is counted as FALSE by conditional expressions.</P
-><P
->There can be zero or more 'else if' statements, and an
-    optional final 'else' to handle the case when none of the if
-    statements evaluate to a non-zero integer.</P
-><P
->The usual set of integer arithmetic and comparison operators
-    are available.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN392"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// a function that accepts some information about its environment and
-// determines the 'best' next step. This kind of code might be
-// part of a simple box meant to move close to an agent and attach to
-// them once near. This code sample relies on the standard linden
-// library functions as well as two other methods not defined here.
-assess_next_step(integer perm, integer attached, integer balance, float dist)
-{
-    string msg;
-    if(!attached)
-    {
-        if((perm &#38; PERMISSION_ATTACH) &#38;&#38; (dist &#60; 10.0))
-        {
-             attach();
-        }
-        else if((dist &#62; 10.0) || ((dist &#62; 20.0) &#38;&#38; (balance &#62; 1000)))
-        {
-            move_closer();
-        }
-        else
-        {
-            llRequestPermissions(llGetOwner(), PERMISSION_ATTACH);
-        }
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN394"
->4.2. Loop Constructs</A
-></H2
-><P
->Loops are a basic building block of most useful programming
-    languages, and LSL offers the same loop constructs as found in
-    Java or C.</P
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN397"
->4.2.1. for loop</A
-></H3
-><P
->A for loop is most useful for when you know how many times
-      you need to iterate over an operation. Just like a Java or C for
-      loop, the parentheses have three parts, the initializer, the
-      continuation condition, and the increment. The loop continues
-      while the middle term evaluates to true, and the increment step
-      is performed at the end of every loop.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN401"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// move a non-physical block smoothly upward (positive z) the total
-// distance specified divided into steps discrete moves.
-move_up(float distance, integer steps)
-{
-    float step_distance = distance / (float)steps;
-    vector offset = &#60;0.0, 0.0, step_distance&#62;;
-    vector base_pos = llGetPos();
-    integer i;
-    for(i = 0; i &#60;= steps; ++i)
-    {
-        llSetPos(base_pos + i * offset);
-        llSleep(0.1);
-    }
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN403"
->4.2.2. do-while loop</A
-></H3
-><P
->The do-while loop construct is most useful when you are
-      sure that you want to perform an operation at least once, but
-      you are not sure how many times you want to loop. The syntax is
-      the same as you would find in a Java or C program. A simple
-      English translation would be 'do the code inside the curly braces
-      and continue doing it if the statement after the while is
-      true.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN407"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// output the name of all inventory items attached to this object
-talk_about_inventory(integer type)
-{
-    string name;
-    integer i = 0;
-    integer continue = TRUE;
-    do
-    {
-        name = llGetInventoryName(type, i);
-        if(llStringLength(name) &#62; 0)
-        {
-            llSay(0, "Inventory " + (string)i + ": " + name);
-        }
-        else
-        {
-            llSay(0, "No more inventory items");
-            continue = FALSE;
-        }
-        i++;
-    } while(continue);
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H3
-CLASS="section"
-><A
-NAME="AEN409"
->4.2.3. while loop</A
-></H3
-><P
->The while loop behaves similarly to the do-while loop,
-      except it allows you to exit the loop without doing a single
-      iteration inside.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN413"
-></A
-><PRE
-CLASS="programlisting"
->&#13;mention_inventory_type(integer type)
-{
-    integer i = llGetInventoryNumber(type);
-    while(i--)
-    {
-        llSay(0, "item: " + llGetInventory(i));
-    }
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN415"
->4.3. Jumps</A
-></H2
-><P
->A jump is used to move the running script to a new point
-    inside of a function or event handler. You cannot jump into other
-    functions or event handlers. Usually, you will want to use a jump
-    for in situations where the if..else statements would become too
-    cumbersome. For example, you may want to check several
-    preconditions, and exit if any of them are not met.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN419"
-></A
-><PRE
-CLASS="programlisting"
->&#13;attach_if_ready(vector target_pos)
-{
-    // make sure we have permission
-    integer perm = llGetPerm();
-    if(!(perm &#38; PERMISSION_ATTACH))
-    {
-        jump early_exit;
-    }
-
-    // make sure we're 10 or less meters away
-    vector pos = llGetPos()
-    float dist = llVecDist(pos, target_pos);
-    if(dist &#62; 10.0)
-    {
-        jump early_exit;
-    }
-
-    // make sure we're roughly pointed toward the target.
-    // the calculation of max_cos_theta could be precomputed 
-    // as a constant, but is manually computed here to 
-    // illustrate the math.
-    float max_cos_theta = llCos(PI / 4.0);
-    vector toward_target = llVecNorm(target_pos - pos);
-    rotation rot = llGetRot();
-    vector fwd = llRot2Fwd(rot);
-    float cos_theta = toward_target * fwd;
-    if(cos_theta &#62; max_cos_theta)
-    {
-        jump early_exit;
-    }
-
-    // at this point, we've done all the checks.
-    attach();
-
-    @early_exit;
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN421"
->4.4. State Change</A
-></H2
-><P
->State change allow you to move through the lsl virtual
-    machine's flexible state machine by transitioning your script to
-    and from user defined states and the default state. You can define
-    your own script state by placing the keyword 'state' before its
-    name and enclosing the event handlers with open and close curly
-    braces ('{' and '}'.) You can invoke the transition to a new state
-    by calling it with the syntax: 'state &#60;statename&#62;'.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN425"
-></A
-><PRE
-CLASS="programlisting"
->&#13;default
-{
-    state_entry()
-    {
-        llSay(0, "I am in the default state");
-        llSetTimer(1.0);
-    }
-
-    timer()
-    {
-        state SpinState;
-    }
-}
-
-state SpinState
-{
-    state_entry()
-    {
-        llSay(0, "I am in SpinState!");
-        llTargetOmega(&#60;0,0,1&#62;, 4, 1.0);
-        llSetTimer(2.0);
-    }
-
-    timer()
-    {
-        state default;
-    }
-
-    state_exit()
-    {
-        llTargetOmega(&#60;0,0,1&#62;, 0, 0.0);
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN427"
-></A
->Chapter 5. States</H1
-><P
->All scripts must have a 'default' state, which is the first
-  state entered when the script starts. States contain event handlers
-  that are triggered by the LSL virtual machine. All states must
-  supply at least one event handler - it's not really a state without
-  one.</P
-><P
->When state changes, all callback settings are retained and all
-  pending events are cleared.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN431"
->5.1. state_entry()</A
-></H2
-><P
->The <A
-HREF="#AEN5195"
->state_entry</A
->
-        event occurs whenever a new state is
-    entered, including program start, and is always the first event
-    handled. No data is passed to this event handler.</P
-><P
->You will usually want to set callbacks for things such as
-    timers and sensor in the state_entry() callback of the state to
-    put your object into a useful condition for that state.</P
-><P
->Warning: It is a common mistake to assume that the state_entry()
-      callback is called when you rez an object out of your
-      inventory. When you derez an object into your inventory the
-      current state of the script is saved, so there will not be a
-      call to state_entry() during the rez. If you need to provide
-      startup code every time an object is created, you should create
-      a global function and call it from both state_entry() and the
-      on_rez() callbacks.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN438"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// global initialization function.
-init()
-{
-    // Set up a listen callback for whoever owns this object.
-    key owner = llGetOwner();
-    llListen(0, "", owner, "");
-}
-
-default
-{
-    state_entry()
-    {
-        init();
-    }
-
-    on_rez(integer start_param)
-    {
-        init();
-    }
-
-    listen(integer channel, string name, key id, string message)
-    {
-        llSay(0, "Hi " + name + "! You own me.");
-    }
-}
-      </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN440"
->5.2. state_exit()</A
-></H2
-><P
->You will want to provide a <A
-HREF="#AEN5203"
->&#13;  state_exit()</A
-> if you need to clean
-    up any events that you have requested in the current state, but do
-    not expect in the next state.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN445"
-></A
-><PRE
-CLASS="programlisting"
->&#13;default
-{
-    state_entry()
-    {
-        state TimerState;
-    }
-}
-
-state TimerState
-{
-    state_entry()
-    {
-        // set a timer event for 5 seconds in the future.
-        llSetTimerEvent(5.0);
-    }
-
-    timer()
-    {
-        llSay(0, "timer");
-        state ListenState;
-    }
-
-    state_exit()
-    {
-        // turn off future timer events.
-        llSetTimerEvent(0.0);
-    }
-}
-
-integer g_listen_control;
-
-state ListenState
-{
-    state_entry()
-    {
-        // listen for anything on the public channel
-        g_listen_control = llListen(0, "", NULL_KEY, "");
-    }
-
-    listen(integer channel, string name, key id, string message)
-    {
-        llSay(0, "listen");
-        state TimerState;
-    }
-
-    state_exit()
-    {
-        // turn off the listener
-        llListenRemove(g_listen_control);
-    }
-}
-    </PRE
-><P
-></P
-></DIV
-></P
-><P
->The <A
-HREF="#AEN5203"
->state_exit()</A
-> 
-        handler is not called when an object is
-    being deleted - all callbacks, handlers, sounds, etc, will be
-    cleaned up automatically for you.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN449"
->5.3. States vs. Global variables</A
-></H2
-><P
->A state and a set of global variables can serve the same
-    purpose, and each can be expressed in terms of the other. In
-    general, you should prefer the use of states over global variables
-    since states allow you to immediately assume script state without
-    making comparisons. The less comparisons a script makes, the more
-    regular code statements it can run.</P
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN452"
-></A
->Chapter 6. Math</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN454"
->6.1. Tables of Functions</A
-></H2
-><DIV
-CLASS="table"
-><A
-NAME="AEN456"
-></A
-><P
-><B
->Table 6-1. Trigonometry Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1002"
->llAbs</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1012"
->llAcos</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1096"
->llAsin</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1106"
->llAtan2</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1212"
->llCeil</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1282"
->llCos</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1559"
->llFabs</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1569"
->llFloor</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1579"
->llFrand</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3220"
->llPow</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3618"
->llRound</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4302"
->llSin</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4335"
->llSqrt</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4678"
->llTan</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-><DIV
-CLASS="table"
-><A
-NAME="AEN505"
-></A
-><P
-><B
->Table 6-2. Vector Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN4810"
->llVecDist</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4823"
->llVecMag</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4833"
->llVecNorm</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-><DIV
-CLASS="table"
-><A
-NAME="AEN521"
-></A
-><P
-><B
->Table 6-3. Rotation Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1057"
->llAngleBetween</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1144"
->llAxes2Rot</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1160"
->llAxisAngle2Rot</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1549"
->llEuler2Rot</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3486"
->llRot2Angle</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3496"
->llRot2Axis</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3506"
->llRot2Euler</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3516"
->llRot2Fwd</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3526"
->llRot2Left</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3536"
->llRot2Up</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3546"
->llRotBetween</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN561"
-></A
->Chapter 7. Strings</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN563"
->7.1. Tables of Functions</A
-></H2
-><DIV
-CLASS="table"
-><A
-NAME="AEN565"
-></A
-><P
-><B
->Table 7-1. String Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1173"
->llBase64ToString</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1326"
->llDeleteSubString</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2195"
->llGetSubString</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2415"
->llInsertString</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2902"
->llMD5String</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4631"
->llStringLength</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4641"
->llSubStringIndex</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4652"
->llStringToBase64</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4737"
->llToLower</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4746"
->llToUpper</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4886"
->llXorBase64Strings</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN605"
-></A
->Chapter 8. Lists</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN607"
->8.1. Tables of Functions</A
-></H2
-><DIV
-CLASS="table"
-><A
-NAME="AEN609"
-></A
-><P
-><B
->Table 8-1. List Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1202"
->llCSV2List</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1306"
->llDeleteSubList</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1875"
->llGetListEntryType</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1889"
->llGetListLength</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2454"
->llList2CSV</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2464"
->llList2Float</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2477"
->llList2Integer</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2490"
->llList2Key</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2503"
->llList2List</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2526"
->llList2ListStrided</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2544"
->llList2Rot</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2557"
->llList2String</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2570"
->llList2Vector</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2583"
->llListFindList</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2598"
->llListInsertList</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2614"
->llListRandomize</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2648"
->llListSort</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3105"
->llParseString2List</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN670"
-></A
->Chapter 9. Communication</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN672"
->9.1. Tables of Functions</A
-></H2
-><DIV
-CLASS="table"
-><A
-NAME="AEN674"
-></A
-><P
-><B
->Table 9-1. In World Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN2665"
->llListen</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2686"
->llListenControl</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2701"
->llListenRemove</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3640"
->llSay</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4288"
->llShout</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN4862"
->llWhisper</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-><DIV
-CLASS="table"
-><A
-NAME="AEN699"
-></A
-><P
-><B
->Table 9-2. Messaging Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1533"
->llEmail</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1933"
->llGetNextEmail</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2431"
->llInstantMessage</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN715"
-></A
->Chapter 10. Inventory</H1
-><DIV
-CLASS="section"
-><H2
-CLASS="section"
-><A
-NAME="AEN717"
->10.1. Tables of Functions</A
-></H2
-><DIV
-CLASS="table"
-><A
-NAME="AEN719"
-></A
-><P
-><B
->Table 10-1. Inventory Functions</B
-></P
-><TABLE
-BORDER="1"
-CLASS="CALSTABLE"
-><COL><THEAD
-><TR
-><TH
->Function</TH
-></TR
-></THEAD
-><TBODY
-><TR
-><TD
-><A
-HREF="#AEN1047"
->llAllowInventoryDrop</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1754"
->llGetInventoryCreator</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1764"
->llGetInventoryKey</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1774"
->llGetInventoryName</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1816"
->llGetInventoryType</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1789"
->llGetInventoryNumber</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1801"
->llGetInventoryPermMask</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN1946"
->llGetNotecardLine</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2314"
->llGiveInventory</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN2326"
->llGiveInventoryList</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3325"
->llRemoveInventory</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3363"
->llRequestInventoryData</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3461"
->llRezObject</A
-></TD
-></TR
-><TR
-><TD
-><A
-HREF="#AEN3434"
->llRezAtRoot</A
-></TD
-></TR
-></TBODY
-></TABLE
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="chapter"
-><HR><H1
-><A
-NAME="AEN768"
-></A
->Chapter 11. Vehicles</H1
-><P
->Custom Vehicles can be constructed and controlled using the LSL.
-  This chapter will cover the basics of how vehicles work, the
-  terms used when describing vehicles, and a more thorough examination
-  of the api available.</P
-><P
->There are several ways to make scripted objects move
-  themselves around. One way is to turn the object into a
-  "vehicle". This feature is versatile enough to make things
-  that slide, hover, fly, and float. Some of the behaviors that can be
-  enabled are:</P
-><P
-><P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->deflection of linear and angular velocity to
-    preferred axis of motion</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;          <A
-HREF="#AEN956"
->asymmetric linear 
-                and angular friction</A
-></P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;          <A
-HREF="#AEN979"
->hovering</A
-> over terrain/water or 
-                at a global height</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;          <A
-HREF="#AEN949"
->banking</A
-> on turns
-                </P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;          <A
-HREF="#AEN866"
->linear</A
-> and 
-                <A
-HREF="#AEN898"
->angular</A
-> motor for 
-                <A
-HREF="#AEN853"
->push and turning</A
->
-        </P
-></LI
-></UL
-></P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN790"
->11.1. Overview</A
-></H2
-><P
->Each scripted object can have one vehicle behavior that is
-        configurable through the <A
-HREF="#AEN4249"
->llSetVehicleType</A
->, <A
-HREF="#AEN4235"
->llSetVehicleFloatParam</A
->,
-        <A
-HREF="#AEN4274"
->llSetVehicleVectorParam</A
->,
-        <A
-HREF="#AEN4260"
->llSetVehicleRotationParam</A
->,
-        <A
-HREF="#AEN4224"
->llSetVehicleFlags</A
->,
-        and <A
-HREF="#AEN3335"
->llRemoveVehicleFlags</A
->
-        library calls.</P
-><P
->These script calls are described in more detail below, but
-        the important thing to notice here is that the vehicle behavior
-        has several parameters that can be adjusted to change how the
-        vehicle handles. Depending on the values chosen the vehicle can
-        veer like a boat in water, or ride like a sled on rails.</P
-><P
->Setting the vehicle flags allow you to make exceptions to
-        some default behaviors. Some of these flags only have an effect
-        when certain behaviors are enabled. For example, the
-        VEHICLE_FLAG_HOVER_WATER_ONLY will make the vehicle ignore the
-        height of the terrain, however it only makes a difference if the
-        vehicle is hovering.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN801"
->11.2. Warnings</A
-></H2
-><P
->Vehicles are a work in progress and will
-        likely experience changes in future versions of Second Life.
-        Some of the details of vehicle behavior may be changed 
-        as necessary to ensure stability
-        and user safety. In particular, many of the limits and defaults
-        described in the appendices will probably change and should not be
-        relied upon in the long term.</P
-><P
->It is not recommended that you mix vehicle behavior with
-        some of the other script calls that provide impulse and forces to
-        the object, especially <A
-HREF="#AEN3773"
->llSetBuoyancy</A
->, <A
-HREF="#AEN3841"
->llSetForce</A
->, <A
-HREF="#AEN4200"
->llSetTorque</A
->, and <A
-HREF="#AEN3872"
->llSetHoverHeight</A
->.</P
-><P
->While the following methods probably don't cause any
-        instabilities, their behavior may conflict with vehicles and cause
-        undesired and/or inconsistent results, so use <A
-HREF="#AEN2753"
->llLookAt</A
->, <A
-HREF="#AEN3559"
->llRotLookAt</A
->, <A
-HREF="#AEN2980"
->llMoveToTarget</A
->, and <A
-HREF="#AEN4701"
->llTargetOmega</A
-> at your own
-        risk.</P
-><P
->If you think you have found a bug relating to how vehicle's
-        work, one way to submit the problem is to give a copy of the
-        vehicle and script to Andrew Linden with comments or a notecard
-        describing the problem. Please name all submissions "Bugged
-        Vehicle XX" where XX are your Second Life initials. The
-        vehicle and script will be examined at the earliest
-        convenience.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN815"
->11.3. Definitions</A
-></H2
-><P
->&#13;  The terms "roll", "pitch", and
-        "yaw" are often used to describe the modes of rotations
-        that can happen to a airplane or boat. They correspond to
-        rotations about the local x-, y-, and z-axis respectively.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN819"
-></A
-><PRE
-CLASS="programlisting"
->&#13;        z-axis  .
-      yaw-axis /|\
-                |     __. y-axis
-   ._        ___|      /| pitch-axis
-  _||\       \\ |\.   /
-  \|| \_______\_|__\_/_______
-   | _ _   o o o o o o o    |\_  ______\ x-axis
-   // ./_______,----,__________)       / roll-axis
-  /_,/        //  ./
-             /__,/ 
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->&#13;  The right-hand-rule, often introduced in beginning physics
-        courses, is used to define the direction of positive rotation
-        about any axis. As an example of how to use the right hand rule,
-        consider a positive rotation about the roll axis. To help
-        visualize how such a rotation would move the airplane, place your
-        right thumb parallel to the plane's roll-axis such that the thumb
-        points in the positive x-direction, then curl the four fingers
-        into a fist. Your fingers will be pointing in the direction that
-        the plane will spin.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN823"
-></A
-><PRE
-CLASS="programlisting"
->&#13;    .-.--.--.--.              __
-   / /  /  /  _ \            /  \
-  (-(- (- (- (   | _________|______\ axis of
-   \.\._\._\._)  |          |      / rotation
-    |           \:__,---.  \|/
-    |                    |  + positive
-     \           .,_.___.'    rotation
-      \_ ^ `.__,/ 
-      |      / 
-      |      | 
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->&#13;  Many of the parameters that control a vehicle's behavior are
-        of the form: VEHICLE_BEHAVIOR_TIMESCALE. A behavior's
-        "timescale" can usually be understood as the time for
-        the behavior to push, twist, or otherwise affect the vehicle such
-        that the difference between what it is doing, and what it is
-        supposed to be doing, has been reduced to 1/e of what it was,
-        where "e" is the natural exponent (approximately
-        2.718281828). In other words, it is the timescale for exponential
-        decay toward full compliance to the desired behavior. When you
-        want the vehicle to be very responsive use a short timescale of
-        one second or less, and if you want to disable a behavior then set
-        the timescale to a very large number like 300 (5 minutes) or
-        more. Note, for stability reasons, there is usually a limit to how
-        small a timescale is allowed to be, and is usually on the order of
-        a tenth of a second. Setting a timescale to zero is safe and is
-        always equivalent to setting it to its minimum. Any feature with a
-        timescale can be effectively disabled by setting the timescale so
-        large that it would take them all day to have any
-        effect.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN826"
->11.4. Setting the Vehicle Type</A
-></H2
-><P
->Before any vehicle parameters can be set the vehicle
-        behavior must first be enabled. It is enabled by calling <A
-HREF="#AEN4249"
->llSetVehicleType</A
-> with any
-        VEHICLE_TYPE_*, except VEHICLE_TYPE_NONE which will disable the
-        vehicle. See the <A
-HREF="#AEN6288"
->vehicle type
-        constants</A
-> section for currently available types. More types
-        will be available soon.</P
-><P
->Setting the vehicle type is necessary for enabling the
-    vehicle behavior and sets all of the parameters to its default
-    values. For each vehicle type listed we provide the corresponding
-    equivalent code in long format. Is is
-    <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->important</I
-></SPAN
-> to realize that the defaults are
-    <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->not</I
-></SPAN
-> the optimal settings for any of these
-    vehicle types and that they will definitely be changed in the
-    future. Do not rely on these values to be constant until
-    specified.</P
-><P
->Should you want to make a unique or experimental vehicle you
-        will still have to enable the vehicle behavior with one of the
-        default types first, after which you will be able to change any of
-        the parameters or flags within the allowed ranges.</P
-><P
->Setting the vehicle type does not automatically take
-        controls or otherwise move the object. However should you enable
-        the vehicle behavior while the object is free to move and parked
-        on a hill then it may start to slide away.</P
-><P
->We're looking for new and better default vehicle types. If
-    you think you've found a set of parameters that make a better car,
-    boat, or any other default type of vehicle then you may submit
-    your proposed list of settings to Andrew Linden via a script or
-    notecard.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN837"
->11.5. Linear and Angular Deflection</A
-></H2
-><P
->A common feature of real vehicles is their tendency to move
-        along "preferred axes of motion". That is, due to
-        their wheels, wings, shape, or method of propulsion they tend to
-        push or redirect themselves along axes that are static in the 
-        vehicle's local frame.  This general feature defines a
-        class of vehicles and included in this category a common 
-        dart is a "vehicle": it
-        has fins in the back such that if it were to tumble in the air it
-        would eventually align itself to move point-forward -- we'll call
-        this alignment effect <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->angular 
-        deflection</I
-></SPAN
->.</P
-><P
->A wheeled craft exhibits a 
-        different effect: when a
-        skateboard is pushed in some direction it will tend to redirect
-        the resultant motion along that which it is free to roll -- we'll
-        call this effect <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->&#13;  linear deflection</I
-></SPAN
->.</P
-><P
->So a typical Second Life vehicle is an object that
-        exhibits linear and/or angular deflection along the
-        "preferential axes of motion".  The default
-        preferential axes of motion are the local x- (at), y- (left), and
-        z- (up) axes of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->local frame</I
-></SPAN
-> of the
-        vehicle's root primitive.  The deflection behaviors relate to the
-        x-axis (at): linear deflection will tend to rotate its velocity
-        until it points along it's positive local x-axis while the
-        angular deflection will tend to reorient the vehicle such that
-        it's x-axis points in the direction that it is moving.  The other
-        axes are relevant to vehicle behaviors that are described later,
-        such as the 
-        <A
-HREF="#AEN938"
->vertical attractor</A
-> 
-        which tries to keep a vehicle's
-        local z-axis pointed toward the world z-axis (up).  The vehicle
-        axes can be rotated relative to the object's actual local axes by
-        using the 
-        <A
-HREF="#AEN990"
->VEHICLE_REFERENCE_FRAME</A
-> 
-        parameter, however that is an
-        advanced feature and is covered in detail in a later section of
-        these documents.</P
-><P
->Depending on the vehicle it might be desirable to have lots
-        of linear and/or angular deflection or not.  The speed of the
-        deflections are controlled by setting the relevant parameters
-        using the <A
-HREF="#AEN4235"
->llSetVehicleFloatParam</A
->
-        script call.  Each variety of deflection has a
-        "timescale" parameter that determines how quickly a
-        full deflection happens.  Basically the timescale it the time
-        coefficient for exponential decay toward full deflection.  So, a
-        vehicle that deflects quickly should have a small timescale.  For
-        instance, a typical dart might have a angular deflection
-        timescale of a couple of seconds but a linear deflection of
-        several seconds; it will tend to reorient itself before it
-        changes direction.  To set the deflection timescales of a dart
-        you might use the lines below:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN850"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetVehicleFloatParam(VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 2.0);
-llSetVehicleFloatParam(VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 6.0);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
-> Each variety of deflection has an "efficiency"
-        parameter that is a slider between 0.0 and 1.0.  Unlike the other
-        efficiency parameters of other vehicle behaviors, the deflection
-        efficiencies do not slide between "bouncy" and
-        "damped", but instead slide from "no deflection
-        whatsoever" (0.0) to "maximum deflection" (1.0).
-        That is, they behave much like the deflection timescales, however
-        they are normalized to the range between 0.0 and 1.0.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN853"
->11.6. Moving and Steering the Vehicle</A
-></H2
-><P
->Once enabled, a vehicle can be pushed and rotated by
-        external forces and/or from script calls such as 
-        <A
-HREF="#AEN1070"
->llApplyImpulse</A
->, 
-        however linear and angular motors have been built in 
-        to make motion smoother and easier to control.
-        Their directions can be set using the 
-        <A
-HREF="#AEN4274"
->llSetVehicleVectorParam</A
->
-        call. For example, to make the vehicle try to move at 5
-        meters/second along its local x-axis (the default look-at
-        direction) you would put the following line in your script:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN859"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetVehicleVectorParam(VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;5, 0, 0&#62;);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->The motor strength is not the full story, since you can also
-        control how fast the motor engages (VEHICLE_LINEAR_MOTOR_TIMESCALE) 
-        and there is a parameter that causes the motor's effectiveness to 
-        decay over time (VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE).</P
-><P
->Steering the vehicle involves setting the 
-        VEHICLE_ANGULAR_MOTOR_DIRECTION and related parameters.
-        It is also possible to set some flags that allow the angular
-        motor slave to your camera view when in mouselook.</P
-><P
->For more details about the vehicle motors
-        read the sections on the <A
-HREF="#AEN866"
->linear
-        </A
-> and <A
-HREF="#AEN898"
->angular</A
-> 
-        motors below.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN866"
->11.7. The Linear Motor</A
-></H2
-><P
->The parameters that control the linear motor are:</P
-><P
-><P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_LINEAR_MOTOR_DIRECTION</P
-><P
->A vector. 
-                It is the velocity (meters/sec) that the vehicle will 
-                try to attain. It points in the vehicle's local frame, and has a 
-                maximum length of 40.</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_LINEAR_MOTOR_OFFSET</P
-><P
->A vector. 
-                It is the offset point from the vehicle's center of mass at which 
-                the linear motor's impulse is applied. This allows the linear motor
-                to also cause rotational torque. It is in the vehicle's local
-                frame and its maximum length is 100 meters!  No need to worry
-                about stability -- if the vehicle starts to spin too fast
-                (greater than about 4*PI radians per second) then angular
-                velocity damping will kick in.  The reason the offset is allowed
-                to be so large is so that it can compete with the other vehicle
-                behaviors such as <A
-HREF="#vehicle_angular_deflection"
->angular deflection</A
->
-                and the <A
-HREF="#AEN938"
->vertical
-                attractor</A
->.  Some of the other vehicle behaviors may
-                drastically reduce the effective torque from the linear motor
-                offset, in which case a longer leverage arm may help.</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_LINEAR_MOTOR_TIMESCALE</P
-><P
->A float. Determines how long it takes for the motor to 
-                push the vehicle to full speed.  Its minimum value is approximately
-                0.06 seconds.</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE</P
-><P
->A float. The effectiveness of the motor will exponentially
-                decay over this timescale, but the effectiveness will be reset 
-                whenever the motor's value is explicitly set. The maximum value 
-                of this decay timescale is 120 seconds,
-                and this timescale is always in effect.</P
-></LI
-></UL
-></P
-><P
->The flags that affect the linear motor are:</P
-><P
-><P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->VEHICLE_FLAG_LIMIT_MOTOR_UP</P
-><P
->Useful for "ground vehicles". 
-        Setting this flag will clamp the z-component of the linear
-        motor (in world frame) to prevent it from defeating gravity.</P
-></LI
-></UL
-></P
-><P
->Setting the motor speed is not enough to enable all
-        interesting vehicles. For example, some will want a car that
-        immediately gets up to the speed they want, while others will want
-        a boat that slowly climbs up to its maximum velocity. To control
-        this effect the VEHICLE_LINEAR_MOTOR_TIMESCALE parameter can be 
-        used. Basically the "timescale" of a motor is the
-        time constant for the vehicle to exponentially accelerate toward
-        its full speed.</P
-><P
->What would happen if you were to accidentally set the
-        vehicle's linear velocity to maximum possible speed and then let
-        go? It would run away and never stop, right? Not necessarily: an
-        automatic "motor decay" has been built in such that all
-        motors will gradually decrease their effectiveness after being
-        set.</P
-><P
->Each time the linear motor's vector is set its 
-        "grip"
-        immediately starts to decay exponentially with a timescale
-        determined by the VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, such
-        that after enough time the motor ceases to have any effect.
-        This decay timescale serves two purposes.  First, since it
-        <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->cannot</I
-></SPAN
-> be set longer than 120 seconds, 
-        and is <SPAN
-CLASS="emphasis"
-><I
-CLASS="emphasis"
->always</I
-></SPAN
-> enabled it
-        guarantees that a vehicle will not push itself about forever 
-        in the absence
-        of active control (from keyboard commands or some logic loop in
-        the script).  Second, it can be used to push some vehicles around
-        using a simple impulse model.  That is, rather than setting the
-        motor "on" or "off" depending on whether
-        a particular key is pressed "down" or "up"
-        the decay timescale can be set short and the motor can be set 
-        "on" whenever the key transitions from "up"
-        to "down" and allowed to automatically decay.</P
-><P
-> Since the motor's effectiveness is reset whenever the
-        motor's vector is set, then setting it to a vector of length zero
-        is different from allowing it to decay completely. The first case
-        will cause the vehicle to try to reach zero velocity, while the
-        second will leave the motor impotent.</P
-><P
->The two motor timescales have very similar names, but have
-        different effects, so try not to get them confused.
-        VEHICLE_LINEAR_MOTOR_TIMESCALE is the time for motor to
-        "win", and VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE is the
-        time for the motor's "effectiveness" to decay toward
-        zero. If you set one when you think you are changing the other
-        you will have frustrating results. Also, if the motor's decay
-        timescale is shorter than the regular timescale, then the
-        effective magnitude of the motor vector will be
-        diminished.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN898"
->11.8. The Angular Motor</A
-></H2
-><P
->The parameters that control the angular motor are:</P
-><P
-><P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_ANGULAR_MOTOR_DIRECTION</P
-><P
->A vector. It is the angular velocity (radians/sec) 
-                that the vehicle will try to rotate. It points in the vehicle's 
-                local frame, and has a maximum value of 4*PI (two revolutions
-                per second).</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_ANGULAR_MOTOR_TIMESCALE</P
-><P
->A float. Determines how long it takes for the motor to 
-                spin the vehicle to full speed.  Its minimum value is approximately
-                0.06 seconds.</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE</P
-><P
->A float. The effectiveness of the motor will exponentially
-                decay over this timescale, but the effectiveness will be reset 
-                whenever the motor's value is explicitly set. The maximum value 
-                of this decay timescale is 120 seconds,
-                and this timescale is always in effect.</P
-></LI
-></UL
-></P
-><P
->Like the linear motor the angular motor can be set explicitly,
-        and has magnitude/direction, a timescale, and a decay timescale.  </P
-><P
->When it comes to actually steering a vehicle there are 
-        several ways to do it.  One way would be for the script to grab
-        keyboard input and to explicitly turn the motor on/off based on 
-        which keys are pressed.  When steering this way you probably 
-        don't want it to turn very far or for very long. One way to do
-        it using the angular motor would be to leave the decay timescale
-        long, enable a significant amount of angular friction (to
-        quickly slow the vehicle down when the motor is turned off) then
-        set the angular motor to a large vector on a key press, and set
-        it to zero when the key is released.  That has the effect of
-        making the vehicle unresponsive to external collisions, due to
-        the angular friction.</P
-><P
->Another way to do it is to set the
-        VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE to a short value and push
-        the vehicle about with a more impulsive method that sets the
-        motor fast on a key press down (and optionally setting the motor
-        to zero on a key up) relying on the automatic exponential decay
-        of the motor's effectiveness rather than a constant angular 
-        friction.</P
-><P
->Finally, it may be possible to discard the angular motor
-        entirely and use the VEHICLE_LINEAR_MOTOR_OFFSET. Whenever the 
-        offset has a component that is perpendicular to the direction
-        of the linear motor the vehicle will rotate as it travels. 
-        Note, with the incorrect values for offset and strength the 
-        linear motor effect can easily cause the vehicle to tumble 
-        and spin uncontrollably, so experiement with small offsets 
-        first!.</P
-><P
->Setting the angular motor to zero magnitude is different
-        from allowing it to decay.  When the motor completely decays 
-        it no longer affects the motion of the vehicle, however setting
-        it to zero will reset the "grip" of the vehicle and
-        will make the vehicle try to achieve zero angular velocity.
-        </P
-><P
->Many real vehicles bank (roll about their
-        forward axis) to effect a turn, such as motorcycles and airplanes. 
-        To make it easier to build banking vehicles there is 
-        <A
-HREF="#AEN949"
->banking behavior</A
-> 
-        available which can be controlled by setting other parameters and is
-        described in more detail here.</P
-><P
->It is also possible to make a 
-        <A
-HREF="#AEN921"
->vehicle turn in response 
-        to changing the camera view</A
-> 
-        (right now this only works in mouselook).</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN921"
->11.9. Using the Camera to Steer</A
-></H2
-><P
->The vehicle can be instructed to rotate its forward axis
-        to point in the same direction as the camera view. This
-        is achieved by setting some flags that change how the 
-        VEHICLE_ANGULAR_MOTOR_DIRECTION is interpreted. When used properly
-        this feature has the advantage of being able to provide simple
-        and stable steering that is resilient to bad render frame rates
-        on the client.  </P
-><P
->The flags that affect the angular motor are:</P
-><P
-><P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_FLAG_MOUSELOOK_STEER</P
-><P
->Steer the vehicle using the mouse.  Use this flag to make 
-        the angular motor try to make the vehicle
-        turn such that its local x-axis points in the same direction as 
-        the client-side camera.</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_FLAG_MOUSELOOK_BANK</P
-><P
->Same as above, but relies on banking.  It remaps left-right 
-        motions of the client camera (also known as "yaw") to rotations about 
-        the vehicle's local x-axis (also known as "roll").  </P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->&#13;  VEHICLE_FLAG_CAMERA_DECOUPLED</P
-><P
->Makes mouselook camera rotate independently of the vehicle.
-        By default the client mouselook camera will rotate about
-        with the vehicle, however when this flag is set the camera
-        direction is independent of the vehicle's rotation.</P
-></LI
-></UL
-></P
-><P
->When using the VEHICLE_FLAG_MOUSELOOK_STEER (or 
-        VEHICLE_FLAG_MOUSELOOK_BANK) the meaning of the 
-        VEHICLE_ANGULAR_MOTOR_DIRECTION parameter subtly changes.  Instead
-        of representing the "angular velocity" of the motor
-        the components of the parameter scale the "measured angular
-        velocity" (as determined by the rotation between 
-        the client's camera view direction and the forward-axis of the vehicle)
-        to compute the "final angular velocity".  That is,
-        suppose you set the angular motor to &#60;0, 0, 5&#62;, then moved the
-        camera view to be PI/4 radians to the left of the vehicle's forward axis,
-        and down PI/8 toward the ground.
-        The measured angular velocity would be &#60;0, -PI/8, PI/4&#62; 
-        radians/second, but the final velocity would be &#60;0, 0, 5*PI/4&#62;...
-        the vehicle will turn left, but will not dip its nose down.
-        Thus, by setting a component of the VEHICLE_ANGULAR_MOTOR_DIRECTION 
-        to zero, one can negate the pitch or yaw response of the motor, 
-        or even scale one to be much more responsive than the other.
-        </P
-><P
->The VEHICLE_ANGULAR_MOTOR_TIMESCALE still has an effect when
-        using mouselook control, and scales the global responsiveness of the
-        angular motor.  The VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, on the other
-        hand, is ignored when using mouselook controls.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN938"
->11.10. The Vertical Attractor</A
-></H2
-><P
->Some vehicles, like boats, should always keep their up-side
-        up. This can be done by enabling the "vertical
-        attractor" behavior that springs the vehicle's local z-axis
-        to the world z-axis (a.k.a. "up"). To take advantage of
-        this feature you would set the VEHICLE_VERTICAL_ATTRACTION_TIMESCALE
-        to control the period of the spring frequency, and then set the
-        VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY to control the damping. An
-        efficiency of 0.0 will cause the spring to wobble around its
-        equilibrium, while an efficiency of 1.0 will cause the spring to
-        reach it's equilibrium with exponential decay.</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN942"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetVehicleVectorParam(VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 4.0);
-llSetVehicleVectorParam(VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 0.5);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->The vertical attractor is disabled by setting its timescale
-        to anything larger than 300 seconds.</P
-><P
->Note that by default the vertical attractor will prevent the
-        vehicle from diving and climbing. So, if you wanted to make a
-        airplane you would probably want to unlock the attractor around the
-        pitch axis by setting the VEHICLE_FLAG_LIMIT_ROLL_ONLY bit:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN947"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetVehicleFlags(VEHICLE_FLAG_LIMIT_ROLL_ONLY);
-        </PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN949"
->11.11. Banking</A
-></H2
-><P
->The <A
-HREF="#AEN938"
->&#13;  vertical attractor</A
-> feature must be enabled in order for
-        the banking behavior to function. The way banking works is this: a
-        rotation around the vehicle's roll-axis will produce a angular
-        velocity around the yaw-axis, causing the vehicle to turn. The
-        magnitude of the yaw effect will be proportional to the
-        VEHICLE_BANKING_EFFICIENCY, the angle of the roll rotation, and
-        sometimes the vehicle's velocity along it's preferred axis of
-        motion.</P
-><P
->The VEHICLE_BANKING_EFFICIENCY can vary between -1 and +1. When
-        it's positive then any positive rotation (by the right-hand rule)
-        about the roll-axis will effect a (negative) torque around the
-        yaw-axis, making it turn to the right -- that is the vehicle will
-        lean into the turn, which is how real airplanes and motorcycle's
-        work. Negating the banking coefficient will make it so that the
-        vehicle leans to the outside of the turn (not very
-        "physical" but might allow interesting vehicles so why
-        not?).</P
-><P
->The VEHICLE_BANKING_MIX is a fake (i.e. non-physical)
-        parameter that is useful for making banking vehicles do what you
-        want rather than what the laws of physics allow. For example,
-        consider a real motorcycle... it must be moving forward in order
-        for it to turn while banking, however video-game motorcycles are
-        often configured to turn in place when at a dead stop -- because
-        they're often easier to control that way using the limited
-        interface of the keyboard or game controller. The
-        VEHICLE_BANKING_MIX enables combinations of both realistic and
-        non-realistic banking by functioning as a slider between a banking
-        that is correspondingly totally static (0.0) and totally dynamic
-        (1.0). By "static" we mean that the banking effect
-        depends only on the vehicle's rotation about it's roll-axis
-        compared to "dynamic" where the banking is also
-        proportional to it's velocity along it's roll-axis. Finding the
-        best value of the "mixture" will probably require trial
-        and error.</P
-><P
->The time it takes for the 
-        banking behavior to defeat a
-        pre-existing angular velocity about the world z-axis is determined
-        by the VEHICLE_BANKING_TIMESCALE. So if you want the vehicle to
-        bank quickly then give it a banking timescale of about a second or
-        less, otherwise you can make a sluggish vehicle by giving it a
-        timescale of several seconds.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN956"
->11.12. Friction Timescales</A
-></H2
-><P
->&#13;  VEHICLE_LINEAR_FRICTION_TIMESCALE is a vector parameter that
-        defines the timescales for the vehicle to come to a complete stop
-        along the three local axes of the 
-        <A
-HREF="#AEN990"
->vehicle's reference frame</A
->.
-        The timescale along each axis is independent of the others.
-        For example, a sliding ground car would probably have very little
-        friction along its x- and z-axes (so it can easily slide forward
-        and fall down) while there would usually significant friction
-        along its y-axis:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN961"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetVehicleVectorParam(VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;1000, 1000, 3&#62;);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->Remember that a longer timescale corresponds to a weaker
-        friction, hence to effectively disable all linear friction you
-        would set all of the timescales to large values.</P
-><P
->Setting the linear friction as a scalar is allowed, and has
-        the effect of setting all of the timescales to the same
-        value. Both code snippets below are equivalent, and both make friction
-        negligible:</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN966"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// set all linear friction timescales to 1000
-llSetVehicleVectorParam(VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;1000, 1000, 1000&#62;);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN969"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// same as above, but fewer characters
-llSetVehicleFloatParam(VEHICLE_LINEAR_FRICTION_TIMESCALE, 1000);
-        </PRE
-><P
-></P
-></DIV
-></P
-><P
->&#13;  VEHICLE_ANGULAR_FRICTION_TIMESCALE is also a vector
-        parameter that defines the timescales for the vehicle to stop
-        rotating about the x-, y-, and z-axes, and are set and disabled in
-        the same way as the linear friction.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN972"
->11.13. Buoyancy</A
-></H2
-><P
->The vehicle has a built-in buoyancy feature that is 
-        independent of the <A
-HREF="#AEN3773"
->llSetBuoyancy</A
-> call.  It
-        is recommended that the two buoyancies do not mix!  To make
-        a vehicle buoyant, set the VEHICLE_BUOYANCY parameter to something
-        between -1.0 (extra gravity) to 1.0 (full anti-gravity).
-        </P
-><P
->The buoyancy behavior is independent of hover, however
-        in order for hover to work without a large offset of the 
-        VEHICLE_HOVER_HEIGHT, the VEHICLE_BUOYANCY should be set to 1.0.
-        </P
-><P
->It is not recommended that you mix vehicle buoyancy with
-        the <A
-HREF="#AEN3773"
->llSetBuoyancy</A
-> script call.
-        It would probably cause the object to fly up into space.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN979"
->11.14. Hover</A
-></H2
-><P
->The hover behavior is enabled by setting the 
-        VEHICLE_HOVER_TIMESCALE to a value less than 300 seconds; larger
-        timescales totally disable it.  Most vehicles will work 
-        best with short hover timescales of a few seconds or less.
-        The shorter the timescale, the faster the vehicle will 
-        slave to is target height.  Note, that if the values of
-        VEHICLE_LINEAR_FRICTION_TIMESCALE may affect the speed of
-        the hover.</P
-><P
->Hover is independent of buoyancy, however the 
-        VEHICLE_BUOYANCY should be set to 1.0, otherwise the vehicle
-        will not lift itself off of the ground until the 
-        VEHICLE_HOVER_HEIGHT is made large enough to counter the
-        acceleration of gravity, and the vehicle will never float
-        all the way to its target height.  </P
-><P
->The VEHICLE_HOVER_EFFICIENCY can be thought of as a slider
-        between bouncy (0.0) and smoothed (1.0).  When in the
-        bouncy range the vehicle will tend to hover a little lower than 
-        its target height and the VEHICLE_HOVER_TIMESCALE will be
-        approximately the oscillation period of the bounce (the real
-        period will tend to be a little longer than the timescale).</P
-><P
->For performance reasons, until improvements are made to the
-        Second Life physics engine the vehicles can only hover over the
-        terrain and water, so they will not be able to hover above
-        objects made out of primitives, such as bridges and houses. By
-        default the hover behavior will float over terrain and water,
-        however this can be changed by setting some flags: </P
-><P
->If you wanted to make a boat you should set the 
-        <A
-HREF="#const_vehicle_flag_hover_water_only"
->&#13;  VEHICLE_HOVER_WATER_ONLY </A
-> flag, or if you wanted to drive a hover
-        tank under water you would use the 
-        <A
-HREF="#const_vehicle_flag_hover_terrain_only"
->&#13;  VEHICLE_HOVER_TERRAIN_ONLY </A
-> flag instead.  
-        Finally, if you wanted to make a submarine or a balloon you would use the 
-        <A
-HREF="#const_vehicle_flag_hover_global_height"
->&#13;  VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT</A
->.  Note that
-        the flags are independent of each other and that setting two 
-        contradictory flags will have undefined behavior.  The flags are 
-        set using the script call llSetVehicleFlags().</P
-><P
->The VEHICLE_HOVER_HEIGHT determines 
-        how high the vehicle
-        will hover over the terrain and/or water, or the global height, 
-        and has a maximum value of 100 meters.  Note that for hovering
-        purposes the "center" of the vehicle is its "center of mass"
-        which is not always obvious to the untrained eye, and it 
-        changes when avatar's sit on the vehicle.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN990"
->11.15. Reference Frame</A
-></H2
-><P
->The vehicle relies on the x- (at), y- (left), and z- (up)
-        axes in order to figure out which way it prefers to move and
-        which end is up.  By default these axes are identical to the
-        local axes of the root primitive of the object, however this
-        means that the vehicle's root primitive must, by default, be
-        oriented to agree with the designed at, left, and up axes of the
-        vehicle.  But, what if the vehicle object was already pre-built
-        with the root primitive in some non-trivial orientation
-        relative to where the vehicle as a whole should move?  This is
-        where the VEHICLE_REFERENCE_FRAME parameter becomes useful; the
-        vehicle's axes can be arbitrarily reoriented by setting this
-        parameter.  </P
-><P
->As an example, suppose you had built a rocket out of a big
-        cylinder, a cone for the nose, and some stretched cut boxes for
-        the fins, then linked them all together with the cylinder as the
-        root primitive.  Ideally the rocket would move nose-first,
-        however the cylinder's axis of symmetry is its local z-axis while
-        the default "at-axis" of the vehicle, the axis it will
-        want to deflect to forward under angular deflection, is the local
-        x-axis and points out from the curved surface of the cylinder.
-        The script code below will rotate the vehicle's axes such that
-        the local z-axis becomes the "at-axis" and the local
-        negative x-axis becomes the "up-axis":</P
-><P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN995"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// rotate the vehicle frame -PI/2 about the local y-axis (left-axis)
-rotation rot = llEuler2Rot(0, PI/2, 0);
-llSetVehicleRotationParam(VEHICLE_REFERENCE_FRAME, rot);
-</PRE
-><P
-></P
-></DIV
-></P
-><P
->Another example of how the reference frame parameter could
-        be used is to consider flying craft that uses the vertical
-        attractor for stability during flying but wants to use VTOL
-        (vertical takeoff and landing).  During flight the craft's dorsal
-        axis should point up, but during landing its nose-axis should be
-        up.  To land the vehicle: while the 
-        <A
-HREF="#AEN938"
->vertical attractor</A
-> 
-        is in effect, rotate the existing VEHICLE_REFERENCE_FRAME by +PI/2
-        about the left-axis, then the vehicle will pitch up such that
-        it's nose points toward the sky.  The vehicle could be allowed to
-        fall to the landing pad under friction, or a decreasing hover
-        effect.  </P
-></DIV
-></DIV
-><DIV
-CLASS="appendix"
-><HR><H1
-><A
-NAME="AEN999"
-></A
->Appendix A. Linden Library Functions</H1
-><P
->Complete listing of the Linden Library function calls
-  available in lsl.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1002"
->A.1. llAbs</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1004"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llAbs</CODE
->(integer val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the absolute value of
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1012"
->A.2. llAcos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1014"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llAcos</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the arccosine in radians of
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1022"
->A.3. llAddToLandPassList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1024"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llAddToLandPassList</CODE
->(key avatar, float hours);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Add <CODE
-CLASS="parameter"
->avatar</CODE
-> to the land pass list for 
-    <CODE
-CLASS="parameter"
->hours</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1035"
->A.4. llAdjustSoundVolume</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1037"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llAdjustSoundVolume</CODE
->(float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Adjusts the volume of the currently playing attached sound
-    started with <A
-HREF="#AEN3184"
->llPlaySound</A
-> or
-    <A
-HREF="#AEN2773"
->llLoopSound</A
->. This function
-    Has no effect on sounds started with <A
-HREF="#AEN4756"
->llTriggerSound</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1047"
->A.5. llAllowInventoryDrop</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1049"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llAllowInventoryDrop</CODE
->(integer add);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If <CODE
-CLASS="parameter"
->add</CODE
-> == TRUE, users that do no have
-    object modify permissions can still drop inventory items onto
-    object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1057"
->A.6. llAngleBetween</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1059"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llAngleBetween</CODE
->(rotation a, rotation b);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the angle in radians between rotations
-    <CODE
-CLASS="parameter"
->a</CODE
-> and <CODE
-CLASS="parameter"
->b</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1070"
->A.7. llApplyImpulse</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1072"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llApplyImpulse</CODE
->(vector force, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Applies the <CODE
-CLASS="parameter"
->impulse</CODE
-> in local
-    coordinates if <CODE
-CLASS="parameter"
->local</CODE
-> == TRUE. Otherwise the
-    impulse is applied in global coordinates. This function only works
-    on physical objects.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1083"
->A.8. llApplyRotationalImpulse</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1085"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llApplyRotationalImpulse</CODE
->(vector force, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Applies a rotational <CODE
-CLASS="parameter"
->impulse</CODE
-> force in
-    local coordinates if <CODE
-CLASS="parameter"
->local</CODE
-> ==
-    TRUE. Otherwise the impulse is applied in global coordinates. This
-    function only works on physical objects.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1096"
->A.9. llAsin</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1098"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llAsin</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the arcsine in radians of
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1106"
->A.10. llAtan2</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1108"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llAtan2</CODE
->(float y, float x);</CODE
-></P
-><P
-></P
-></DIV
-><P
->returns the arctangent2 of <CODE
-CLASS="parameter"
->y</CODE
->,
-    <CODE
-CLASS="parameter"
->x</CODE
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1119"
->A.11. llAttachToAvatar</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1121"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llAttachToAvatar</CODE
->(key avatar, integer attachment);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Attach to <CODE
-CLASS="parameter"
->avatar</CODE
-> at point <A
-HREF="#AEN5448"
-><CODE
-CLASS="parameter"
->attachment</CODE
-></A
->.
-    Requires the <A
-HREF="#const_permission_attach"
->PERMISSION_ATTACH</A
-> runtime
-    permission.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1134"
->A.12. llAvatarOnSitTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1136"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llAvatarOnSitTarget</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If an avatar is sitting on the sit target, return
-    the avatar's key, <A
-HREF="#AEN6070"
->NULL_KEY</A
-> otherwise.
-    This only will detect avatars sitting on sit targets defined with <A
-HREF="#AEN4312"
->llSitTarget</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1144"
->A.13. llAxes2Rot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1146"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llAxes2Rot</CODE
->(vector fwd, vector left, vector up);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation represented by coordinate axes
-    <CODE
-CLASS="parameter"
->fwd</CODE
->, <CODE
-CLASS="parameter"
->left</CODE
->, and
-    <CODE
-CLASS="parameter"
->up</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1160"
->A.14. llAxisAngle2Rot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1162"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llAxisAngle2Rot</CODE
->(vector axis, float angle);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation generated <CODE
-CLASS="parameter"
->angle</CODE
->
-    about <CODE
-CLASS="parameter"
->axis</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1173"
->A.15. llBase64ToString</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1175"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llBase64ToString</CODE
->(string str);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Converts a Base 64 string to a conventional string. If the
-  conversion creates any unprintable characters, they are converted to
-  spaces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1182"
->A.16. llBreakAllLinks</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1184"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llBreakAllLinks</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Delinks all objects in the link set. Requires the permission
-    <A
-HREF="#const_permission_change_links"
->PERMISSION_CHANGE_LINKS</A
->
-    be set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1191"
->A.17. llBreakLink</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1193"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llBreakLink</CODE
->(integer linknum);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Delinks the object with the given
-    <CODE
-CLASS="parameter"
->link</CODE
-> number. Requires permission <A
-HREF="#const_permission_change_links"
->PERMISSION_CHANGE_LINKS</A
->
-    be set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1202"
->A.18. llCSV2List</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1204"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llCSV2List</CODE
->(string src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Create a list from a string of comma separated values
-    specified in <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1212"
->A.19. llCeil</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1214"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llCeil</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns largest integer value &#62;=
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1222"
->A.20. llCloseRemoteDataChannel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1224"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llCloseRemoteDataChannel</CODE
->(key channel);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Closes XML-RPC channel.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1231"
->A.21. llCloud</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1233"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llCloud</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the cloud density at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1241"
->A.22. llCollisionFilter</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1243"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llCollisionFilter</CODE
->(string name, key id, integer accept);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If <CODE
-CLASS="parameter"
->accept</CODE
-> == TRUE, only accept
-    collisions with objects <CODE
-CLASS="parameter"
->name</CODE
-> and
-    <CODE
-CLASS="parameter"
->id</CODE
->, otherwise with objects not
-    <CODE
-CLASS="parameter"
->name</CODE
-> or <CODE
-CLASS="parameter"
->id</CODE
->. Specify
-    an empty string or <A
-HREF="#AEN6070"
->NULL_KEY</A
-> to
-    not filter on the corresponding parameter.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1260"
->A.23. llCollisionSound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1262"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llCollisionSound</CODE
->(string impact_sound, float impact_volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Suppress default collision sounds, replace default impact
-    sounds with <CODE
-CLASS="parameter"
->impact_sound</CODE
-> found in the
-    object inventory. Supply an empty string to suppress collision
-    sounds.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1272"
->A.24. llCollisionSprite</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1274"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llCollisionSprite</CODE
->(string impact_sprite);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Suppress default collision sprites, replace default impact
-    sprite with <CODE
-CLASS="parameter"
->impact_sprite</CODE
-> found in the
-    object inventory. Supply an empty string to just suppress.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1282"
->A.25. llCos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1284"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llCos</CODE
->(float theta);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the cosine of <CODE
-CLASS="parameter"
->theta</CODE
->
-    radians.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1292"
->A.26. llCreateLink</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1294"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llCreateLink</CODE
->(key target, integer parent);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Attempt to link object script is attached to and
-    <CODE
-CLASS="parameter"
->target</CODE
->. Requires permission <A
-HREF="#const_permission_change_links"
->PERMISSION_CHANGE_LINKS</A
->
-    be set. If <CODE
-CLASS="parameter"
->parent</CODE
-> == TRUE, object script is
-    attached to is the root.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1306"
->A.27. llDeleteSubList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1308"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llDeleteSubList</CODE
->(list src, integer start, integer end);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Remove the slice from the list and return the remainder.
-    The <CODE
-CLASS="parameter"
->start</CODE
-> and <CODE
-CLASS="parameter"
->end</CODE
->
-    are inclusive, so 0, length - 1 would delete the entire list and
-    0,0 would delete the first list entry. Using negative numbers for
-    <CODE
-CLASS="parameter"
->start</CODE
-> and/or <CODE
-CLASS="parameter"
->end</CODE
->
-    causes the index to count backwards from the length of the list,
-    so 0,-1 would delete the entire list. If
-    <CODE
-CLASS="parameter"
->start</CODE
-> is larger than
-    <CODE
-CLASS="parameter"
->end</CODE
-> the list deleted is the exclusion of the
-    entries, so 6,4 would delete the entire list except for the
-    5<SUP
->th</SUP
-> list entry.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1326"
->A.28. llDeleteSubString</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1328"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llDeleteSubString</CODE
->(string src, integer start, integer end);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Removes the indicated substring and returns the result. The
-    <CODE
-CLASS="parameter"
->start</CODE
-> and <CODE
-CLASS="parameter"
->end</CODE
-> are
-    inclusive, so 0,length-1 would delete the entire string and 0,0
-    would delete the first character. Using negative numbers for
-    <CODE
-CLASS="parameter"
->start</CODE
-> and/or <CODE
-CLASS="parameter"
->end</CODE
->
-    causes the index to count backwards from the length of the string,
-    so 0,-1 would delete the entire string. If
-    <CODE
-CLASS="parameter"
->start</CODE
-> is larger than end the sub string is
-    the exclusion of the entries, so 6,4 would delete the entire
-    string except for the 5<SUP
->th</SUP
->
-    character.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1345"
->A.29. llDetachFromAvatar</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1347"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llDetachFromAvatar</CODE
->(key avatar);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Drop off of <CODE
-CLASS="parameter"
->avatar</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="lib_lldetected"
->A.30. llDetectedGrab</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1357"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llDetectedGrab</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the grab offset of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns &#60;0,0,0&#62; if number is
-    not valid sensed object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1365"
->A.31. llDetectedGroup</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1367"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llDetectedGroup</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns TRUE if detected object
-    <CODE
-CLASS="parameter"
->number</CODE
-> is part of same group as
-    owner.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1375"
->A.32. llDetectedKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1377"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llDetectedKey</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns <A
-HREF="#AEN6070"
->NULL_KEY</A
-> if number is not valid sensed
-    object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1386"
->A.33. llDetectedLinkNumber</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1388"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llDetectedLinkNumber</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the link position of the triggered event for
-    touches. 0 for a non-linked object, 1 for the root of a linked
-    object, 2 for the first child, etc.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1395"
->A.34. llDetectedName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1397"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llDetectedName</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the name of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns empty string if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1406"
->A.35. llDetectedOwner</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1408"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llDetectedOwner</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key of detected <CODE
-CLASS="parameter"
->number</CODE
->
-    object's owner. Returns invalid key if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1417"
->A.36. llDetectedPos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1419"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llDetectedPos</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the position of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns &#60;0,0,0&#62; if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1428"
->A.37. llDetectedRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1430"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llDetectedRot</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns &#60;0,0,0,1&#62; if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object).</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1439"
->A.38. llDetectedType</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1441"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llDetectedType</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of
-    detected object <CODE
-CLASS="parameter"
->number</CODE
->. Returns 0 if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object. Note
-    that <CODE
-CLASS="parameter"
->number</CODE
-> is a bitfield, so comparisons
-    need to be a bitwise and check. eg:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN1451"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer type = llDetectedType(0);
-if (type &#38; AGENT)
-{
-  // ...do stuff with the agent
-}
-</PRE
-><P
-></P
-></DIV
->
-    </P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1453"
->A.39. llDetectedVel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1455"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llDetectedVel</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the velocity of detected object
-    <CODE
-CLASS="parameter"
->number</CODE
->. Returns &#60;0,0,0&#62; if
-    <CODE
-CLASS="parameter"
->number</CODE
-> is not valid sensed object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1464"
->A.40. llDialog</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1466"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llDialog</CODE
->(key avatar, string message, list buttons, integer channel);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Opens a "notify box" in the top-right corner of the given avatar's screen displaying the message. Up to twelve buttons can be specified in a list of strings. When the player clicks a button, the name of the button is chatted on the specified channel. Channels work just like llSay(), so channel 0 can be heard by everyone. The chat originates at the object's position, not the avatar's position. e.g.
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN1479"
-></A
-><PRE
-CLASS="programlisting"
->&#13;LLDialog(who, "Are you a boy or a girl?", [ "Boy", "Girl" ], 4913);
-LLDialog(who, "This shows only an OK button.", [], 192);
-llDialog(who, "This chats so you can hear it.", ["Hooray"], 0);
-</PRE
-><P
-></P
-></DIV
->
-    </P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1481"
->A.41. llDie</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1483"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llDie</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Delete the object which holds the script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1489"
->A.42. llDumpList2String</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1491"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llDumpList2String</CODE
->(list src, string separator);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Write the list out in a single string using separator between values.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1500"
->A.43. llEscapeURL</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1502"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llEscapeURL</CODE
->(string url);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the string that is the URL escaped version of <CODE
-CLASS="parameter"
->url</CODE
->,
-    replacing spaces with %20 etc.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1510"
->A.44. llEdgeOfWorld</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1512"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llEdgeOfWorld</CODE
->(vector pos, vector dir);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns TRUE if the line along <CODE
-CLASS="parameter"
->dir</CODE
->
-    from <CODE
-CLASS="parameter"
->pos</CODE
-> hits the edge of the world in the
-    current simulator and returns FALSE if that edge crosses into
-    another simulator.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1523"
->A.45. llEjectFromLand</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1525"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llEjectFromLand</CODE
->(key pest);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Ejects <CODE
-CLASS="parameter"
->pest</CODE
-> from land that you
-    own.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1533"
->A.46. llEmail</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1535"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llEmail</CODE
->(string address, string subject, string message);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sends email to <CODE
-CLASS="parameter"
->address</CODE
-> with
-    <CODE
-CLASS="parameter"
->subject</CODE
-> and
-    <CODE
-CLASS="parameter"
->message</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1549"
->A.47. llEuler2Rot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1551"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llEuler2Rot</CODE
->(vector vec);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation represented by Euler Angle
-    <CODE
-CLASS="parameter"
->vec</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1559"
->A.48. llFabs</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1561"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llFabs</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the absolute value of
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1569"
->A.49. llFloor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1571"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llFloor</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns largest integer value &#60;=
-    <CODE
-CLASS="parameter"
->val</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1579"
->A.50. llFrand</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1581"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llFrand</CODE
->(float mag);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns a pseudo-random number between [0,
-    <CODE
-CLASS="parameter"
->mag</CODE
->).</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1589"
->A.51. llGetAccel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1591"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetAccel</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Gets the acceleration.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1597"
->A.52. llGetAttached</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1599"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetAttached</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the object attachment point or 0 if not attached.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1605"
->A.53. llGetAgentInfo</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1607"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetAgentInfo</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns information about the given agent
-    <CODE
-CLASS="parameter"
->id</CODE
->. Returns a bitfield of <A
-HREF="#AEN5767"
->agent info constants</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1616"
->A.54. llGetAgentSize</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1618"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetAgentSize</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the agent <CODE
-CLASS="parameter"
->id</CODE
-> is in the same sim as
-    the object, returns the size of the avatar.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1626"
->A.55. llGetAlpha</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1628"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetAlpha</CODE
->(integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the alpha of the given
-    <CODE
-CLASS="parameter"
->face</CODE
->. If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
-> the value returned is
-    the mean average of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1638"
->A.56. llGetAndResetTime</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1640"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetAndResetTime</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the seconds of elapsed time from an internal timer
-    associated with the script. The timer is reset to zero during the
-    call. The timer is also reset on rez, simulator restart, script
-    reset, and in calls to <A
-HREF="#AEN3426"
->llResetTime</A
->. Use <A
-HREF="#AEN4188"
->llSetTimerEvent</A
-> if you want a
-    reliable timing mechanism.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1648"
->A.57. llGetAnimation</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1650"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetAnimation</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the currently playing animation for avatar
-    <CODE
-CLASS="parameter"
->id</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1658"
->A.58. llGetAnimationList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1660"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llGetAnimationList</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns a list of currently playing animations for avatar
-    <CODE
-CLASS="parameter"
->id</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1668"
->A.59. llGetBoundingBox</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1670"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llGetBoundingBox</CODE
->(key object);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the bounding box around <CODE
-CLASS="parameter"
->object</CODE
-> (including any linked prims)
-        relative to the root prim.  Returned value is a list of the form:
-        [ (vector) min_corner, (vector) max_corner ]</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1678"
->A.60. llGetCenterOfMass</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1680"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetCenterOfMass</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the center of mass of the root object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1686"
->A.61. llGetColor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1688"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetColor</CODE
->(integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the color of <CODE
-CLASS="parameter"
->face</CODE
-> as a vector
-    of red, green, and blue values between 0 and 1. If
-    <CODE
-CLASS="parameter"
->face</CODE
-> is <A
-HREF="#AEN6073"
->ALL_SIDES</A
-> the color returned is the
-    mean average of each channel.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1698"
->A.62. llGetCreator</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1700"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetCreator</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the creator of the object which has the script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1706"
->A.63. llGetDate</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1708"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetDate</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the current UTC date as YYYY-MM-DD.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1714"
->A.64. llGetEnergy</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1716"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetEnergy</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns how much energy is in the object as a percentage of
-    maximum.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1722"
->A.65. llGetForce</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1724"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetForce</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the current force if the script is physical.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1730"
->A.66. llGetFreeMemory</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1732"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetFreeMemory</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the available heap space for the current script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1738"
->A.67. llGetGeometricCenter</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1740"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetGeometricCenter</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the geometric center of the linked set the script is attached to.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1746"
->A.68. llGetGMTclock</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1748"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetGMTclock</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the time in seconds since GMT midnight.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1754"
->A.69. llGetInventoryCreator</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1756"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetInventoryCreator</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key for the creator of the inventory
-    <CODE
-CLASS="parameter"
->name</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1764"
->A.70. llGetInventoryKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1766"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetInventoryKey</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key of the inventory
-    <CODE
-CLASS="parameter"
->name</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1774"
->A.71. llGetInventoryName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1776"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetInventoryName</CODE
->(integer type, integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Get the name of the inventory item
-    <CODE
-CLASS="parameter"
->number</CODE
-> of <CODE
-CLASS="parameter"
->type</CODE
->. Use
-    the <A
-HREF="#AEN5411"
->inventory constants</A
-> to
-    specify the <CODE
-CLASS="parameter"
->type</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1789"
->A.72. llGetInventoryNumber</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1791"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetInventoryNumber</CODE
->(integer type);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Get the number of items of <CODE
-CLASS="parameter"
->type</CODE
-> in
-    the object inventory. Use the <A
-HREF="#AEN5411"
->inventory constants</A
-> to specify
-    the <CODE
-CLASS="parameter"
->type</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1801"
->A.73. llGetInventoryPermMask</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1803"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetInventoryPermMask</CODE
->(string item, integer mask);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the requested permission <CODE
-CLASS="parameter"
->mask</CODE
-> for the 
-        specified inventory item.  See <A
-HREF="#AEN6412"
->Permission Mask Constants</A
->
-        for more information.  Example usage:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN1814"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer JeansPerms = llGetInventoryPermMask("Black Jeans", MASK_NEXT);
-if (JeansPerms &#38; PERM_COPY)
-{
-        llSay(0, "The next owner may copy the 'Black Jeans'");
-}
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1816"
->A.74. llGetInventoryType</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1818"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetInventoryType</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the type of the inventory
-    <CODE
-CLASS="parameter"
->name</CODE
->.  INVENTORY_NONE is returned if no
-        inventory matching <CODE
-CLASS="parameter"
->name</CODE
-> is found.  Use the <A
-HREF="#AEN5411"
->inventory constants</A
-> to compare
-    against the return value.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1828"
->A.75. llGetKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1830"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetKey</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Get the key for the object which has this script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1836"
->A.76. llGetLandOwnerAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1838"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetLandOwnerAt</CODE
->(vector pos);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key of the land owner at
-    <CODE
-CLASS="parameter"
->pos</CODE
-> or <A
-HREF="#AEN6070"
->NULL_KEY</A
-> if public.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1847"
->A.77. llGetLinkKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1849"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetLinkKey</CODE
->(integer linknum);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key of <CODE
-CLASS="parameter"
->linknum</CODE
-> in the link
-    set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1857"
->A.78. llGetLinkName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1859"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetLinkName</CODE
->(integer linknum);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the name of <CODE
-CLASS="parameter"
->linknum</CODE
-> in the
-    link set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1867"
->A.79. llGetLinkNumber</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1869"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetLinkNumber</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns what link number in a link set the for the object
-    which has this script. 0 means no link, 1 the root, 2 for first
-    child, etc.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1875"
->A.80. llGetListEntryType</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1877"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetListEntryType</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the <A
-HREF="#AEN5733"
->type</A
-> of the
-    variable at <CODE
-CLASS="parameter"
->index</CODE
-> in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1889"
->A.81. llGetListLength</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1891"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetListLength</CODE
->(list src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the number of elements in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1899"
->A.82. llGetLocalPos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1901"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetLocalPos</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the local position of a child object relative to the
-    root.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1907"
->A.83. llGetLocalRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1909"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llGetLocalRot</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the local rotation of a child object relative to the
-    root.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1915"
->A.84. llGetMass</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1917"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetMass</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the mass of the object in Kilograms. Most materials
-    in Second Life are less dense than their first life counterparts,
-    so the returned mass may be less than you might expect.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1923"
->A.85. llGetObjectMass</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1925"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetObjectMass</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the mass of the object specified by <CODE
-CLASS="parameter"
->id</CODE
-> in Kilograms. Most materials
-    in Second Life are less dense than their first life counterparts,
-    so the returned mass may be less than you might expect.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1933"
->A.86. llGetNextEmail</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1935"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGetNextEmail</CODE
->(string address, string subject);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Get the next waiting email with appropriate
-    <CODE
-CLASS="parameter"
->address</CODE
-> and/or
-    <CODE
-CLASS="parameter"
->subject</CODE
->. If the parameters are blank, they
-    are not used for filtering.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1946"
->A.87. llGetNotecardLine</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1948"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetNotecardLine</CODE
->(string name, integer line);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This function fetches line number
-    <CODE
-CLASS="parameter"
->line</CODE
-> of notecard
-    <CODE
-CLASS="parameter"
->name</CODE
-> and returns the data through the <A
-HREF="#AEN4997"
->dataserver</A
-> event. The line count
-    starts at zero. If the requested line is past the end of the
-    notecard the <A
-HREF="#AEN4997"
->dataserver</A
->
-    event will return the constant <A
-HREF="#AEN6076"
->EOF</A
-> string. The key returned by
-    this function is a unique identifier which will be supplied to the
-    <A
-HREF="#AEN4997"
->dataserver</A
-> event in the
-    <CODE
-CLASS="parameter"
->requested</CODE
-> parameter.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1964"
->A.88. llGetNumberOfNotecardLines</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1966"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetNumberOfNotecardLines</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This function reads the number of lines in notecard <CODE
-CLASS="parameter"
->name</CODE
->
-        and returns this information through the <A
-HREF="#AEN4997"
->dataserver</A
-> event.  
-        The key returned by this function is a unique identifier which will be supplied to the
-        <A
-HREF="#AEN4997"
->dataserver</A
-> event in the <CODE
-CLASS="parameter"
->requested</CODE
-> 
-        parameter.  You will need to cast the returned string to an integer.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1977"
->A.89. llGetNumberOfPrims</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1979"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetNumberOfPrims</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the number of prims in the linked set the script is attached to.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1985"
->A.90. llGetNumberOfSides</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1987"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetNumberOfSides</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the number of sides of the current which has the
-    script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN1993"
->A.91. llGetObjectDesc</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN1995"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetObjectDesc</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the description of the object which has the script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2001"
->A.92. llGetObjectName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2003"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetObjectName</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the name of the object which has the script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2009"
->A.93. llGetObjectPermMask</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2011"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetObjectPermMask</CODE
->(integer mask);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the requested permission <CODE
-CLASS="parameter"
->mask</CODE
-> for the root object the
-        task is attached to.  See <A
-HREF="#AEN6412"
->Permission Mask Constants</A
->
-        for more information.  Example usage:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN2020"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer ObjectPerms = llGetObjectPermMask(MASK_NEXT);
-if (ObjectPerms &#38; PERM_COPY)
-{
-        llSay(0, "The next owner may copy this item");
-}
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2022"
->A.94. llGetOmega</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2024"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetOmega</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the omega.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2030"
->A.95. llGetOwner</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2032"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetOwner</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the owner of the object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2038"
->A.96. llGetOwnerKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2040"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetOwnerKey</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the owner of object
-    <CODE
-CLASS="parameter"
->id</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2048"
->A.97. llGetPermissions</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2050"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetPermissions</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns what permissions have been enabled. eg:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN2056"
-></A
-><PRE
-CLASS="programlisting"
->&#13;integer perm = llGetPermissions();
-if((perm &#38; PERMISSION_DEBIT) == PERMISSION_DEBIT)
-{
-    // code goes here
-}
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2058"
->A.98. llGetPermissionsKey</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2060"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llGetPermissionsKey</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns avatar that has enabled permissions. Returns <A
-HREF="#AEN6070"
->NULL_KEY</A
-> if not enabled.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2067"
->A.99. llGetPos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2069"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetPos</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the position.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2075"
->A.100. llGetPrimitiveParams</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2077"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llGetPrimitiveParams</CODE
->(list parameters);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Get primitive parameters specified in <CODE
-CLASS="parameter"
->parameters</CODE
->. The
-            <CODE
-CLASS="parameter"
->parameters</CODE
-> are identical to the rules of <A
-HREF="#AEN4020"
->llSetPrimitiveParams</A
->, and the returned list is ordered as such.  Most requested parameters do not require a value to be associated, except for texture-related requests (PRIM_TEXTURE, PRIM_COLOR, and PRIM_BUMP_SHINY) which require a side number to be specified as well.  
-  
-    Valid parameters can be found in the <A
-HREF="#AEN6323"
->Primitive Constants</A
->.
-    Here is a simple example:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN2088"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llGetPrimitiveParams([PRIM_TYPE, PRIM_MATERIAL, PRIM_COLOR, ALL_SIDES, PRIM_POSITION]);
-</PRE
-><P
-></P
-></DIV
->
-    This would return a list similar to this:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN2090"
-></A
-><PRE
-CLASS="programlisting"
->&#13;    [PRIM_TYPE_BOX, PRIM_HOLE_DEFAULT, &#60;0, 1, 0&#62;, 0.0, &#60;0, 0, 0&#62;, &#60;1, 1, 0&#62;, &#60;0, 0, 0&#62;, // PRIM_TYPE
-     PRIM_MATERIAL_WOOD,        // PRIM_MATERIAL
-     0, &#60;1, 1, 1&#62;, 1.0,         // PRIM_COLOR (ALL_SIDES specified, so all 6 sides returned)
-     1, &#60;1, 0, 0&#62;, 0.5,
-     2, &#60;0, 0, 1&#62;, 1.0,
-     3, &#60;0, 1, 0&#62;, 1.0,
-     4, &#60;0, 0, 0&#62;, 0.5,
-     5, &#60;1, 1, 1&#62;, 1.0,
-     &#60;37.341, 195.283, 31.239&#62;] // PRIM_POSITION
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2092"
->A.101. llGetRegionCorner</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2094"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGetRegionCorner</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns a vector with the south west corner position of the
-      current region.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2100"
->A.102. llGetRegionFPS</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2102"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGetRegionFPS</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the mean region frames per second.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2108"
->A.103. llGetRegionName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2110"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetRegionName</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the current region name.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2116"
->A.104. llGetRegionTimeDilation</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2118"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetRegionTimeDilation</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the current time dilation as a float between 0 and 1.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2124"
->A.105. llGetRootPosition</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2126"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetRootPosition</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the global position of the root object of the object the script is attached to.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2132"
->A.106. llGetRootRotation</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2134"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llGetRootRotation</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the global rotation of the root object of the object the script is attached to.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2140"
->A.107. llGetRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2142"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llGetRot</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2148"
->A.108. llGetScale</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2150"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetScale</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the scale.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2156"
->A.109. llGetScriptName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2158"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetScriptName</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the name of this script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2164"
->A.110. llGetStartParameter</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2166"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetStartParameter</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the start parameter passed to <A
-HREF="#AEN3461"
->llRezObject</A
-> or <A
-HREF="#AEN3434"
->llRezAtRoot</A
->. If the object was
-    created from agent inventory, this function returns 0.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2174"
->A.111. llGetScriptState</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2176"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetScriptState</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Resets TRUE if script <CODE
-CLASS="parameter"
->name</CODE
-> is running</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2184"
->A.112. llGetStatus</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2186"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llGetStatus</CODE
->(integer status);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the value of <CODE
-CLASS="parameter"
->status</CODE
->. The
-    value will be one of the <A
-HREF="#AEN5304"
->status
-    constants</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2195"
->A.113. llGetSubString</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2197"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetSubString</CODE
->(string src, integer start, integer end);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the indicated substring from
-    <CODE
-CLASS="parameter"
->src</CODE
->. The <CODE
-CLASS="parameter"
->start</CODE
-> and
-    <CODE
-CLASS="parameter"
->end</CODE
-> are inclusive, so 0,length-1 would
-    capture the entire string and 0,0 would capture the first
-    character. Using negative numbers for <CODE
-CLASS="parameter"
->start</CODE
->
-    and/or <CODE
-CLASS="parameter"
->end</CODE
-> causes the index to count
-    backwards from the length of the string, so 0,-1 would capture the
-    entire string. If start is larger than end the sub string is the
-    exclusion of the entries, so 6,4 would give the entire string
-    except for the 5<SUP
->th</SUP
-> character.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2214"
->A.114. llGetSunDirection</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2216"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetSunDirection</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the sun direction on the simulator.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2222"
->A.115. llGetTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2224"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetTexture</CODE
->(integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the texture of <CODE
-CLASS="parameter"
->face</CODE
-> if it is
-    found in object inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2232"
->A.116. llGetTextureOffset</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2234"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetTextureOffset</CODE
->(integer side);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the texture offset of <CODE
-CLASS="parameter"
->side</CODE
-> in
-    the x and y components of a vector.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2242"
->A.117. llGetTextureRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2244"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetTextureRot</CODE
->(integer side);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the texture rotation of
-    <CODE
-CLASS="parameter"
->side</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2252"
->A.118. llGetTextureScale</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2254"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetTextureScale</CODE
->(integer side);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the texture scale of <CODE
-CLASS="parameter"
->side</CODE
-> in
-    the x and y components of a vector.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2262"
->A.119. llGetTime</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2264"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetTime</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the seconds of elapsed time from an internal timer
-    associated with the script. The timer is reset on rez, simulator
-    restart, script reset, and in calls to <A
-HREF="#AEN1638"
->llGetAndResetTime</A
-> or <A
-HREF="#AEN3426"
->llResetTime</A
->. Use <A
-HREF="#AEN4188"
->llSetTimerEvent</A
-> if you want a
-    reliable timing mechanism.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2273"
->A.120. llGetTimeOfDay</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2275"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetTimeOfDay</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Gets the time in seconds since midnight in Second Life.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2281"
->A.121. llGetTimestamp</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2283"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llGetTimestamp</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns a timestamp in the format: YYYY-MM-DDThh:mm:ss.ff..fZ.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2289"
->A.122. llGetTorque</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2291"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetTorque</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the torque if the script is physical.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2297"
->A.123. llGetVel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2299"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGetVel</CODE
->();</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the velocity.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2306"
->A.124. llGetWallclock</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2308"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGetWallclock</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the time in seconds since simulator timezone
-    midnight. Currently this is PST.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2314"
->A.125. llGiveInventory</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2316"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGiveInventory</CODE
->(key destination, string inventory);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Give the named inventory item to the keyed avatar or object
-    in the same simulator as the giver. If the recipient is an avatar,
-    the avatar then follows the normal procedure of accepting or
-    denying the offer. 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"
->llAllowInventoryDrop</A
-> has
-    been called with TRUE, any other object can pass objects to its
-    inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2326"
->A.126. llGiveInventoryList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2328"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGiveInventoryList</CODE
->(key destination, string category, list  inventory);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Give the list of named inventory items to the keyed avatar
-    or object in the same simulator as the giver. If the recipient is
-    an avatar, the avatar then follows the normal procedure of
-    accepting or denying the offer. The offered inventory is then
-    placed in a folder named <CODE
-CLASS="parameter"
->category</CODE
-> in the
-    recipients inventory. 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"
->llAllowInventoryDrop</A
-> has
-    been called with TRUE, any other object can pass objects to its
-    inventory.If the recipient is an object, the
-    <CODE
-CLASS="parameter"
->category</CODE
-> parameter is ignored.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2342"
->A.127. llGiveMoney</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2344"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGiveMoney</CODE
->(key destination, integer amount);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Transfer <CODE
-CLASS="parameter"
->amount</CODE
-> from the script owner
-    to <CODE
-CLASS="parameter"
->destination</CODE
->. This call will fail if
-    <A
-HREF="#AEN5360"
->PERMISSION_DEBIT</A
-> has not
-    been set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2356"
->A.128. llGround</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2358"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llGround</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the ground height at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2366"
->A.129. llGroundContour</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2368"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGroundContour</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the ground contour at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2376"
->A.130. llGroundNormal</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2378"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGroundNormal</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the ground contour at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2386"
->A.131. llGroundRepel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2388"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llGroundRepel</CODE
->(float height, integer water, float tau);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Critically damps to <CODE
-CLASS="parameter"
->height</CODE
-> if within
-    <CODE
-CLASS="parameter"
->height</CODE
-> * 0.5 of
-    <CODE
-CLASS="parameter"
->level</CODE
->. The <CODE
-CLASS="parameter"
->height</CODE
->
-    is above ground level if <CODE
-CLASS="parameter"
->water</CODE
-> is FALSE or
-    above the higher of land and water if <CODE
-CLASS="parameter"
->water</CODE
->
-    is TRUE.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2405"
->A.132. llGroundSlope</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2407"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llGroundSlope</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the ground slope at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2415"
->A.133. llInsertString</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2417"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llInsertString</CODE
->(string dst, integer position, string src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Inserts <CODE
-CLASS="parameter"
->src</CODE
-> into
-    <CODE
-CLASS="parameter"
->dst</CODE
-> at <CODE
-CLASS="parameter"
->position</CODE
-> and
-    returns the result.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2431"
->A.134. llInstantMessage</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2433"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llInstantMessage</CODE
->(key user, string message);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Send <CODE
-CLASS="parameter"
->message</CODE
-> to the
-    <CODE
-CLASS="parameter"
->user</CODE
-> as an instant message.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2444"
->A.135. llKey2Name</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2446"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llKey2Name</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If object <CODE
-CLASS="parameter"
->id</CODE
-> is in the same
-    simulator, return the name of the object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2454"
->A.136. llList2CSV</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2456"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llList2CSV</CODE
->(list src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Create a string of comma separated values from
-    <CODE
-CLASS="parameter"
->list</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2464"
->A.137. llList2Float</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2466"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llList2Float</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the float at <CODE
-CLASS="parameter"
->index</CODE
-> in the
-    list <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2477"
->A.138. llList2Integer</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2479"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llList2Integer</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the integer at <CODE
-CLASS="parameter"
->index</CODE
-> in the list
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2490"
->A.139. llList2Key</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2492"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llList2Key</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the key at <CODE
-CLASS="parameter"
->index</CODE
-> in the list
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2503"
->A.140. llList2List</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2505"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llList2List</CODE
->(list src, integer start, integer end);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the slice of the list from
-    <CODE
-CLASS="parameter"
->start</CODE
-> to <CODE
-CLASS="parameter"
->end</CODE
-> from
-    the list <CODE
-CLASS="parameter"
->src</CODE
-> as a new list. The
-    <CODE
-CLASS="parameter"
->start</CODE
-> and <CODE
-CLASS="parameter"
->end</CODE
->
-    parameters are inclusive, so 0,length-1 would copy the entire list
-    and 0,0 would capture the first list entry. Using negative numbers
-    for <CODE
-CLASS="parameter"
->start</CODE
-> and/or <CODE
-CLASS="parameter"
->end</CODE
->
-    causes the index to count backwards from the length of the list,
-    so 0,-1 would capture the entire list. If
-    <CODE
-CLASS="parameter"
->start</CODE
-> is larger than
-    <CODE
-CLASS="parameter"
->end</CODE
-> the list returned is the exclusion of
-    the entries, so 6,4 would give the entire list except for the
-    5<SUP
->th</SUP
-> entry.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2526"
->A.141. llList2ListStrided</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2528"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llList2ListStrided</CODE
->(list src, integer start, integer end, integer stride);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Copy the strided slice of <CODE
-CLASS="parameter"
->src</CODE
-> from
-    <CODE
-CLASS="parameter"
->start</CODE
-> to <CODE
-CLASS="parameter"
->end</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2544"
->A.142. llList2Rot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2546"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llList2Rot</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation at <CODE
-CLASS="parameter"
->index</CODE
-> in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2557"
->A.143. llList2String</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2559"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llList2String</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the string at <CODE
-CLASS="parameter"
->index</CODE
-> in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2570"
->A.144. llList2Vector</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2572"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llList2Vector</CODE
->(list src, integer index);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the string at <CODE
-CLASS="parameter"
->index</CODE
-> in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2583"
->A.145. llListFindList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2585"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llListFindList</CODE
->(list src, list  test);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the position of the first instance of
-    <CODE
-CLASS="parameter"
->test</CODE
-> in <CODE
-CLASS="parameter"
->src</CODE
->. Returns
-    -1 if <CODE
-CLASS="parameter"
->test</CODE
-> is not in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2598"
->A.146. llListInsertList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2600"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llListInsertList</CODE
->(list dest, list src, integer pos);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the list created by inserting
-    <CODE
-CLASS="parameter"
->src</CODE
-> into <CODE
-CLASS="parameter"
->dest</CODE
-> at
-    <CODE
-CLASS="parameter"
->pos</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2614"
->A.147. llListRandomize</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2616"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llListRandomize</CODE
->(list src, integer stride);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <CODE
-CLASS="parameter"
->src</CODE
-> randomized into blocks of
-    size <CODE
-CLASS="parameter"
->stride</CODE
->. If the length of
-    <CODE
-CLASS="parameter"
->src</CODE
-> divided by
-    <CODE
-CLASS="parameter"
->stride</CODE
-> is non-zero, this function does
-    not randomize the list.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2629"
->A.148. llListReplaceList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2631"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llListReplaceList</CODE
->(list dest, list src, integer start, integer end);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the list created by replacing the segment of <CODE
-CLASS="parameter"
->dest</CODE
-> from 
-    <CODE
-CLASS="parameter"
->start</CODE
-> to <CODE
-CLASS="parameter"
->end</CODE
-> with <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2648"
->A.149. llListSort</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2650"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llListSort</CODE
->(list src, integer stride, integer ascending);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <CODE
-CLASS="parameter"
->src</CODE
-> sorted into blocks of
-    <CODE
-CLASS="parameter"
->stride</CODE
-> in ascending order if
-    <CODE
-CLASS="parameter"
->ascending</CODE
-> is <A
-HREF="#AEN5295"
->TRUE</A
->. Note that sort only works in
-    the head of each sort block is the same type.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2665"
->A.150. llListen</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2667"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llListen</CODE
->(integer channel, string name, key id, string msg);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets a listen event callback for <CODE
-CLASS="parameter"
->msg</CODE
->
-    on <CODE
-CLASS="parameter"
->channel</CODE
-> from <CODE
-CLASS="parameter"
->name</CODE
->
-    and returns an identifier that can be used to deactivate or remove
-    the listen. The <CODE
-CLASS="parameter"
->name</CODE
->,
-    <CODE
-CLASS="parameter"
->id</CODE
-> and/or <CODE
-CLASS="parameter"
->msg</CODE
->
-    parameters can be blank to indicate not to filter on that
-    argument. Channel 0 is the public chat channel that all avatars
-    see as chat text. Channels 1 to 2,147,483,648 are hidden channels
-    that are not sent to avatars.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2686"
->A.151. llListenControl</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2688"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llListenControl</CODE
->(integer number, integer active);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make a listen event callback active or inactive. Pass in the
-    value returned from <A
-HREF="#AEN2665"
->llListen</A
->
-    to the <CODE
-CLASS="parameter"
->number</CODE
-> parameter to specify which
-    event you are controlling. Use <A
-HREF="#AEN5295"
->boolean</A
-> values to specify
-    <CODE
-CLASS="parameter"
->active</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2701"
->A.152. llListenRemove</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2703"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llListenRemove</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Removes a listen event callback. Pass in the value returned
-    from <A
-HREF="#AEN2665"
->llListen</A
-> to the
-    <CODE
-CLASS="parameter"
->number</CODE
-> parameter to specify which event you
-    are removing.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2712"
->A.153. llLoadURL</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2714"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llLoadURL</CODE
->(key avatar_id, string message, string url);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Displays a dialog to user <CODE
-CLASS="parameter"
->avatar_id</CODE
->
-        with <CODE
-CLASS="parameter"
->message</CODE
-> offering to
-        go to the web page at <CODE
-CLASS="parameter"
->url</CODE
->.  If the user clicks the
-        "Go to page" button, their default web browser is launched and
-        directed to <CODE
-CLASS="parameter"
->url</CODE
->.</P
-><P
->The <CODE
-CLASS="parameter"
->url</CODE
-> must begin with "http:" or 
-        "https:", other protocols are not currently supported.  
-        The dialog box shows the name of the object's
-        owner so that abuse (e.g. spamming) can be easily reported.
-        This function has a 10 second implicit sleep.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2731"
->A.154. llLog</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2733"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llLog</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the natural logarithm (base e) of
-    <CODE
-CLASS="parameter"
->val</CODE
-> if <CODE
-CLASS="parameter"
->val</CODE
-> &#62; 0,
-    otherwise returns 0.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2742"
->A.155. llLog10</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2744"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llLog10</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the base 10 log of <CODE
-CLASS="parameter"
->val</CODE
-> if
-    <CODE
-CLASS="parameter"
->val</CODE
-> &#62; 0, otherwise returns 0.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2753"
->A.156. llLookAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2755"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llLookAt</CODE
->(vector target, float strength, float damping);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Cause object to point the forward axis toward
-    <CODE
-CLASS="parameter"
->target</CODE
->. Good
-    <CODE
-CLASS="parameter"
->strength</CODE
-> values are around half the mass of
-    the object and good <CODE
-CLASS="parameter"
->damping</CODE
-> values are less
-    than 1/10<SUP
->th</SUP
-> of the
-    <CODE
-CLASS="parameter"
->strength</CODE
->. Asymmetrical shapes require
-    smaller <CODE
-CLASS="parameter"
->damping</CODE
->. A
-    <CODE
-CLASS="parameter"
->strength</CODE
-> of 0.0 cancels the look at.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2773"
->A.157. llLoopSound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2775"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llLoopSound</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Similar to <A
-HREF="#AEN3184"
->llPlaySound</A
->, this function plays
-    a sound attached to an object, but will continuously loop that
-    sound until <A
-HREF="#AEN4620"
->llStopSound</A
-> or
-    <A
-HREF="#AEN3184"
->llPlaySound</A
-> is called. Only
-    one sound may be attached to an object at a time. A second call to
-    llLoopSound with the same key will not restart the sound, but the
-    new volume will be used. This allows control over the volume of
-    already playing sounds. Setting the <CODE
-CLASS="parameter"
->volume</CODE
->
-    to 0 is not the same as calling <A
-HREF="#AEN4620"
->llStopSound</A
->; a sound with 0
-    volume will continue to loop. To restart the sound from the
-    beginning, call <A
-HREF="#AEN4620"
->llStopSound</A
->
-    before calling llLoopSound again.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2790"
->A.158. llLoopSoundMaster</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2792"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llLoopSoundMaster</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Behaviour is identical to <A
-HREF="#AEN2773"
->llLoopSound</A
->, with the addition of
-    marking the source as a "Sync Master", causing "Slave" sounds to
-    sync to it. If there are multiple masters within a viewer's
-    interest area, the most audible one (a function of both distance
-    and volume) will win out as the master. The use of multiple
-    masters within a small area is unlikely to produce the desired
-    effect.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2802"
->A.159. llLoopSoundSlave</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2804"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llLoopSoundSlave</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Behaviour is identical to <A
-HREF="#AEN2773"
->llLoopSound</A
->, unless there is a
-    "Sync Master" present. If a Sync Master is already playing the
-    Slave sound will begin playing from the same point the master is
-    in its loop synchronizing the loop points of both sounds. If a
-    Sync Master is started when the Slave is already playing, the
-    Slave will skip to the correct position to sync with the
-    Master.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2814"
->A.160. llMakeExplosion</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2816"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMakeExplosion</CODE
->(integer particles, float scale, float velocity, float lifetime, float arc, string texture, vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make a round explosion of particles using
-    <CODE
-CLASS="parameter"
->texture</CODE
-> from the object's inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2836"
->A.161. llMakeFire</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2838"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMakeFire</CODE
->(integer particles, float scale, float velocity, float lifetime, float arc, string texture, vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make fire particles using <CODE
-CLASS="parameter"
->texture</CODE
->
-    from the object's inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2858"
->A.162. llMakeFountain</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2860"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMakeFountain</CODE
->(integer particles, float scale, float velocity, float lifetime, float arc, string texture, vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make a fountain of particles using
-    <CODE
-CLASS="parameter"
->texture</CODE
-> from the object's inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2880"
->A.163. llMakeSmoke</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2882"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMakeSmoke</CODE
->(integer particles, float scale, float velocity, float lifetime, float arc, string texture, vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make smoky particles using <CODE
-CLASS="parameter"
->texture</CODE
->
-    from the object's inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2902"
->A.164. llMD5String</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2904"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llMD5String</CODE
->(string str, integer nonce);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Performs a RSA Data Security, Inc. MD5 Message-Digest
-    Algorithm on <CODE
-CLASS="parameter"
->str</CODE
-> with
-    <CODE
-CLASS="parameter"
->nonce</CODE
->. The function returns the digest as a
-    32 character hex string. The digest is computed on the string in
-    the following format:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN2915"
-></A
-><PRE
-CLASS="programlisting"
->&#13;<CODE
-CLASS="parameter"
->str</CODE
-> + ":" + (string)<CODE
-CLASS="parameter"
->nonce</CODE
->
-</PRE
-><P
-></P
-></DIV
->
-    </P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2919"
->A.165. llMessageLinked</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2921"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMessageLinked</CODE
->(integer linknum, integer num, string str, key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sends <CODE
-CLASS="parameter"
->num</CODE
->,
-    <CODE
-CLASS="parameter"
->str</CODE
->, and <CODE
-CLASS="parameter"
->id</CODE
-> to
-    members of the link set. The <CODE
-CLASS="parameter"
->linknum</CODE
->
-    parameter is either the linked number available through <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-> or a <A
-HREF="#AEN5616"
->link constant</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2940"
->A.166. llMinEventDelay</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2942"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMinEventDelay</CODE
->(float delay);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set the minimum time between events being handled.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2949"
->A.167. llModifyLand</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2951"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llModifyLand</CODE
->(integer action, integer size);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Modify land with <CODE
-CLASS="parameter"
->action</CODE
-> on
-    <CODE
-CLASS="parameter"
->size</CODE
-> area. The parameters can be chosen
-    from the <A
-HREF="#AEN5574"
->land constants</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2963"
->A.168. llModPow</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2965"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llModPow</CODE
->(integer a, integer b, integer c);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Raise <CODE
-CLASS="parameter"
->a</CODE
-> to the <CODE
-CLASS="parameter"
->b</CODE
-> power, modulo <CODE
-CLASS="parameter"
->c</CODE
->.
-    <CODE
-CLASS="parameter"
->b</CODE
-> is capped at 0xFFFF (16 bits).</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2980"
->A.169. llMoveToTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2982"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llMoveToTarget</CODE
->(vector target, float tau);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Critically damp to position <CODE
-CLASS="parameter"
->target</CODE
-> in
-    <CODE
-CLASS="parameter"
->tau</CODE
-> seconds if the script is physical. Good
-    <CODE
-CLASS="parameter"
->tau</CODE
-> values are greater than 0.2. A
-    <CODE
-CLASS="parameter"
->tau</CODE
-> of 0.0 stops the critical
-    damping.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN2995"
->A.170. llOffsetTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN2997"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llOffsetTexture</CODE
->(float offset_s, float offset_t, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the texture s and t offsets of
-    <CODE
-CLASS="parameter"
->face</CODE
->. If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
-> this
-    function sets the texture offsets for all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3011"
->A.171. llOpenRemoteDataChannel</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3013"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llOpenRemoteDataChannel</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Creates a channel to listen for XML-RPC calls.
-    Will trigger a remote_data event with type = REMOTE_DATA_CHANNEL and a channel id once it is available.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3019"
->A.172. llOverMyLand</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3021"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llOverMyLand</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <A
-HREF="#AEN5295"
->TRUE</A
-> if
-    <CODE
-CLASS="parameter"
->id</CODE
-> is over land owned by the object owner,
-    <A
-HREF="#AEN5295"
->FALSE</A
-> otherwise.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3031"
->A.173. llParcelMediaCommandList</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3033"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llParcelMediaCommandList</CODE
->(list command_list);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Controls the playback of movies and other multimedia resources on a land parcel.  
-        <CODE
-CLASS="parameter"
->command</CODE
-> can be one of 
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_STOP</A
->, 
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_PAUSE</A
->, 
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_PLAY</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_LOOP</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_TEXTURE</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_URL</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_TYPE</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_DESC</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_SIZE</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_TIME</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_AGENT</A
->,
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_UNLOAD</A
->, or
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_AUTO_ALIGN</A
->.
-        </P
-><P
->You are allowed one movie (or "media" resource) per land parcel.  
-        The movie will be played by replacing a texture on an object with the 
-        movie.  Users will only see the movie when they are standing on your 
-        land parcel.  Otherwise they will see the static texture.</P
-><P
->Most of the QuickTime media formats are supported including:
-        <P
-></P
-><UL
-><LI
-><P
->QuickTime movies (.mov)</P
-></LI
-><LI
-><P
->Streamable stored QuickTime movies (.mov)</P
-></LI
-><LI
-><P
->Real time QuickTime streams (rtsp://)</P
-></LI
-><LI
-><P
->MPEG4 movies (.mp4, .mpeg4) (simple profile only)</P
-></LI
-><LI
-><P
->QuickTime VR scenes and objects (.mov)</P
-></LI
-><LI
-><P
->Flash movies (.swf) (only non-interative, version 5 and earlier</P
-></LI
-><LI
-><P
->and many others from http://www.apple.com/quicktime/products/qt/specifications.html</P
-></LI
-></UL
->
-        A good rule of thumb is if it plays in the QuickTime Media Player, it will play in Second Life.
-        </P
-><P
->You can set up a movie for playback as follows:
-        <P
-></P
-><UL
-><LI
-><P
->First, select a texture from your inventory to be the static texture.  It should not be a common texture -- a test pattern would be better than the default plywood.</P
-></LI
-><LI
-><P
->Apply that texture to an object.</P
-></LI
-><LI
-><P
->Right click on your land and select "About Land..."</P
-></LI
-><LI
-><P
->Under "Options" use the GUI to select the static texture.</P
-></LI
-><LI
-><P
->Enter the URL of your movie or media stream.</P
-></LI
-><LI
-><P
->Create objects you want to click on for PLAY, STOP, PAUSE and LOOP (play forever)</P
-></LI
-><LI
-><P
->Attach the following script (or similar) to each.</P
-></LI
-></UL
->
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3087"
-></A
-><PRE
-CLASS="programlisting"
->&#13;default
-{
-    touch_start ( integer total_number )
-    {
-                // This will play the current movie for all agents in the parcel.
-        llParcelMediaCommandList( [PARCEL_MEDIA_COMMAND_LOOP] );
-    }
-}
-</PRE
-><P
-></P
-></DIV
->
-Or a more advanced example:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3089"
-></A
-><PRE
-CLASS="programlisting"
->&#13;float START_TIME = 30.0;
-float RUN_LENGTH = 10.0;
-
-default
-{
-        state_entry()
-        {
-                llParcelMediaCommandList( [
-                        PARCEL_MEDIA_COMMAND_URL, "http://enter_your.url/here",
-                        PARCEL_MEDIA_COMMAND_TEXTURE, (key) llGetTexture(0) ] );
-        }
-
-        touch_start(integer num_detected)
-        {
-                llParcelMediaCommandList( [
-                        PARCEL_MEDIA_COMMAND_AGENT, llDetectedKey(0),
-                        PARCEL_MEDIA_COMMAND_TIME, START_TIME,
-                        PARCEL_MEDIA_COMMAND_PLAY ] );
-                list Info = llParcelMediaQuery([PARCEL_MEDIA_COMMAND_URL, PARCEL_MEDIA_COMMAND_TEXTURE]);
-                llSay(0, "Playing '" + llList2String(Info, 0) + "' on texture '" + (string)llList2Key(Info, 1) + "' for agent " + llDetectedName(0));
-                llSetTimerEvent(RUN_LENGTH);
-        }
-
-        timer()
-        {
-                llParcelMediaCommandList( [ PARCEL_MEDIA_COMMAND_STOP ] );
-                llSetTimerEvent(0.0);
-        }
-}
-</PRE
-><P
-></P
-></DIV
->
-
-
-        </P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3091"
->A.174. llParcelMediaQuery</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3093"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llParcelMediaQuery</CODE
->(list query_list);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Controls the playback of movies and other multimedia resources on a land parcel.  
-        <CODE
-CLASS="parameter"
->command</CODE
-> can be one of 
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_TEXTURE</A
-> or
-        <A
-HREF="#AEN6459"
->PARCEL_MEDIA_COMMAND_URL</A
->.
-        </P
-><P
->This allows you to query the texture or url for media on the parcel.  
-        See <A
-HREF="#AEN3031"
->llParcelMediaCommandList</A
-> for an example
-        of usage.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3105"
->A.175. llParseString2List</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3107"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llParseString2List</CODE
->(string src, list separators, list spacers);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Breaks <CODE
-CLASS="parameter"
->src</CODE
-> into a list, discarding
-    anything in <CODE
-CLASS="parameter"
->separators</CODE
->, keeping any entry
-    in <CODE
-CLASS="parameter"
->spacers</CODE
->. The
-    <CODE
-CLASS="parameter"
->separators</CODE
-> and
-    <CODE
-CLASS="parameter"
->spacers</CODE
-> must be lists of strings with a
-    maximum of 8 entries each. So, if you had made the call:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3123"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llParseString2List("Parsethisnow!  I dare:you to.", ["this", "!", " "], [":"]);
-</PRE
-><P
-></P
-></DIV
->
-    You would get the list:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3125"
-></A
-><PRE
-CLASS="programlisting"
->&#13;["Parse", "now", "I", "dare", ":", "you", "to"]
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3127"
->A.176. llParseStringKeepNulls</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3129"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->list llParseStringKeepNulls</CODE
->(string src, list separators, list spacers);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Breaks <CODE
-CLASS="parameter"
->src</CODE
-> into a list, discarding
-    anything in <CODE
-CLASS="parameter"
->separators</CODE
->, keeping any entry
-    in <CODE
-CLASS="parameter"
->spacers</CODE
->.  Any resulting null values 
-        are kept.  The <CODE
-CLASS="parameter"
->separators</CODE
-> and
-    <CODE
-CLASS="parameter"
->spacers</CODE
-> must be lists of strings with a
-    maximum of 8 entries each. So, if you had made the call:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3145"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llParseString2List("!Parsethisthisnow I dare::you to.", ["this", "!", " "], [":"]);
-</PRE
-><P
-></P
-></DIV
->
-    You would get the list:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3147"
-></A
-><PRE
-CLASS="programlisting"
->&#13;[NULL, "Parse", NULL, "now", "I", "dare", ":", NULL, ":", "you", "to"]
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3149"
->A.177. llParticleSystem</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3151"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llParticleSystem</CODE
->(list parameters);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Makes a particle system based on the parameter list. The
-    <CODE
-CLASS="parameter"
->parameters</CODE
-> are specified as an ordered list
-    of parameter and value. Valid parameters and their expected values
-    can be found in the <A
-HREF="#AEN5851"
->particle system
-    constants</A
->. Here is a simple example:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN3160"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llParticleSystem([PSYS_PART_FLAGS, PSYS_PART_WIND_MASK,
-                  PSYS_PART_START_COLOR, &#60;1,0,0&#62;,
-                  PSYS_SRC_PATTERN, PSYS_SRC_PATTERN_EXPLODE]);
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3162"
->A.178. llPassCollisions</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3164"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPassCollisions</CODE
->(integer pass);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If <CODE
-CLASS="parameter"
->pass</CODE
-> is <A
-HREF="#AEN5295"
->TRUE</A
->, land and object collisions
-    are passed from children on to parents.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3173"
->A.179. llPassTouches</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3175"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPassTouches</CODE
->(integer pass);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If <CODE
-CLASS="parameter"
->pass</CODE
-> is <A
-HREF="#AEN5295"
->TRUE</A
->, touches are passed from
-    children on to parents.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3184"
->A.180. llPlaySound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3186"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPlaySound</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Plays a sound once. The sound will be attached to an object
-    and follow object movement. Only one sound may be attached to an
-    object at a time, and attaching a new sound or calling <A
-HREF="#AEN4620"
->llStopSound</A
-> will stop the
-    previously attached sound. A second call to llPlaySound with the
-    same <CODE
-CLASS="parameter"
->sound</CODE
-> will not restart the sound, but
-    the new volume will be used, which allows control over the volume
-    of already playing sounds. To restart the sound from the
-    beginning, call <A
-HREF="#AEN4620"
->llStopSound</A
->
-    before calling llPlaySound again.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3198"
->A.181. llPlaySoundSlave</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3200"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPlaySoundSlave</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Behaviour is identical to llPlaySound, unless there is a
-    "Sync Master" present. If a Sync Master is already
-    playing the Slave sound will not be played until the Master hits
-    its loop point and returns to the beginning. llPlaySoundSlave will
-    play the sound exactly once; if it is desired to have the sound
-    play every time the Master loops, either use <A
-HREF="#AEN2802"
->llLoopSoundSlave</A
-> with extra
-    silence padded on the end of the sound or ensure that
-    llPlaySoundSlave is called at least once per loop of the
-    Master.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3210"
->A.182. llPointAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3212"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPointAt</CODE
->(vector pos);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Make avatar that owns object point at
-    <CODE
-CLASS="parameter"
->pos</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3220"
->A.183. llPow</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3222"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPow</CODE
->(float base, float exp);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <CODE
-CLASS="parameter"
->base</CODE
-> raised to the
-    <CODE
-CLASS="parameter"
->exp</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3233"
->A.184. llPreloadSound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3235"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPreloadSound</CODE
->(string sound);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Preloads <CODE
-CLASS="parameter"
->sound</CODE
-> from object inventory
-    on nearby viewers.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3243"
->A.185. llPushObject</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3245"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llPushObject</CODE
->(key id, vector impulse, vector angular_impulse, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Applies <CODE
-CLASS="parameter"
->impulse</CODE
-> and
-    <CODE
-CLASS="parameter"
->angular_impulse</CODE
-> to object
-    <CODE
-CLASS="parameter"
->id</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3261"
->A.186. llReleaseControls</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3263"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llReleaseControls</CODE
->(key avatar);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stop taking inputs from <CODE
-CLASS="parameter"
->avatar</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3271"
->A.187. llRemoteDataReply</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3273"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoteDataReply</CODE
->(key channel, key message_id, string sdata);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Send an XML-RPC reply to message_id on channel with payload of string sdata.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3284"
->A.188. llRemoteDataSetRegion</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3286"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoteDataSetRegion</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If an object using remote data channels changes regions, you
-    must call this function to reregister the remote data
-    channels. You do not need to make this call if your object does
-    not change regions or use remote data channels.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3292"
->A.189. llRemoteLoadScript</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3294"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoteLoadScript</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Deprecated. Please use llRemoteLoadScriptPin instead.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3300"
->A.190. llRemoteLoadScriptPin</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3302"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoteLoadScriptPin</CODE
->(key target, string name, integer pin, integer running, integer param);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the owner of the object this script is attached can modify <CODE
-CLASS="parameter"
->target</CODE
->, it has the correct <CODE
-CLASS="parameter"
->pin</CODE
-> and the objects are in the same region, copy script <CODE
-CLASS="parameter"
->name</CODE
-> onto <CODE
-CLASS="parameter"
->target</CODE
->, if <CODE
-CLASS="parameter"
->running</CODE
-> == TRUE, start the script with <CODE
-CLASS="parameter"
->param</CODE
->. If <CODE
-CLASS="parameter"
->name</CODE
-> already exists on <CODE
-CLASS="parameter"
->target</CODE
->, it is replaced.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3325"
->A.191. llRemoveInventory</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3327"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoveInventory</CODE
->(string inventory);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Remove the name <CODE
-CLASS="parameter"
->inventory</CODE
-> item from
-    the object inventory.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3335"
->A.192. llRemoveVehicleFlags</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3337"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRemoveVehicleFlags</CODE
->(integer flags);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the vehicle <CODE
-CLASS="parameter"
->flags</CODE
-> to
-    FALSE. Valid parameters can be found in the <A
-HREF="#AEN6231"
->vehicle flags constants</A
->
-    section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3346"
->A.193. llRequestAgentData</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3348"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llRequestAgentData</CODE
->(key id, integer data);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This function requests data about agent
-    <CODE
-CLASS="parameter"
->id</CODE
->. If and when the information is
-    collected, the <A
-HREF="#AEN4997"
->dataserver</A
->
-    event is called with the returned key returned from this function
-    passed in the <CODE
-CLASS="parameter"
->requested</CODE
-> parameter. See the
-    <A
-HREF="#AEN6005"
->agent data constants</A
-> for
-    details about valid values of <CODE
-CLASS="parameter"
->data</CODE
-> and what
-    each will return in the <A
-HREF="#AEN4997"
->dataserver</A
-> event.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3363"
->A.194. llRequestInventoryData</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3365"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llRequestInventoryData</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Requests data from object inventory item
-    <CODE
-CLASS="parameter"
->name</CODE
->. When data is available the <A
-HREF="#AEN4997"
->dataserver</A
-> event will be raised
-    with the key returned from this function in the
-    <CODE
-CLASS="parameter"
->requested</CODE
-> parameter. The only request
-    currently implemented is to request data from landmarks, where the
-    data returned is in the form "&#60;float, float,
-    float&#62;" which can be cast to a vector. This position is in
-    region local coordinates of the region the script call is made 
-        (possible even resulting in negative values).  So, to
-        convert this value into a global position, just add the result of
-        llGetRegionCorner.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3375"
->A.195. llRequestPermissions</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3377"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llRequestPermissions</CODE
->(key avatar, integer perm);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Ask <CODE
-CLASS="parameter"
->avatar</CODE
-> to allow the script to do
-    <CODE
-CLASS="parameter"
->perm</CODE
->. The <CODE
-CLASS="parameter"
->perm</CODE
->
-    parameter should be a <A
-HREF="#AEN5360"
->permission
-    constant</A
->. Multiple permissions can be requested
-    simultaneously by or'ing the constants together. Many of the
-    permissions requests can only go to object owner. This call will
-    not stop script execution - if the specified avatar grants the
-    requested permissions, the <A
-HREF="#AEN5171"
->run_time_permissions</A
->
-    event will be called.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3391"
->A.196. llRequestSimulatorData</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3393"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llRequestSimulatorData</CODE
->(string sim_name, integer data);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This function requests data about simulator
-    <CODE
-CLASS="parameter"
->sim_name</CODE
->. When the information is
-    collected, the <A
-HREF="#AEN4997"
->dataserver</A
->
-    event is called with the returned key returned from this function
-    passed in the <CODE
-CLASS="parameter"
->requested</CODE
-> parameter. See the
-    <A
-HREF="#AEN6086"
->simulator data constants</A
-> for
-    details about valid values of <CODE
-CLASS="parameter"
->data</CODE
-> and what
-    each will return in the <A
-HREF="#AEN4997"
->dataserver</A
-> event.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3408"
->A.197. llResetScript</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3410"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llResetScript</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Resets this script.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3416"
->A.198. llResetOtherScript</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3418"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llResetOtherScript</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Resets the script <CODE
-CLASS="parameter"
->name</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3426"
->A.199. llResetTime</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3428"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llResetTime</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the internal script timer to zero.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3434"
->A.200. llRezAtRoot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3436"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRezAtRoot</CODE
->(string inventory, vector pos, vector vel, rotation rot, integer param);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Creates object's <CODE
-CLASS="parameter"
->inventory</CODE
-> object at
-    position <CODE
-CLASS="parameter"
->pos</CODE
-> with velocity
-    <CODE
-CLASS="parameter"
->vel</CODE
-> and rotation
-    <CODE
-CLASS="parameter"
->rot</CODE
->. The last selected root object's location
-        in a multi-object selection will be placed at <CODE
-CLASS="parameter"
->pos</CODE
->.
-        All other objects in a selection will be created relative to the last
-        selected root's position, taking <CODE
-CLASS="parameter"
->rot</CODE
-> into account.
-        The <CODE
-CLASS="parameter"
->param</CODE
-> value
-    will be available to the newly created object in the <A
-HREF="#AEN5159"
->on_rez</A
-> event or through the <A
-HREF="#AEN2164"
->llGetStartParameter</A
->
-    library function. The <CODE
-CLASS="parameter"
->vel</CODE
-> parameter is
-    ignored if the rezzed object is not physical.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3461"
->A.201. llRezObject</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3463"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRezObject</CODE
->(string inventory, vector pos, vector vel, rotation rot, integer param);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Creates object's <CODE
-CLASS="parameter"
->inventory</CODE
-> object at
-    position <CODE
-CLASS="parameter"
->pos</CODE
-> with velocity
-    <CODE
-CLASS="parameter"
->vel</CODE
-> and rotation
-    <CODE
-CLASS="parameter"
->rot</CODE
->. The <CODE
-CLASS="parameter"
->param</CODE
-> value
-    will be available to the newly created object in the <A
-HREF="#AEN5159"
->on_rez</A
-> event or through the <A
-HREF="#AEN2164"
->llGetStartParameter</A
->
-    library function. The <CODE
-CLASS="parameter"
->vel</CODE
-> parameter is
-    ignored if the rezzed object is not physical.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3486"
->A.202. llRot2Angle</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3488"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llRot2Angle</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation angle represented by
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3496"
->A.203. llRot2Axis</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3498"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llRot2Axis</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation axis represented by
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3506"
->A.204. llRot2Euler</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3508"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llRot2Euler</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the Euler Angle representation of
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3516"
->A.205. llRot2Fwd</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3518"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llRot2Fwd</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the forward axis represented by
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3526"
->A.206. llRot2Left</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3528"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRot2Left</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the left axis represented by
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3536"
->A.207. llRot2Up</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3538"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRot2Up</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the up axis represented by
-    <CODE
-CLASS="parameter"
->rot</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3546"
->A.208. llRotBetween</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3548"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->rotation llRotBetween</CODE
->(vector a, vector b);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the rotation needed to rotate
-    <CODE
-CLASS="parameter"
->a</CODE
-> to <CODE
-CLASS="parameter"
->b</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3559"
->A.209. llRotLookAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3561"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRotLookAt</CODE
->(rotation rot, float strength, float damping);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Cause object to rotate to <CODE
-CLASS="parameter"
->rot</CODE
->. Good
-    <CODE
-CLASS="parameter"
->strength</CODE
-> values are around half the mass of
-    the object and good <CODE
-CLASS="parameter"
->damping</CODE
-> values are less
-    than 1/10<SUP
->th</SUP
-> of the
-    <CODE
-CLASS="parameter"
->strength</CODE
->. Asymmetrical shapes require
-    smaller <CODE
-CLASS="parameter"
->damping</CODE
->. A
-    <CODE
-CLASS="parameter"
->strength</CODE
-> of 0.0 cancels the look at.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3579"
->A.210. llRotTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3581"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llRotTarget</CODE
->(rotation rot, float error);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set object rotation within <CODE
-CLASS="parameter"
->error</CODE
-> of
-    <CODE
-CLASS="parameter"
->rotation</CODE
-> as a rotational target and return
-    an integer number for the target. The number can be used in <A
-HREF="#AEN3593"
->llRotTargetRemove</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3593"
->A.211. llRotTargetRemove</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3595"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRotTargetRemove</CODE
->(integer number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Remove rotational target
-    <CODE
-CLASS="parameter"
->number</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3603"
->A.212. llRotateTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3605"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llRotateTexture</CODE
->(float radians, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the texture rotation of <CODE
-CLASS="parameter"
->face</CODE
-> to
-    <CODE
-CLASS="parameter"
->radians</CODE
->. If <CODE
-CLASS="parameter"
->face</CODE
->
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, rotate the
-    texture of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3618"
->A.213. llRound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3620"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llRound</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->returns <CODE
-CLASS="parameter"
->val</CODE
-> rounded to the nearest
-    integer.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3628"
->A.214. llSameGroup</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3630"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llSameGroup</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <A
-HREF="#AEN5295"
->TRUE</A
-> if the
-    object or agent <CODE
-CLASS="parameter"
->id</CODE
-> is in the same simulator
-    and has the same active group as this object. Otherwise, returns
-    <A
-HREF="#AEN5295"
->FALSE</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3640"
->A.215. llSay</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3642"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSay</CODE
->(integer channel, string text);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Say <CODE
-CLASS="parameter"
->text</CODE
-> on
-    <CODE
-CLASS="parameter"
->channel</CODE
->. Channel 0 is the public chat
-    channel that all avatars see as chat text. Channels 1 to
-    2,147,483,648 are private channels that are not sent to avatars
-    but other scripts can listen for through the <A
-HREF="#AEN2665"
->llListen</A
-> api.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3654"
->A.216. llScaleTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3656"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llScaleTexture</CODE
->(integer scale_s, integer scale_t, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the texture s and t scales of
-    <CODE
-CLASS="parameter"
->face</CODE
-> to <CODE
-CLASS="parameter"
->scale_s</CODE
-> and
-    <CODE
-CLASS="parameter"
->scale_t</CODE
-> respectively. If face is <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, scale the texture
-    to all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3671"
->A.217. llScriptDanger</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3673"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llScriptDanger</CODE
->(vector pos);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns true if pos is over public land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3680"
->A.218. llSendRemoteData</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3682"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->key llSendRemoteData</CODE
->(string dest, integer idata, string sdata);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Send an XML-RPC request to dest through channel with payload
-    of channel (in a string), integer idata and string sdata. An
-    XML-RPC reply will trigger a remote_data event with type =
-    REMOTE_DATA_REPLY. The call returns a message_id that can be used
-    to identify XML-RPC replies.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3693"
->A.219. llSensor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3695"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSensor</CODE
->(string name, key id, integer type, float range, float arc);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Performs a single scan for <CODE
-CLASS="parameter"
->name</CODE
-> and
-    <CODE
-CLASS="parameter"
->id</CODE
-> with <CODE
-CLASS="parameter"
->type</CODE
-> within
-    <CODE
-CLASS="parameter"
->range</CODE
-> meters and <CODE
-CLASS="parameter"
->arc</CODE
->
-    radians of forward vector. Specifying a blank name or <A
-HREF="#AEN6070"
->NULL_KEY</A
-> id will not filter results for
-    any particular name or id.  A range of 0.0 does not perform a
-    scan. Range is limited to 96.0.  The <CODE
-CLASS="parameter"
->type</CODE
-> parameter should be an <A
-HREF="#AEN5338"
->object type constant</A
-> value.  If anything is found
-        during the scan, a <A
-HREF="#AEN5183"
->sensor</A
-> event is triggered.  A maximum
-        of 16 items are passed to this event.  If nothing is found during the scan, a 
-        <A
-HREF="#AEN5121"
->no sensor</A
-> event is triggered instead.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3720"
->A.220. llSensorRemove</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3722"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSensorRemove</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Removes the sensor.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3728"
->A.221. llSensorRepeat</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3730"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSensorRepeat</CODE
->(string name, key id, integer type, float range, float arc, float rate);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Performs a single scan for <CODE
-CLASS="parameter"
->name</CODE
-> and
-    <CODE
-CLASS="parameter"
->id</CODE
-> with <CODE
-CLASS="parameter"
->type</CODE
-> within
-    <CODE
-CLASS="parameter"
->range</CODE
-> meters and <CODE
-CLASS="parameter"
->arc</CODE
->
-    radians of forward vector and repeats every
-    <CODE
-CLASS="parameter"
->rate</CODE
-> seconds. Specifying a blank name or
-    <A
-HREF="#AEN6070"
->NULL_KEY</A
-> id will not filter
-    results for any particular name or id.  A range of 0.0 cancels the
-    scan.  Range is limited to 96.0.  The <CODE
-CLASS="parameter"
->type</CODE
-> parameter should be an <A
-HREF="#AEN5338"
->object type constant</A
->
-    value. If anything is found during the scan, a <A
-HREF="#AEN5183"
->sensor</A
-> 
-        event is triggered.  A maximum of 16 items are passed to this event.  If nothing is found 
-        during the scan, a <A
-HREF="#AEN5121"
->no sensor</A
-> event is triggered instead.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3758"
->A.222. llSetAlpha</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3760"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetAlpha</CODE
->(float alpha, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the alpha value for <CODE
-CLASS="parameter"
->face</CODE
->. If
-    face is <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set
-    the alpha to all faces. The <CODE
-CLASS="parameter"
->alpha</CODE
-> value is
-    interpreted as an opacity percentage - 1.0 is fully opaque, and
-    0.2 is mostly transparent. This api will clamp
-    <CODE
-CLASS="parameter"
->alpha</CODE
-> values less 0.1 to .1 and greater
-    than 1.0 to 1.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3773"
->A.223. llSetBuoyancy</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3775"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetBuoyancy</CODE
->(float buoyancy);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set the object buoyancy. A value of 0 is none, less than 1.0 sinks,
-    1.0 floats, and greater than 1.0 rises.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3782"
->A.224. llSetCameraAtOffset</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3784"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetCameraAtOffset</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the camera at offset used in this object if an avatar
-    sits on it.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3791"
->A.225. llSetClickAction</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3793"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetClickAction</CODE
->(integer action);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets which action is invoked when a resident clicks a prim.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3800"
->A.226. llForceMouselook</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3802"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llForceMouselook</CODE
->(integer mouselook);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Puts the camera into mouselook mode if an avatar
-    sits on this object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3809"
->A.227. llSetCameraEyeOffset</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3811"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetCameraEyeOffset</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the camera eye offset used in this object if an avatar
-    sits on it.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3818"
->A.228. llSetColor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3820"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetColor</CODE
->(vector color, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->color</CODE
-> of
-    <CODE
-CLASS="parameter"
->face</CODE
->. If face is <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set the alpha to
-    all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3832"
->A.229. llSetDamage</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3834"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetDamage</CODE
->(float damage);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the amount of damage that will be done to an object
-    that this object hits. This object will be destroyed on damaging
-    another object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3841"
->A.230. llSetForce</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3843"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetForce</CODE
->(vector force, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is physical, this function sets the
-    <CODE
-CLASS="parameter"
->force</CODE
->. The vector is in local coordinates if
-    local is <A
-HREF="#AEN5295"
->TRUE</A
->, global if
-    <A
-HREF="#AEN5295"
->FALSE</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3855"
->A.231. llSetForceAndTorque</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3857"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetForceAndTorque</CODE
->(vector force, vector torque, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is physical, this function sets the
-    <CODE
-CLASS="parameter"
->force</CODE
-> and
-    <CODE
-CLASS="parameter"
->torque</CODE
->. The vectors are in local coordinates
-    if local is <A
-HREF="#AEN5295"
->TRUE</A
->, global if
-    <A
-HREF="#AEN5295"
->FALSE</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3872"
->A.232. llSetHoverHeight</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3874"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetHoverHeight</CODE
->(float height, float water, float tau);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Critically damps to a height. The height is above ground and
-    water if <CODE
-CLASS="parameter"
->water</CODE
-> is <A
-HREF="#AEN5295"
->TRUE</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3887"
->A.233. llSetLinkAlpha</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3889"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLinkAlpha</CODE
->(integer linknumber, float alpha, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->alpha</CODE
-> of a prim in the link set.
-    The <CODE
-CLASS="parameter"
->linknum</CODE
->
-    parameter is either the linked number available through <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-> or a <A
-HREF="#AEN5616"
->link constant</A
->.
-    If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set the alpha 
-    of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3906"
->A.234. llSetLinkColor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3908"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLinkColor</CODE
->(integer linknumber, vector color, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->color</CODE
-> of a prim in the link set.
-    The <CODE
-CLASS="parameter"
->linknum</CODE
->
-    parameter is either the linked number available through <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-> or a <A
-HREF="#AEN5616"
->link constant</A
->.
-    If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set the color
-    of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3925"
->A.235. llSetLinkPrimitiveParams</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3927"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLinkPrimitiveParams</CODE
->(integer linknumber, list rules);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the primitive parameters of a prim in the link set.
-    The <CODE
-CLASS="parameter"
->linknum</CODE
->
-    parameter is either the linked number available through <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-> or a <A
-HREF="#AEN5616"
->link constant</A
->.
-    The <CODE
-CLASS="parameter"
->rules</CODE
->
-        list is identical to that of 
-        <A
-HREF="#AEN4020"
->llSetPrimitiveParams</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3941"
->A.236. llSetLinkTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3943"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLinkTexture</CODE
->(integer linknumber, string texture, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->texture</CODE
-> of a prim in the link set.
-    The <CODE
-CLASS="parameter"
->linknum</CODE
->
-    parameter is either the linked number available through <A
-HREF="#AEN1867"
->llGetLinkNumber</A
-> or a <A
-HREF="#AEN5616"
->link constant</A
->.
-    If <CODE
-CLASS="parameter"
->face</CODE
-> is
-    <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set the texture
-    of all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3960"
->A.237. llSetLocalRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3962"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetLocalRot</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is not physical, this function sets the
-    rotation of a child prim relative to the root prim, and the
-    linked set is adjusted.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3969"
->A.238. llSetObjectDesc</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3971"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetObjectDesc</CODE
->(string description);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the object description to <CODE
-CLASS="parameter"
->description</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3979"
->A.239. llSetObjectName</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3981"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetObjectName</CODE
->(string name);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the object name to <CODE
-CLASS="parameter"
->name</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3989"
->A.240. llSetParcelMusicURL</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN3991"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetParcelMusicURL</CODE
->(string url);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the streaming audio URL for the parcel where the object
-    is currently located. The <CODE
-CLASS="parameter"
->url</CODE
-> must be an
-    http streaming source of mp3 or ogg data.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN3999"
->A.241. llSetPayPrice</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4001"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetPayPrice</CODE
->(integer default_price, list quick_pay_buttons);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the default pay price and optionally the quick pay buttons
-    for the 'Pay' window when someone pays this object.  
-    See also <A
-HREF="#AEN5434"
->Pay Button Constants</A
->. </P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4011"
->A.242. llSetPos</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4013"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetPos</CODE
->(vector pos);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is not physical, this function sets the
-    position in region coordinates. If the object is a child, the
-    position is treated as root relative and the linked set is
-    adjusted.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4020"
->A.243. llSetPrimitiveParams</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4022"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetPrimitiveParams</CODE
->(list rules);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set primitive parameters based on <CODE
-CLASS="parameter"
->rules</CODE
->. The
-    <CODE
-CLASS="parameter"
->rules</CODE
-> are specified as an ordered list
-    of parameter and value(s). Valid parameters and their expected values
-    can be found in the <A
-HREF="#AEN6323"
->Primitive Constants</A
->. 
-    Here is a simple example:
-<DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN4032"
-></A
-><PRE
-CLASS="programlisting"
->&#13;llSetPrimitiveParams([PRIM_TYPE, PRIM_TYPE_BOX, PRIM_HOLE_DEFAULT, &#60;0,1,0&#62;,
-                  0.5, &#60;-0.2, 0.2, 0&#62;, &#60;0.5,0.5,0&#62;,&#60;-0.5,0.5,0&#62;]);
-</PRE
-><P
-></P
-></DIV
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4034"
->A.244. llSetRemoteScriptAccessPin</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4036"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetRemoteScriptAccessPin</CODE
->(integer pin);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If pin is set to a non-zero number, the task will accept remote script
-    loads via llRemoteLoadScriptPin if it passes in the correct pin.
-    Otherwise, llRemoteLoadScriptPin is ignored.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4043"
->A.245. llSetRot</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4045"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetRot</CODE
->(rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is not physical, this function sets the
-    rotation. If the object is a child, the position is treated as
-    root relative and the linked set is adjusted.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4052"
->A.246. llSetScale</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4054"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetScale</CODE
->(vector scale);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the object scale.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4061"
->A.247. llSetScriptState</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4063"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetScriptState</CODE
->(string name, integer run);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Control the state of a script on the object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4072"
->A.248. llSetSitText</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4074"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetSitText</CODE
->(string text);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Displays <CODE
-CLASS="parameter"
->text</CODE
-> rather than 'sit' in
-    viewer pie menu.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4082"
->A.249. llSetSoundQueueing</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4084"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetSoundQueueing</CODE
->(integer queue);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets whether successive calls to <A
-HREF="#AEN3184"
->llPlaySound</A
->, <A
-HREF="#AEN2773"
->llLoopSound</A
->, etc., (attached
-    sounds) interrupt the playing sound. The default for objects is
-    <A
-HREF="#AEN5295"
->FALSE</A
->. Setting this value to
-    <A
-HREF="#AEN5295"
->TRUE</A
-> will make the sound wait
-    until the current playing sound reaches its end. The queue is one
-    level deep.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4095"
->A.250. llSetStatus</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4097"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetStatus</CODE
->(integer status, integer value);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->status</CODE
-> to
-    <CODE
-CLASS="parameter"
->value</CODE
->. Use <A
-HREF="#AEN5304"
->status constants</A
-> for the values of
-    <CODE
-CLASS="parameter"
->status</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4110"
->A.251. llSetText</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4112"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetText</CODE
->(string text, vector color, float alpha);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets text that floats above object to
-    <CODE
-CLASS="parameter"
->text</CODE
->, using the specified
-    <CODE
-CLASS="parameter"
->color</CODE
-> and
-    <CODE
-CLASS="parameter"
->alpha</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4126"
->A.252. llSetTexture</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4128"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetTexture</CODE
->(string texture, integer face);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <CODE
-CLASS="parameter"
->texture</CODE
-> from object
-    inventory of <CODE
-CLASS="parameter"
->face</CODE
->. If face is <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, set the texture to
-    all faces.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4140"
->A.253. llSetTextureAnim</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4142"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetTextureAnim</CODE
->(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Animates a texture by setting the texture scale and
-    offset. The mode is a mask of <A
-HREF="#AEN5817"
->texture animation
-    constants</A
->. You can only have one texture animation on an
-    object, calling llSetTextureAnim more than once on an object will
-    reset it.</P
-><P
->You can only do one traditional animation, <A
-HREF="#AEN5817"
->ROTATE</A
-> or <A
-HREF="#AEN5817"
->SCALE</A
-> at a time, you
-    cannot combine masks. In the case of <A
-HREF="#AEN5817"
->ROTATE</A
-> or <A
-HREF="#AEN5817"
->SCALE</A
->,
-    <CODE
-CLASS="parameter"
->sizex</CODE
-> and <CODE
-CLASS="parameter"
->sizey</CODE
-> are
-    ignored, and <CODE
-CLASS="parameter"
->start</CODE
-> and
-    <CODE
-CLASS="parameter"
->length</CODE
-> are used as the start and length
-    values of the animation. For rotation,
-    <CODE
-CLASS="parameter"
->start</CODE
-> and <CODE
-CLASS="parameter"
->length</CODE
-> are
-    in radians.</P
-><P
->The <CODE
-CLASS="parameter"
->face</CODE
-> specified which face to
-    animate. If <CODE
-CLASS="parameter"
->face</CODE
-> is <A
-HREF="#AEN6073"
->ALL_SIDES</A
->, all textures on the
-    object are animated. </P
-><P
->The <CODE
-CLASS="parameter"
->sizex</CODE
-> and
-    <CODE
-CLASS="parameter"
->sizey</CODE
-> describe the layout of the frames
-    within the texture. <CODE
-CLASS="parameter"
->sizex</CODE
-> specifies how
-    many horizontal frames and <CODE
-CLASS="parameter"
->sizey</CODE
-> is how
-    many vertical frames.</P
-><P
-><CODE
-CLASS="parameter"
->start</CODE
-> is the frame number to begin
-    the animation on. Frames are numbered from left to right, top to
-    bottom, starting at 0.</P
-><P
-><CODE
-CLASS="parameter"
->length</CODE
-> is the number of frames to
-    animate. 0 means to animate all frames after the start
-    frame.</P
-><P
-><CODE
-CLASS="parameter"
->rate</CODE
-> is the frame rate to animate
-    at. 1.0 means 1 frame per second, 10.0 means 10
-    frames per second, etc.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4188"
->A.254. llSetTimerEvent</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4190"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetTimerEvent</CODE
->(float sec);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the <A
-HREF="#AEN5211"
->timer</A
-> event to
-    be triggered every <CODE
-CLASS="parameter"
->sec</CODE
-> seconds. Passing in
-    0.0 stops further <A
-HREF="#AEN5211"
->timer</A
->
-    events.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4200"
->A.255. llSetTorque</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4202"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetTorque</CODE
->(vector torque, integer local);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If the object is physical, this function sets the
-    <CODE
-CLASS="parameter"
->torque</CODE
->. The vector is in local coordinates
-    if local is <A
-HREF="#AEN5295"
->TRUE</A
->, global if
-    <A
-HREF="#AEN5295"
->FALSE</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4214"
->A.256. llSetTouchText</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4216"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetTouchText</CODE
->(string text);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Displays <CODE
-CLASS="parameter"
->text</CODE
-> in viewer pie menu that
-    acts as a touch.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4224"
->A.257. llSetVehicleFlags</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4226"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetVehicleFlags</CODE
->(integer flags);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the vehicle <CODE
-CLASS="parameter"
->flags</CODE
-> to TRUE. Valid
-    parameters can be found in the <A
-HREF="#AEN6231"
->vehicle flags constants</A
->
-    section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4235"
->A.258. llSetVehicleFloatParam</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4237"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetVehicleFloatParam</CODE
->(integer param_name, float param_value);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the vehicle floating point parameter
-    <CODE
-CLASS="parameter"
->param_name</CODE
-> to
-    <CODE
-CLASS="parameter"
->param_value</CODE
->. Valid parameters and their
-    expected values can be found in the <A
-HREF="#AEN6112"
->vehicle parameter
-    constants</A
-> section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4249"
->A.259. llSetVehicleType</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4251"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetVehicleType</CODE
->(integer type);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Activates the vehicle action and choose vehicle
-    <CODE
-CLASS="parameter"
->type</CODE
->. Valid types and an explanation of
-    their characteristics can be found in the <A
-HREF="#AEN6288"
->vehicle type constants</A
->
-    section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4260"
->A.260. llSetVehicleRotationParam</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4262"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetVehicleRotationParam</CODE
->(integer param_name, rotation param_value);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the vehicle rotation parameter
-    <CODE
-CLASS="parameter"
->param_name</CODE
-> to
-    <CODE
-CLASS="parameter"
->param_value</CODE
->. Valid parameters can be found
-    in the <A
-HREF="#AEN6112"
->vehicle parameter
-    constants</A
-> section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4274"
->A.261. llSetVehicleVectorParam</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4276"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSetVehicleVectorParam</CODE
->(integer param_name, vector param_value);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Sets the vehicle vector parameter
-    <CODE
-CLASS="parameter"
->param_name</CODE
-> to
-    <CODE
-CLASS="parameter"
->param_value</CODE
->. Valid parameters can be found
-    in the <A
-HREF="#AEN6112"
->vehicle parameter
-    constants</A
-> section.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4288"
->A.262. llShout</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4290"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llShout</CODE
->(integer channel, string text);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Shout <CODE
-CLASS="parameter"
->text</CODE
-> on
-    <CODE
-CLASS="parameter"
->channel</CODE
->. Channel 0 is the public chat
-    channel that all avatars see as chat text. Channels 1 to
-    2,147,483,648 are private channels that are not sent to avatars
-    but other scripts can listen for through the <A
-HREF="#AEN2665"
->llListen</A
-> api.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4302"
->A.263. llSin</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4304"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llSin</CODE
->(float theta);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the sine of <CODE
-CLASS="parameter"
->theta</CODE
-> in
-    radians.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4312"
->A.264. llSitTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4314"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSitTarget</CODE
->(vector offset, rotation rot);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set the sit location for this object. If
-    <CODE
-CLASS="parameter"
->offset</CODE
-> == <A
-HREF="#AEN6080"
->ZERO_VECTOR</A
->
-    clear the sit target.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4325"
->A.265. llSleep</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4327"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llSleep</CODE
->(float sec);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Puts the script to sleep for <CODE
-CLASS="parameter"
->sec</CODE
->
-    seconds.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4335"
->A.266. llSqrt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4337"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llSqrt</CODE
->(float val);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the square root of <CODE
-CLASS="parameter"
->val</CODE
->. If
-    <CODE
-CLASS="parameter"
->val</CODE
-> is less than 0.0, this function returns
-    0.0 and raises a math runtime error.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4346"
->A.267. llStartAnimation</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4348"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStartAnimation</CODE
->(string anim);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This function starts animation <CODE
-CLASS="parameter"
->anim</CODE
->
-    for the avatar that owns the object.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Valid strings for <CODE
-CLASS="parameter"
->anim</CODE
-></B
-></P
-><DL
-><DT
->hold_R_bazooka, hold_R_handgun, hold_R_rifle</DT
-><DD
-><P
->Holds the appropriately shaped weapon in the
-        right hand. Automatically switches to the aims (below) when
-        user enters mouse look</P
-></DD
-><DT
->aim_R_bazooka, aim_R_handgun, aim_R_rifle</DT
-><DD
-><P
->Aims the appropriately shaped weapon along the
-        direction the avatar is looking.</P
-></DD
-><DT
->away</DT
-><DD
-><P
->Flops over in "away from keyboard"
-        state.</P
-></DD
-><DT
->backflip</DT
-><DD
-><P
->Performs a backflip.</P
-></DD
-><DT
->bow</DT
-><DD
-><P
->Bows at waist.</P
-></DD
-><DT
->brush</DT
-><DD
-><P
->Brushes dirt from shirt.</P
-></DD
-><DT
->clap</DT
-><DD
-><P
->Applauds.</P
-></DD
-><DT
->courtbow</DT
-><DD
-><P
->Bows with a courtly flourish.</P
-></DD
-><DT
->crouch</DT
-><DD
-><P
->Crouches in place.</P
-></DD
-><DT
->crouchwalk</DT
-><DD
-><P
->Walks in place while crouching.</P
-></DD
-><DT
->dance1, dance2, dance3, dance4, dance5, dance6, dance7, dance8</DT
-><DD
-><P
->Various dance maneuvers.</P
-></DD
-><DT
->falldown</DT
-><DD
-><P
->Freefall falling animation.</P
-></DD
-><DT
->female_walk</DT
-><DD
-><P
->Walks with hip sway.</P
-></DD
-><DT
->fly</DT
-><DD
-><P
->Flies forward.</P
-></DD
-><DT
->flyslow</DT
-><DD
-><P
->Flies forward at a less aggressive
-        angle.</P
-></DD
-><DT
->hello</DT
-><DD
-><P
->Waves.</P
-></DD
-><DT
->hold_throw_R</DT
-><DD
-><P
->Hold object in right hand, prepared to throw
-        it.</P
-></DD
-><DT
->hover</DT
-><DD
-><P
->Hovers in place.</P
-></DD
-><DT
->hover_down</DT
-><DD
-><P
->Pretends to hover straight
-        down.</P
-></DD
-><DT
->hover_up</DT
-><DD
-><P
->Pretends to hover straight
-        up.</P
-></DD
-><DT
->jump</DT
-><DD
-><P
->Midair jump position.</P
-></DD
-><DT
->kick_roundhouse_R</DT
-><DD
-><P
->Roundhouse kick with right
-        leg.</P
-></DD
-><DT
->land</DT
-><DD
-><P
->Lands after flying.</P
-></DD
-><DT
->prejump</DT
-><DD
-><P
->Prepares to jump.</P
-></DD
-><DT
->punch_L</DT
-><DD
-><P
->Punch with left hand.</P
-></DD
-><DT
->punch_R</DT
-><DD
-><P
->Punch with right hand.</P
-></DD
-><DT
->punch_onetwo</DT
-><DD
-><P
->Punch with one hand then the
-        other.</P
-></DD
-><DT
->run</DT
-><DD
-><P
->Runs in place.</P
-></DD
-><DT
->salute</DT
-><DD
-><P
->Salutes with right hand.</P
-></DD
-><DT
->sit</DT
-><DD
-><P
->Sits on object at knee
-        height.</P
-></DD
-><DT
->sit_ground</DT
-><DD
-><P
->Sits down on ground.</P
-></DD
-><DT
->slowwalk</DT
-><DD
-><P
->Walks in place slowly.</P
-></DD
-><DT
->smoke_idle</DT
-><DD
-><P
->Leans on imaginary prop while holding
-        cigarette.</P
-></DD
-><DT
->smoke_inhale</DT
-><DD
-><P
->Leans on imaginary prop and smokes a
-        cigarette.</P
-></DD
-><DT
->smoke_throw_down</DT
-><DD
-><P
->Leans on imaginary prop, throws down a
-        cigarette, and stamps it out.</P
-></DD
-><DT
->snapshot</DT
-><DD
-><P
->Pantomimes taking a picture.</P
-></DD
-><DT
->soft_land</DT
-><DD
-><P
->Stumbles a bit as if
-        landing.</P
-></DD
-><DT
->stand</DT
-><DD
-><P
->Stands in place.</P
-></DD
-><DT
->standup</DT
-><DD
-><P
->Falls on face and stands up.</P
-></DD
-><DT
->stride</DT
-><DD
-><P
->Legs extended as if stepping off of a
-        ledge.</P
-></DD
-><DT
->sword_strike_R</DT
-><DD
-><P
->Strike with sword in right
-        hand.</P
-></DD
-><DT
->talk</DT
-><DD
-><P
->Head moves as if talking.</P
-></DD
-><DT
->throw_R</DT
-><DD
-><P
->Throws object in right hand.</P
-></DD
-><DT
->tryon_shirt</DT
-><DD
-><P
->Turns around and models a new
-        shirt.</P
-></DD
-><DT
->turnleft</DT
-><DD
-><P
->Pretends to turn left.</P
-></DD
-><DT
->turnright</DT
-><DD
-><P
->Pretends to turn right.</P
-></DD
-><DT
->type</DT
-><DD
-><P
->Makes typing motion.</P
-></DD
-><DT
->uphillwalk</DT
-><DD
-><P
->Walks uphill in place.</P
-></DD
-><DT
->walk</DT
-><DD
-><P
->Walks in place.</P
-></DD
-><DT
->whisper</DT
-><DD
-><P
->Whispers behind hand.</P
-></DD
-><DT
->whistle</DT
-><DD
-><P
->Whistles with hands in
-        mouth.</P
-></DD
-><DT
->yell</DT
-><DD
-><P
->Shouts between cupped hands.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4578"
->A.268. llStopAnimation</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4580"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopAnimation</CODE
->(string anim);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stop animation <CODE
-CLASS="parameter"
->anim</CODE
-> for avatar that
-    owns object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4588"
->A.269. llStopHover</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4590"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopHover</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stop hover to a height.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4596"
->A.270. llStopLookAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4598"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopLookAt</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stop causing object to look at target.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4604"
->A.271. llStopMoveToTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4606"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopMoveToTarget</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stops critically damped motion.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4612"
->A.272. llStopPointAt</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4614"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopPointAt</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stop avatar that owns object pointing.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4620"
->A.273. llStopSound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4622"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llStopSound</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Stops a currently playing attached sound started with <A
-HREF="#AEN3184"
->llPlaySound</A
-> or <A
-HREF="#AEN2773"
->llLoopSound</A
->. Has no effect on
-    sounds started with <A
-HREF="#AEN4756"
->llTriggerSound</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4631"
->A.274. llStringLength</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4633"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llStringLength</CODE
->(string src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the number of characters in
-    <CODE
-CLASS="parameter"
->src</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4641"
->A.275. llSubStringIndex</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4643"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llSubStringIndex</CODE
->(string source, string pattern);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Finds index in source where pattern first appears. Returns
-    -1 if no match is found.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4652"
->A.276. llStringToBase64</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4654"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llStringToBase64</CODE
->(string str);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Converts a string to the Base 64 representation of the string.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4661"
->A.277. llTakeControls</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4663"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTakeControls</CODE
->(integer controls, integer accept, integer pass_on);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If (<CODE
-CLASS="parameter"
->accept</CODE
-> ==
-    (<CODE
-CLASS="parameter"
->controls</CODE
-> &#38; input)), send input to
-    object. If the boolean <CODE
-CLASS="parameter"
->pass_on</CODE
-> is <A
-HREF="#AEN5295"
->TRUE</A
->, also send input to
-    avatar.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4678"
->A.278. llTan</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4680"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llTan</CODE
->(float theta);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the tangent of <CODE
-CLASS="parameter"
->theta</CODE
->
-    radians.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4688"
->A.279. llTarget</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4690"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->integer llTarget</CODE
->(vector position, float range);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Set object position within <CODE
-CLASS="parameter"
->range</CODE
-> of
-    <CODE
-CLASS="parameter"
->position</CODE
-> as a target and returns an integer
-    ID for the target.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4701"
->A.280. llTargetOmega</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4703"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTargetOmega</CODE
->(vector axis, float spinrate, float gain);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Attempt to spin at <CODE
-CLASS="parameter"
->spinrate</CODE
-> with
-    strength <CODE
-CLASS="parameter"
->gain</CODE
-> on
-    <CODE
-CLASS="parameter"
->axis</CODE
->. A <CODE
-CLASS="parameter"
->spinrate</CODE
-> of
-    0.0 cancels the spin. This function works in object local
-    coordinates for child objects and works in world coordinates for
-    root objects.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4718"
->A.281. llTargetRemove</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4720"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTargetRemove</CODE
->(integer tnumber);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Remove target number <CODE
-CLASS="parameter"
->tnumber</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4728"
->A.282. llTeleportAgentHome</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4730"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTeleportAgentHome</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Teleport agent on the owner's land to agent's home
-    location.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4737"
->A.283. llToLower</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4739"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llToLower</CODE
->();</CODE
-></P
-><P
-></P
-></DIV
-><P
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4746"
->A.284. llToUpper</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4748"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llToUpper</CODE
->(string src);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns <CODE
-CLASS="parameter"
->src</CODE
-> in all lower case.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4756"
->A.285. llTriggerSound</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4758"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTriggerSound</CODE
->(string sound, float volume);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Plays a transient sound NOT attached to an object. The sound
-    plays from a stationary position located at the center of the
-    object at the time of the trigger. There is no limit to the number
-    of triggered sounds which can be generated by an object, and
-    calling <A
-HREF="#AEN4756"
->llTriggerSound</A
->
-    does not affect the attached sounds created by <A
-HREF="#AEN3184"
->llPlaySound</A
-> and <A
-HREF="#AEN2773"
->llLoopSound</A
->. This is very useful
-    for things like collision noises, explosions, etc. There is no
-    way to stop or alter the volume of a sound triggered by
-    this function.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4770"
->A.286. llTriggerSoundLimited</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4772"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llTriggerSoundLimited</CODE
->(string sound, float volume, vector tne, vector bsw);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Plays a transient sound NOT attached to an object with its
-    audible range limited by the axis aligned bounding box define by
-    <CODE
-CLASS="parameter"
->tne</CODE
-> (top-north-eash) and
-    <CODE
-CLASS="parameter"
->bsw</CODE
-> (bottom-south-west). The sound plays
-    from a stationary position located at the center of the object at
-    the time of the trigger. There is no limit to the number of
-    triggered sounds which can be generated by an object, and calling
-    <A
-HREF="#AEN4756"
->llTriggerSound</A
-> does not
-    affect the attached sounds created by <A
-HREF="#AEN3184"
->llPlaySound</A
-> and <A
-HREF="#AEN2773"
->llLoopSound</A
->. This is very useful
-    for things like collision noises, explosions, etc. There is no way
-    to stop or alter the volume of a sound triggered by this
-    function.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4790"
->A.287. llUnescapeURL</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4792"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llUnescapeURL</CODE
->(string url);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the string that is the URL unescaped version of <CODE
-CLASS="parameter"
->url</CODE
->,
-    replacing %20 with spaces etc.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4800"
->A.288. llUnSit</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4802"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llUnSit</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->If agent identified by <CODE
-CLASS="parameter"
->id</CODE
-> is sitting
-    on the object the script is attached to or is over land owned by
-    the objects owner, the agent is forced to stand up.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4810"
->A.289. llVecDist</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4812"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llVecDist</CODE
->(vector a, vector b);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the distance from <CODE
-CLASS="parameter"
->a</CODE
-> to
-    <CODE
-CLASS="parameter"
->b</CODE
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4823"
->A.290. llVecMag</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4825"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llVecMag</CODE
->(vector vec);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the magnitude of <CODE
-CLASS="parameter"
->vec</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4833"
->A.291. llVecNorm</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4835"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llVecNorm</CODE
->(vector vec);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns normalized <CODE
-CLASS="parameter"
->vec</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4843"
->A.292. llVolumeDetect</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4845"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llVolumeDetect</CODE
->(integer detect);</CODE
-></P
-><P
-></P
-></DIV
-><P
->When detect = TRUE, this makes the entire link set the script is attached to phantom but if another object interpenetrates it, it will get a collision_start event. When an object stops interpenetrating, a collision_end event is generated. While the other is interpenetrating, collision events are NOT generated. The script must be applied to the root object of the link set to get the collision events. Collision filters work normally.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4852"
->A.293. llWater</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4854"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->float llWater</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the water height at the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4862"
->A.294. llWhisper</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4864"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->llWhisper</CODE
->(integer channel, string text);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Whisper <CODE
-CLASS="parameter"
->text</CODE
-> on
-    <CODE
-CLASS="parameter"
->channel</CODE
->. Channel 0 is the public chat
-    channel that all avatars see as chat text. Channels 1 to
-    2,147,483,648 are private channels that are not sent to avatars
-    but other scripts can listen for through the <A
-HREF="#AEN2665"
->llListen</A
-> api.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4876"
->A.295. llWind</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4878"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->vector llWind</CODE
->(vector offset);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Returns the wind velocity below the object position +
-    <CODE
-CLASS="parameter"
->offset</CODE
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4886"
->A.296. llXorBase64Strings</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4888"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->string llXorBase64Strings</CODE
->(string s1, string s2);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Performs an exclusive or on two Base 64 strings and returns
-    a Base 64 string. The <CODE
-CLASS="parameter"
->s2</CODE
-> parameter repeats if
-    it is shorter than <CODE
-CLASS="parameter"
->s1</CODE
->.</P
-></DIV
-></DIV
-><DIV
-CLASS="appendix"
-><HR><H1
-><A
-NAME="AEN4899"
-></A
->Appendix B. Events</H1
-><P
->Every state must have at least one handler. You can choose to
-  handle an event by defining one of the reserved event
-  handlers named here.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4902"
->B.1. at_rot_target</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4904"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->at_rot_target</CODE
->(integer number, rotation target_rotation, rotation our_rotation);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered when a script comes within a defined
-    angle of a target rotation. The range is set by a call to <A
-HREF="#AEN3579"
->llRotTarget</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4916"
->B.2. at_target</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4918"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->not_at_target</CODE
->(integer number, vector target_position, vector our_position);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered when a script comes within a defined
-    range from a target position. The range and position are set by a
-    call to <A
-HREF="#AEN4688"
->llTarget</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4930"
->B.3. attach</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4932"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->attach</CODE
->(key attached);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered whenever a object with this script
-    is attached or detached from an avatar. If it is attached,
-    attached is the key of the avatar it is attached to, otherwise
-    attached is <A
-HREF="#AEN6070"
->NULL_KEY</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4940"
->B.4. changed</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4942"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->changed</CODE
->(integer changed);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered when various events change the object. The
-    <CODE
-CLASS="parameter"
->changed</CODE
-> will be a bitfield of <A
-HREF="#AEN5690"
->change constants</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4951"
->B.5. collision</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4953"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->collision</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised while another object is colliding with
-    the object the script is attached to. The number of detected
-    objects is passed to the script. Information on those objects may
-    be gathered via the <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions. (Collisions are also generated if a user walks into an
-    object.)</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4961"
->B.6. collision_end</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4963"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->collision_end</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when another object stops colliding
-    with the object the script is attached to. The number of detected
-    objects is passed to the script. Information on those objects may
-    be gathered via the <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions. (Collisions are also generated if a user walks into an
-    object.)</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4971"
->B.7. collision_start</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4973"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->collision_start</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when another object begins to collide
-    with the object the script is attached to. The number of detected
-    objects is passed to the script. Information on those objects may
-    be gathered via the <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions. (Collisions are also generated if a user walks into an
-    object.)</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4981"
->B.8. control</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4983"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->control</CODE
->(key name, integer levels, integer edges);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Once a script has the ability to grab control inputs from
-    the avatar, this event will be used to pass the commands into the
-    script. The <CODE
-CLASS="parameter"
->levels</CODE
-> and
-    <CODE
-CLASS="parameter"
->edges</CODE
-> are bitfields of <A
-HREF="#AEN5643"
->control constants</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN4997"
->B.9. dataserver</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN4999"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->dataserver</CODE
->(key requested, string data);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered when the requested data is returned
-    to the script. Data may be requested by the <A
-HREF="#AEN3346"
->llRequestAgentData</A
->, the <A
-HREF="#AEN3391"
->llRequestSimulatorData</A
->, the
-    <A
-HREF="#AEN3363"
->llRequestInventoryData</A
->,
-    and the <A
-HREF="#AEN1946"
->llGetNotecardLine</A
-> function
-    calls.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5012"
->B.10. email</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5014"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->email</CODE
->(string time, string address, string subject, string body, integer remaining);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered when an email sent to this script
-    arrives. The <CODE
-CLASS="parameter"
->remaining</CODE
-> tells how many more
-    emails are known as still pending.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5030"
->B.11. land_collision</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5032"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->land_collision</CODE
->(vector position);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when the object the script is attached
-    to is colliding with the ground.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5039"
->B.12. land_collision_end</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5041"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->land_collision_end</CODE
->(vector position);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when the object the script is attached
-    to stops colliding with the ground.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5048"
->B.13. land_collision_start</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5050"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->land_collision_start</CODE
->(vector position);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when the object the script is attached
-    to begins to collide with the ground.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5057"
->B.14. link_message</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5059"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->link_message</CODE
->(integer sender_number, integer number, string message, key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered when object receives a link message via <A
-HREF="#AEN2919"
->llMessageLinked</A
-> library
-    function call.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5073"
->B.15. listen</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5075"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->listen</CODE
->(integer channel, string name, key id, string message);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised whenever a chat message matching the
-    constraints passed in the <A
-HREF="#AEN2665"
->llListen</A
->
-    command is heard. The <CODE
-CLASS="parameter"
->name</CODE
-> and
-    <CODE
-CLASS="parameter"
->id</CODE
-> of the speaker as well as the
-    <CODE
-CLASS="parameter"
->message</CODE
-> are passed in as parameters.
-    Channel 0 is the public chat channel that all avatars see as chat
-    text. Channels 1 through 2,147,483,648 are private channels that
-    are not sent to avatars but other scripts can listen on those
-    channels.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5092"
->B.16. money</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5094"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->money</CODE
->(key giver, integer amount);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is triggered when user
-    <CODE
-CLASS="parameter"
->giver</CODE
-> has given an
-    <CODE
-CLASS="parameter"
->amount</CODE
-> of Linden dollars to the
-    object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5105"
->B.17. moving_end</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5107"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->moving_end</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered whenever a object with this script stops
-    moving.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5113"
->B.18. moving_start</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5115"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->moving_start</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered whenever a object with this script starts
-    moving.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5121"
->B.19. no_sensor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5123"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->no_sensor</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when sensors are active (via the <A
-HREF="#AEN3693"
->llSensor</A
-> library call) but are not
-    sensing anything.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5130"
->B.20. not_at_rot_target</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5132"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->not_at_rot_target</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->When a target is set via the <A
-HREF="#AEN3579"
->llRotTarget</A
-> library call, but the
-    script is outside the specified angle this event is raised.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5139"
->B.21. not_at_target</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5141"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->not_at_target</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->When a target is set via the <A
-HREF="#AEN4688"
->llTarget</A
-> library call, but the
-    script is outside the specified range this event is raised.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5148"
->B.22. object_rez</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5150"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->object_rez</CODE
->(key id);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered when object rezzes another object from its
-    inventory via the <A
-HREF="#AEN3461"
->llRezObject</A
-> api. The
-    <CODE
-CLASS="parameter"
->id</CODE
-> is the globally unique key for the
-    object.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5159"
->B.23. on_rez</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5161"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->on_rez</CODE
->(integer start_param);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Triggered whenever a object is rezzed from inventory or by
-    another object. The <CODE
-CLASS="parameter"
->start_param</CODE
-> is the
-    parameter passed in from the call to <A
-HREF="#AEN3461"
->llRezObject</A
-> or <A
-HREF="#AEN3434"
->llRezAtRoot</A
->.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5171"
->B.24. run_time_permissions</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5173"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->run_time_permissions</CODE
->(integer permissions);</CODE
-></P
-><P
-></P
-></DIV
-><P
->Scripts need permission from either the owner or the avatar
-    they wish to act on before they perform certain functions, such as
-    debiting money from their owner's account, triggering an animation
-    on an avatar, or capturing control inputs. The <A
-HREF="#AEN3375"
->llRequestPermissions</A
->
-    library function is used to request these permissions and the
-    various <A
-HREF="#AEN5360"
->permissions integer
-    constants</A
-> can be supplied. The integer returned to this
-    event handler contains the current set of permissions flags, so if
-    <CODE
-CLASS="parameter"
->permissions</CODE
-> equal 0 then no permissions are
-    set.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5183"
->B.25. sensor</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5185"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->sensor</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised whenever objects matching the
-    constraints of the <A
-HREF="#AEN3693"
->llSensor</A
->
-    command are detected. The number of detected objects is passed to
-    the script in the <CODE
-CLASS="parameter"
->total_number</CODE
->
-    parameter. A maximum of 16 objects are passed to this event.
-        Information on those objects may be gathered via the
-    <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5195"
->B.26. state_entry</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5197"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->state_entry</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->The state_entry event occurs whenever a new state is
-    entered, including program start, and is always the first event
-    handled.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5203"
->B.27. state_exit</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5205"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->state_exit</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->The state_exit event occurs whenever the state command is
-    used to transition to another state. It is handled before the new
-    state's state_entry event.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5211"
->B.28. timer</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5213"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->timer</CODE
->(void);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised at regular intervals set by the <A
-HREF="#AEN4188"
->llSetTimerEvent</A
-> library
-    function.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5220"
->B.29. touch</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5222"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->touch</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised while a user is touching the object the
-    script is attached to. The number of touching objects is passed to
-    the script in the <CODE
-CLASS="parameter"
->total_number</CODE
->
-    parameter. Information on those objects may be gathered via the
-    <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5231"
->B.30. touch_end</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5233"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->touch_end</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when a user stops touching the object
-    the script is attached to. The number of touching objects is
-    passed to the script in the <CODE
-CLASS="parameter"
->total_number</CODE
->
-    parameter. Information on those objects may be gathered via the
-    <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5242"
->B.31. touch_start</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5244"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->touch_start</CODE
->(integer total_number);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when a user first touches the object
-    the script is attached to. The number of touching objects is
-    passed to the script in the <CODE
-CLASS="parameter"
->total_number</CODE
->
-    parameter. Information on those objects may be gathered via the
-    <A
-HREF="#lib_lldetected"
->llDetected*</A
-> library
-    functions.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5253"
->B.32. remote_data</A
-></H2
-><DIV
-CLASS="funcsynopsis"
-><P
-></P
-><A
-NAME="AEN5255"
-></A
-><P
-><CODE
-><CODE
-CLASS="FUNCDEF"
->remote_data</CODE
->(integer type, key channel, key message_id, string sender, integer ival, string sval);</CODE
-></P
-><P
-></P
-></DIV
-><P
->This event is raised when a user creates an XML-RPC
-    channel via <A
-HREF="#AEN3011"
->llOpenRemoteDataChannel</A
->,
-    a remote XML-RPC server replies to a <A
-HREF="#AEN3680"
->llSendRemoteData</A
->,
-    or a remote XML-RPC client sends in an XML-RPC request.  In the open case,
-    <CODE
-CLASS="parameter"
->type</CODE
-> = REMOTE_DATA_CHANNEL, <CODE
-CLASS="parameter"
->channel</CODE
-> = NULL_KEY,
-    <CODE
-CLASS="parameter"
->message_id</CODE
-> = NULL_KEY, <CODE
-CLASS="parameter"
->sender</CODE
-> is an empty string,
-    <CODE
-CLASS="parameter"
->ival</CODE
-> = 0, and <CODE
-CLASS="parameter"
->sval</CODE
-> is an empty string.  In the reply case,
-    <CODE
-CLASS="parameter"
->type</CODE
-> = REMOTE_DATA_REPLY, <CODE
-CLASS="parameter"
->channel</CODE
-> is set to the channel that the request was sent on,
-    <CODE
-CLASS="parameter"
->message_id</CODE
-> is set to the id of the message, <CODE
-CLASS="parameter"
->sender</CODE
-> is an empty string,
-    <CODE
-CLASS="parameter"
->ival</CODE
-> = 0, and <CODE
-CLASS="parameter"
->sval</CODE
-> is a string.  In the remote request case,
-    <CODE
-CLASS="parameter"
->type</CODE
-> = REMOTE_DATA_REQUEST, <CODE
-CLASS="parameter"
->channel</CODE
-> is set to the channel that sent the message,
-    <CODE
-CLASS="parameter"
->message_id</CODE
-> is set to the id of the message, <CODE
-CLASS="parameter"
->sender</CODE
-> is set by the sender,
-    <CODE
-CLASS="parameter"
->ival</CODE
-> is an integer, and <CODE
-CLASS="parameter"
->sval</CODE
-> is a string.
-    parameter.</P
-></DIV
-></DIV
-><DIV
-CLASS="appendix"
-><HR><H1
-><A
-NAME="AEN5292"
-></A
->Appendix C. Constants</H1
-><P
->To ease scripting, many useful constants are defined by
-  LSL.</P
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5295"
->C.1. Boolean Constants</A
-></H2
-><P
->The boolean constants represent the values for TRUE and
-    FALSE. LSL represents booleans as integer values 1 and 0
-    respectively. Since there is no boolean type these constants act
-    as a scripting aid usually employed for testing variables which
-    conceptually represent boolean values.</P
-><P
-><P
-></P
-><UL
-><LI
-><P
->TRUE</P
-></LI
-><LI
-><P
->FALSE</P
-></LI
-></UL
-></P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5304"
->C.2. Status Constants</A
-></H2
-><P
->The status constants are used in the <A
-HREF="#AEN4095"
->llSetStatus</A
-> and <A
-HREF="#AEN2184"
->llGetStatus</A
-> library calls. These
-    constants can be bitwise or'ed together when calling the library
-    functions to set the same value to more than one status
-    flag</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Status Constants</B
-></P
-><DL
-><DT
->STATUS_PHYSICS</DT
-><DD
-><P
->Controls whether the object moves
-        physically. This controls the same flag that the ui checkbox
-        for 'Physical' controls. The default is FALSE.</P
-></DD
-><DT
->STATUS_PHANTOM</DT
-><DD
-><P
->Controls whether the object collides or
-        not. Setting the value to TRUE makes the object non-colliding
-        with all objects. It is a good idea to use this for most
-        objects that move or rotate, but are non-physical. It is also
-        useful for simulating volumetric lighting. The default is
-        FALSE.</P
-></DD
-><DT
->STATUS_ROTATE_X, STATUS_ROTATE_Y, STATUS_ROTATE_Z</DT
-><DD
-><P
->Controls whether the object can physically rotate
-          around the specific axis or not. This flag has no meaning
-          for non-physical objects. Set the value to FALSE 
-          to disable rotation around that axis. The default is TRUE
-          for a physical object.</P
-><P
->A useful example to think about when visualizing the
-          effect is a 'sit-and-spin' device. They spin around the Z
-          axis (up) but not around the X or Y axis.</P
-></DD
-><DT
->STATUS_BLOCK_GRAB</DT
-><DD
-><P
->Controls whether the object can be grabbed. A
-        grab is the default action when in third person, and is
-        available as the 'hand' tool in build mode. This is useful for
-        physical objects that you don't want other people to be able
-        to trivially disturb. The default if FALSE</P
-></DD
-><DT
->STATUS_SANDBOX</DT
-><DD
-><P
->Controls whether the object can cross region
-        boundaries and move more than 20 meters from its creation
-        point. The default if FALSE.</P
-></DD
-><DT
->STATUS_DIE_AT_EDGE</DT
-><DD
-><P
->Controls whether the object is returned to the
-        owner's inventory if it wanders off the edge of the world. It
-        is useful to set this status TRUE for things like bullets or
-        rockets. The default is TRUE</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5338"
->C.3. Object Type Constants</A
-></H2
-><P
->These constants can be combined using the binary '|'
-    operator and are used in the <A
-HREF="#AEN3693"
->llSensor</A
-> and related calls.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Object Type Constants</B
-></P
-><DL
-><DT
->AGENT</DT
-><DD
-><P
->Objects in world that are agents.</P
-></DD
-><DT
->ACTIVE</DT
-><DD
-><P
->Objects in world that are running a script or
-        currently physically moving.</P
-></DD
-><DT
->PASSIVE</DT
-><DD
-><P
->Static in-world objects.</P
-></DD
-><DT
->SCRIPTED</DT
-><DD
-><P
->Scripted in-world objects.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5360"
->C.4. Permission Constants</A
-></H2
-><P
->The permission constants are used for passing values to
-    <A
-HREF="#AEN3375"
->llRequestPermissions</A
->,
-    determining the value of <A
-HREF="#AEN2048"
->llGetPermissions</A
->, and
-    explicitly passed to the <A
-HREF="#AEN5171"
->run_time_permissions</A
->
-    event. For many of the basic library functions to work, a
-    specific permission must be enabled. The permission constants can
-    be or'ed together to be used in conjunction.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Permission Constants</B
-></P
-><DL
-><DT
->PERMISSION_DEBIT</DT
-><DD
-><P
->If this permission is enabled, the object can
-        successfully call <A
-HREF="#AEN2342"
->llGiveMoney</A
-> to debit the
-        owner's account.</P
-></DD
-><DT
->PERMISSION_TAKE_CONTROLS</DT
-><DD
-><P
->If this permission enabled, the object can
-        successfully call the <A
-HREF="#AEN4661"
->llTakeControls</A
-> library
-        call.</P
-></DD
-><DT
->PERMISSION_REMAP_CONTROLS</DT
-><DD
-><P
->(not yet implemented)</P
-></DD
-><DT
->PERMISSION_TRIGGER_ANIMATION</DT
-><DD
-><P
->If this permission is enabled, the object can
-        successfully call <A
-HREF="#AEN4346"
->llStartAnimation</A
-> for the
-        avatar that owns this object.</P
-></DD
-><DT
-><A
-NAME="const_permission_attach"
-></A
->PERMISSION_ATTACH</DT
-><DD
-><P
->If this permission is enabled, the object can
-        successfully call <A
-HREF="#AEN1119"
->llAttachToAvatar</A
-> to attach
-        to the given avatar.</P
-></DD
-><DT
->PERMISSION_RELEASE_OWNERSHIP</DT
-><DD
-><P
->(not yet implemented)</P
-></DD
-><DT
-><A
-NAME="const_permission_change_links"
-></A
->PERMISSION_CHANGE_LINKS</DT
-><DD
-><P
->If this permission is enabled, the object can
-        successfully call <A
-HREF="#AEN1292"
->llCreateLink</A
->, <A
-HREF="#AEN1191"
->llBreakLink</A
->, and <A
-HREF="#AEN1182"
->llBreakAllLinks</A
-> to change
-        links to other objects.</P
-></DD
-><DT
->PERMISSION_CHANGE_JOINTS</DT
-><DD
-><P
->(not yet implemented)</P
-></DD
-><DT
->PERMISSION_CHANGE_PERMISSIONS</DT
-><DD
-><P
->(not yet implemented)</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5411"
->C.5. Inventory Constants</A
-></H2
-><P
->These constants can be used to refer to a specific inventory
-    type in calls to <A
-HREF="#AEN1789"
->llGetInventoryNumber</A
-> and
-    <A
-HREF="#AEN1774"
->llGetInventoryName</A
->.  They
-        are also returned by <A
-HREF="#AEN1816"
->llGetInventoryType</A
->.
-        </P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Inventory Constants</B
-></P
-><DL
-><DT
->INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_LANDMARK, INVENTORY_CLOTHING, INVENTORY_NOTECARD, INVENTORY_BODYPART, INVENTORY_ANIMATION, INVENTORY_GESTURE, INVENTORY_ALL, INVENTORY_NONE</DT
-><DD
-><P
->Each constant refers to the named type of
-        inventory.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5434"
->C.6. Pay Price Constants</A
-></H2
-><P
->These constants can be used in <A
-HREF="#AEN1789"
->llSetPayPrice</A
-></P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Pay Price Constants</B
-></P
-><DL
-><DT
->PAY_HIDE</DT
-><DD
-><P
->Do not show this quick pay button.</P
-></DD
-><DT
->PAY_DEFAULT</DT
-><DD
-><P
->Use the default value for this quick pay button.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5448"
->C.7. Attachment Constants</A
-></H2
-><P
->These constants are used to refer to attachment points in
-    calls to <A
-HREF="#AEN1119"
->llAttachToAvatar</A
->.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Attachment Constants</B
-></P
-><DL
-><DT
->ATTACH_CHEST</DT
-><DD
-><P
->Attach to the avatar chest.</P
-></DD
-><DT
->ATTACH_HEAD</DT
-><DD
-><P
->Attach to the avatar head.</P
-></DD
-><DT
->ATTACH_LSHOULDER</DT
-><DD
-><P
->Attach to the avatar left shoulder.</P
-></DD
-><DT
->ATTACH_RSHOULDER</DT
-><DD
-><P
->Attach to the avatar right shoulder.</P
-></DD
-><DT
->ATTACH_LHAND</DT
-><DD
-><P
->Attach to the avatar left hand.</P
-></DD
-><DT
->ATTACH_RHAND</DT
-><DD
-><P
->Attach to the avatar right hand.</P
-></DD
-><DT
->ATTACH_LFOOT</DT
-><DD
-><P
->Attach to the avatar left foot.</P
-></DD
-><DT
->ATTACH_RFOOT</DT
-><DD
-><P
->Attach to the avatar right foot.</P
-></DD
-><DT
->ATTACH_BACK</DT
-><DD
-><P
->Attach to the avatar back.</P
-></DD
-><DT
->ATTACH_PELVIS</DT
-><DD
-><P
->Attach to the avatar pelvis.</P
-></DD
-><DT
->ATTACH_MOUTH</DT
-><DD
-><P
->Attach to the avatar mouth.</P
-></DD
-><DT
->ATTACH_CHIN</DT
-><DD
-><P
->Attach to the avatar chin.</P
-></DD
-><DT
->ATTACH_LEAR</DT
-><DD
-><P
->Attach to the avatar left ear.</P
-></DD
-><DT
->ATTACH_REAR</DT
-><DD
-><P
->Attach to the avatar right ear.</P
-></DD
-><DT
->ATTACH_LEYE</DT
-><DD
-><P
->Attach to the avatar left eye.</P
-></DD
-><DT
->ATTACH_REYE</DT
-><DD
-><P
->Attach to the avatar right eye.</P
-></DD
-><DT
->ATTACH_NOSE</DT
-><DD
-><P
->Attach to the avatar nose.</P
-></DD
-><DT
->ATTACH_RUARM</DT
-><DD
-><P
->Attach to the avatar right upper arm.</P
-></DD
-><DT
->ATTACH_RLARM</DT
-><DD
-><P
->Attach to the avatar right lower arm.</P
-></DD
-><DT
->ATTACH_LUARM</DT
-><DD
-><P
->Attach to the avatar left upper arm.</P
-></DD
-><DT
->ATTACH_LLARM</DT
-><DD
-><P
->Attach to the avatar left lower arm.</P
-></DD
-><DT
->ATTACH_RHIP</DT
-><DD
-><P
->Attach to the avatar right hip.</P
-></DD
-><DT
->ATTACH_RULEG</DT
-><DD
-><P
->Attach to the avatar right upper leg.</P
-></DD
-><DT
->ATTACH_RLLEG</DT
-><DD
-><P
->Attach to the avatar right lower leg.</P
-></DD
-><DT
->ATTACH_LHIP</DT
-><DD
-><P
->Attach to the avatar left hip.</P
-></DD
-><DT
->ATTACH_LULEG</DT
-><DD
-><P
->Attach to the avatar lower upper leg.</P
-></DD
-><DT
->ATTACH_LLLEG</DT
-><DD
-><P
->Attach to the avatar lower left leg.</P
-></DD
-><DT
->ATTACH_BELLY</DT
-><DD
-><P
->Attach to the avatar belly.</P
-></DD
-><DT
->ATTACH_RPEC</DT
-><DD
-><P
->Attach to the avatar right pectoral.</P
-></DD
-><DT
->ATTACH_LPEC</DT
-><DD
-><P
->Attach to the avatar left pectoral.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5574"
->C.8. Land Constants</A
-></H2
-><P
->These constants are only used in calls to <A
-HREF="#AEN2949"
->llModifyLand</A
->. The constants
-    are equivalent to the similarly labelled user interface elements
-    for editing land in the viewer.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Land Constants</B
-></P
-><DL
-><DT
->LAND_LEVEL</DT
-><DD
-><P
->Action to make the land flat and level.</P
-></DD
-><DT
->LAND_RAISE</DT
-><DD
-><P
->Action to raise the land.</P
-></DD
-><DT
->LAND_LOWER</DT
-><DD
-><P
->Action to lower the land.</P
-></DD
-><DT
->LAND_SMOOTH</DT
-><DD
-><P
->Action to smooth the land.</P
-></DD
-><DT
->LAND_NOISE</DT
-><DD
-><P
->Action to push the land toward a pseudo-random 
-                heightfield.</P
-></DD
-><DT
->LAND_REVERT</DT
-><DD
-><P
->Action to push the land toward the original
-                shape from when it was first terraformed.</P
-></DD
-><DT
->LAND_SMALL_BRUSH</DT
-><DD
-><P
->Use a small brush size.</P
-></DD
-><DT
->LAND_MEDIUM_BRUSH</DT
-><DD
-><P
->Use a medium brush size.</P
-></DD
-><DT
->LAND_LARGE_BRUSH</DT
-><DD
-><P
->Use a large brush size.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5616"
->C.9. Link Constants</A
-></H2
-><P
->These constants are used in calls to <A
-HREF="#AEN3906"
->llSetLinkColor</A
-> and <A
-HREF="#AEN2919"
->llMessageLinked</A
->.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Link Constants</B
-></P
-><DL
-><DT
->LINK_SET</DT
-><DD
-><P
->This targets every object in the linked
-        set.</P
-></DD
-><DT
->LINK_ROOT</DT
-><DD
-><P
->This targets the root of the linked
-        set.</P
-></DD
-><DT
->LINK_ALL_OTHERS</DT
-><DD
-><P
->This targets every object in the linked set
-        except the object with the script.</P
-></DD
-><DT
->LINK_ALL_CHILDREN</DT
-><DD
-><P
->This targets every object except the root in
-        the linked set.</P
-></DD
-><DT
->LINK_THIS</DT
-><DD
-><P
->This targets the object making the call only.
-                </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5643"
->C.10. Control Constants</A
-></H2
-><P
->These constants are used in <A
-HREF="#AEN4661"
->llTakeControls</A
-> as well as the
-    <A
-HREF="#AEN4981"
->control</A
-> event handler.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Control Constants</B
-></P
-><DL
-><DT
->CONTROL_FWD</DT
-><DD
-><P
->Test for the avatar move forward
-        control.</P
-></DD
-><DT
->CONTROL_BACK</DT
-><DD
-><P
->Test for the avatar move back
-        control.</P
-></DD
-><DT
->CONTROL_LEFT</DT
-><DD
-><P
->Test for the avatar move left
-        control.</P
-></DD
-><DT
->CONTROL_RIGHT</DT
-><DD
-><P
->Test for the avatar move right
-        control.</P
-></DD
-><DT
->CONTROL_ROT_LEFT</DT
-><DD
-><P
->Test for the avatar rotate left
-        control.</P
-></DD
-><DT
->CONTROL_ROT_RIGHT</DT
-><DD
-><P
->Test for the avatar rotate right
-        control.</P
-></DD
-><DT
->CONTROL_UP</DT
-><DD
-><P
->Test for the avatar move up
-        control.</P
-></DD
-><DT
->CONTROL_DOWN</DT
-><DD
-><P
->Test for the avatar move down
-        control.</P
-></DD
-><DT
->CONTROL_LBUTTON</DT
-><DD
-><P
->Test for the avatar left button
-        control.</P
-></DD
-><DT
->CONTROL_ML_BUTTON</DT
-><DD
-><P
->Test for the avatar left button control while
-        in mouse look.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5690"
->C.11. Change Constants</A
-></H2
-><P
->These constants are used in the <A
-HREF="#AEN4940"
->changed</A
-> event handler.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Change Constants</B
-></P
-><DL
-><DT
->CHANGED_INVENTORY</DT
-><DD
-><P
->The object inventory has changed.</P
-></DD
-><DT
->CHANGED_ALLOWED_DROP</DT
-><DD
-><P
->The object inventory has changed because an item
-        was added through the <A
-HREF="#AEN1047"
->llAllowInventoryDrop</A
->
-        interface.</P
-></DD
-><DT
->CHANGED_COLOR</DT
-><DD
-><P
->The object color has changed.</P
-></DD
-><DT
->CHANGED_SHAPE</DT
-><DD
-><P
->The object shape has changed, eg, a box to a
-        cylinder</P
-></DD
-><DT
->CHANGED_SCALE</DT
-><DD
-><P
->The object scale has changed.</P
-></DD
-><DT
->CHANGED_TEXTURE</DT
-><DD
-><P
->The texture offset, scale rotation, or simply
-        the object texture has changed.</P
-></DD
-><DT
->CHANGED_LINK</DT
-><DD
-><P
->The object has linked or its links were
-        broken.</P
-></DD
-><DT
->CHANGED_REGION</DT
-><DD
-><P
->The object has changed regions.</P
-></DD
-><DT
->CHANGED_TELEPORT</DT
-><DD
-><P
->The object has been teleported.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5733"
->C.12. Type Constants</A
-></H2
-><P
->These constants are used to determine the variable type
-    stored in a heterogeneous list. The value returned from <A
-HREF="#AEN1875"
->llGetListEntryType</A
-> can be
-    used for comparison against these constants.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Type Constants</B
-></P
-><DL
-><DT
->TYPE_INTEGER</DT
-><DD
-><P
->The list entry is an integer.</P
-></DD
-><DT
->TYPE_FLOAT</DT
-><DD
-><P
->The list entry is a float.</P
-></DD
-><DT
->TYPE_STRING</DT
-><DD
-><P
->The list entry is a string.</P
-></DD
-><DT
->TYPE_KEY</DT
-><DD
-><P
->The list entry is a key.</P
-></DD
-><DT
->TYPE_VECTOR</DT
-><DD
-><P
->The list entry is a vector.</P
-></DD
-><DT
->TYPE_ROTATION</DT
-><DD
-><P
->The list entry is a rotation.</P
-></DD
-><DT
->TYPE_INVALID</DT
-><DD
-><P
->The list entry is invalid.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5767"
->C.13. Agent Info Constants</A
-></H2
-><P
->Each of these constants represents a bit in the integer
-    returned from the <A
-HREF="#AEN1605"
->llGetAgentInfo</A
-> function and can
-    be used in an expression to determine the specified information
-    about an agent.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Agent Info Constants</B
-></P
-><DL
-><DT
->AGENT_FLYING</DT
-><DD
-><P
->The agent is flying.</P
-></DD
-><DT
->AGENT_ATTACHMENTS</DT
-><DD
-><P
->The agent has attachments.</P
-></DD
-><DT
->AGENT_SCRIPTED</DT
-><DD
-><P
->The agent has scripted attachments.</P
-></DD
-><DT
->AGENT_SITTING</DT
-><DD
-><P
->The agent is sitting.</P
-></DD
-><DT
->AGENT_ON_OBJECT</DT
-><DD
-><P
->The agent is sitting on an object.</P
-></DD
-><DT
->AGENT_WALKING</DT
-><DD
-><P
->The agent is walking.</P
-></DD
-><DT
->AGENT_IN_AIR</DT
-><DD
-><P
->The agent is in the air.</P
-></DD
-><DT
->AGENT_MOUSELOOK</DT
-><DD
-><P
->The agent is in mouselook.</P
-></DD
-><DT
->AGENT_AWAY</DT
-><DD
-><P
->The agent is away (AFK).</P
-></DD
-><DT
->AGENT_TYPING</DT
-><DD
-><P
->The agent is typing.</P
-></DD
-><DT
->AGENT_CROUCHING</DT
-><DD
-><P
->The agent is crouching.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5817"
->C.14. Texture Animation
-    Constants</A
-></H2
-><P
->These constants are used in the <A
-HREF="#AEN4140"
->llSetTextureAnim</A
-> api to
-    control the animation mode.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Texture Animation Constants</B
-></P
-><DL
-><DT
->ANIM_ON</DT
-><DD
-><P
->Texture animation is on.</P
-></DD
-><DT
->LOOP</DT
-><DD
-><P
->Loop the texture animation.</P
-></DD
-><DT
->REVERSE</DT
-><DD
-><P
->Play animation in reverse direction.</P
-></DD
-><DT
->PING_PONG</DT
-><DD
-><P
->play animation going forwards, then
-        backwards.</P
-></DD
-><DT
->SMOOTH</DT
-><DD
-><P
->slide in the X direction, instead of playing
-        separate frames.</P
-></DD
-><DT
->ROTATE</DT
-><DD
-><P
->Animate texture rotation.</P
-></DD
-><DT
->SCALE</DT
-><DD
-><P
->Animate the texture scale.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN5851"
->C.15. Particle System Constants</A
-></H2
-><P
->These constants are used in calls to the <A
-HREF="#AEN3149"
->llParticleSystem</A
-> api to
-    specify parameters.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Particle System Parameters</B
-></P
-><DL
-><DT
->PSYS_PART_FLAGS</DT
-><DD
-><P
->Each particle that is emitted by the particle system
-          is simulated based on the following flags. To use multiple
-          flags, bitwise or (|) them together.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->PSYS_PART_FLAGS Values</B
-></P
-><DL
-><DT
->PSYS_PART_INTERP_COLOR_MASK</DT
-><DD
-><P
->Interpolate both the color and alpha
-                from the start value to the end
-                value.</P
-></DD
-><DT
->PSYS_PART_INTERP_SCALE_MASK</DT
-><DD
-><P
->Interpolate the particle scale from
-                the start value to the end value.</P
-></DD
-><DT
->PSYS_PART_WIND_MASK</DT
-><DD
-><P
->Particles have their velocity damped
-                towards the wind velocity.</P
-></DD
-><DT
->PSYS_PART_BOUNCE_MASK</DT
-><DD
-><P
->Particles bounce off of a plane at the
-                object's Z height.</P
-></DD
-><DT
->PSYS_PART_FOLLOW_SRC_MASK</DT
-><DD
-><P
->The particle position is relative to
-                the source object's position.</P
-></DD
-><DT
->PSYS_PART_FOLLOW_VELOCITY_MASK</DT
-><DD
-><P
->The particle orientation is rotated so
-                the vertical axis faces towards the particle
-                velocity.</P
-></DD
-><DT
->PSYS_PART_TARGET_POS_MASK</DT
-><DD
-><P
->The particle heads towards the
-                location of the target object as defined by
-                PSYS_SRC_TARGET_KEY.</P
-></DD
-><DT
->PSYS_PART_EMISSIVE_MASK</DT
-><DD
-><P
->The particle glows.</P
-></DD
-><DT
->PSYS_PART_RANDOM_ACCEL_MASK</DT
-><DD
-><P
->(not implemented)</P
-></DD
-><DT
->PSYS_PART_RANDOM_VEL_MASK</DT
-><DD
-><P
->(not implemented)</P
-></DD
-><DT
->PSYS_PART_TRAIL_MASK</DT
-><DD
-><P
->(not implemented)</P
-></DD
-></DL
-></DIV
-></DD
-><DT
->PSYS_SRC_PATTERN</DT
-><DD
-><P
->The pattern which is used to generate particles. Use
-          one of the following values:</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->PSYS_SRC_PATTERN Values</B
-></P
-><DL
-><DT
->PSYS_SRC_PATTERN_DROP</DT
-><DD
-><P
->Drop particles at the source
-                position.</P
-></DD
-><DT
->PSYS_SRC_PATTERN_EXPLODE</DT
-><DD
-><P
->Shoot particles out in all directions,
-                using the burst parameters.</P
-></DD
-><DT
->PSYS_SRC_PATTERN_ANGLE</DT
-><DD
-><P
->Shoot particles across a 2 dimensional
-                area defined by the arc created from
-                PSYS_SRC_OUTERANGLE. There will be an open area
-                defined by PSYS_SRC_INNERANGLE within the larger
-                arc.</P
-></DD
-><DT
->PSYS_SRC_PATTERN_ANGLE_CONE</DT
-><DD
-><P
->Shoot particles out in a 3 dimensional
-                cone with an outer arc of PSYS_SRC_OUTERANGLE and an
-                inner open area defined by
-                PSYS_SRC_INNERANGLE.</P
-></DD
-></DL
-></DIV
-></DD
-><DT
->PSYS_PART_START_COLOR</DT
-><DD
-><P
->a vector &#60;r,g,b&#62; which determines the starting
-        color of the object.</P
-></DD
-><DT
->PSYS_PART_START_ALPHA</DT
-><DD
-><P
->a float which determines the starting alpha of
-        the object.</P
-></DD
-><DT
->PSYS_PART_END_COLOR</DT
-><DD
-><P
->a vector &#60;r, g, b&#62; which determines the ending
-        color of the object.</P
-></DD
-><DT
->PSYS_PART_END_ALPHA</DT
-><DD
-><P
->a float which determines the ending alpha of
-        the object.</P
-></DD
-><DT
->PSYS_PART_START_SCALE</DT
-><DD
-><P
->a vector &#60;sx, sy, z&#62;, which is the starting
-        size of the particle billboard in meters (z is
-        ignored).</P
-></DD
-><DT
->PSYS_PART_END_SCALE</DT
-><DD
-><P
->a vector &#60;sx, sy, z&#62;, which is the ending size
-        of the particle billboard in meters (z is
-        ignored).</P
-></DD
-><DT
->PSYS_PART_MAX_AGE</DT
-><DD
-><P
->age in seconds of a particle at which it
-        dies.</P
-></DD
-><DT
->PSYS_SRC_ACCEL</DT
-><DD
-><P
->a vector &#60;x, y, z&#62; which is the acceleration
-        to apply on particles.</P
-></DD
-><DT
->PSYS_SRC_TEXTURE</DT
-><DD
-><P
->an asset name for the texture to use for the
-        particles.</P
-></DD
-><DT
->PSYS_SRC_BURST_RATE</DT
-><DD
-><P
->how often to release a particle burst (float
-        seconds).</P
-></DD
-><DT
->PSYS_SRC_INNERANGLE</DT
-><DD
-><P
->specifies the inner angle of the arc created
-        by the PSYS_SRC_PATTERN_ANGLE or
-        PSYS_SRC_PATTERN_ANGLE_CONE source pattern. The area
-        specified will not have particles in it..</P
-></DD
-><DT
->PSYS_SRC_OUTERANGLE</DT
-><DD
-><P
->specifies the outer angle of the arc created
-        by the PSYS_SRC_PATTERN_ANGLE or
-        PSYS_SRC_PATTERN_ANGLE_CONE source pattern. The area
-        between the outer and inner angle will be filled with
-        particles..</P
-></DD
-><DT
->PSYS_SRC_BURST_PART_COUNT</DT
-><DD
-><P
->how many particles to release in a
-        burst.</P
-></DD
-><DT
->PSYS_SRC_BURST_RADIUS</DT
-><DD
-><P
->what distance from the center of the object to
-        create the particles.</P
-></DD
-><DT
->PSYS_SRC_BURST_SPEED_MIN</DT
-><DD
-><P
->minimum speed that a particle should be
-        moving.</P
-></DD
-><DT
->PSYS_SRC_BURST_SPEED_MAX</DT
-><DD
-><P
->maximum speed that a particle should be
-        moving.</P
-></DD
-><DT
->PSYS_SRC_MAX_AGE</DT
-><DD
-><P
->how long this particle system should last, 0.0
-        means forever.</P
-></DD
-><DT
->PSYS_SRC_TARGET_KEY</DT
-><DD
-><P
->the key of a target object to move towards if
-        PSYS_PART_TARGET_POS_MASK is enabled.</P
-></DD
-><DT
->PSYS_SRC_OMEGA</DT
-><DD
-><P
->Sets the angular velocity to rotate the axis
-        that SRC_PATTERN_ANGLE and SRC_PATTERN_ANGLE_CONE
-        use..</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6005"
->C.16. Agent Data Constants</A
-></H2
-><P
->These constants are used in calls to the <A
-HREF="#AEN3346"
->llRequestAgentData</A
-> api to
-    collect information about an agent which will be provided in the
-    <A
-HREF="#AEN4997"
->dataserver event</A
->.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Agent Data Constants</B
-></P
-><DL
-><DT
->DATA_ONLINE</DT
-><DD
-><P
->"1" for online "0" for
-        offline.</P
-></DD
-><DT
->DATA_NAME</DT
-><DD
-><P
->The name of the agent.</P
-></DD
-><DT
->DATA_BORN</DT
-><DD
-><P
->The date the agent was born returned in ISO
-        8601 format of YYYY-MM-DD.</P
-></DD
-><DT
->DATA_RATING</DT
-><DD
-><P
->Returns the agent ratings as a comma separated
-        string of six integers. They are:
-          <P
-></P
-><OL
-TYPE="1"
-><LI
-><P
->Positive rated behavior</P
-></LI
-><LI
-><P
->Negative rated behavior</P
-></LI
-><LI
-><P
->Positive rated appearance</P
-></LI
-><LI
-><P
->Negative rated appearance</P
-></LI
-><LI
-><P
->Positive rated building</P
-></LI
-><LI
-><P
->Negative rated building</P
-></LI
-></OL
->
-        </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6041"
->C.17. Float Constants</A
-></H2
-><P
->LSL provides a small collection of floating point constants
-    for use in float arithmetic. These constants are usually employed
-    while performing trigonometric calculations, but are sometimes
-    useful for other applications such as specifying arc radians to
-    sensor or particle system functions.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Float Constants</B
-></P
-><DL
-><DT
->PI</DT
-><DD
-><P
->3.14159265 - The radians of a
-        hemicircle.</P
-></DD
-><DT
->TWO_PI</DT
-><DD
-><P
->6.28318530 - The radians of a
-        circle.</P
-></DD
-><DT
->PI_BY_TWO</DT
-><DD
-><P
->1.57079633 - The radians of a quarter
-        circle.</P
-></DD
-><DT
->DEG_TO_RAD</DT
-><DD
-><P
->0.01745329 - Number of radians per degree.
-        You can use this to convert degrees to radians by multiplying
-        the degrees by this number.</P
-></DD
-><DT
->RAD_TO_DEG</DT
-><DD
-><P
->57.2957795 - Number of degrees per radian. You
-        can use this number to convert radians to degrees by
-        multiplying the radians by this number.</P
-></DD
-><DT
->SQRT2</DT
-><DD
-><P
->1.41421356 - The square root of 2.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6070"
->C.18. Key Constant</A
-></H2
-><P
->There is only one key constant which acts as an invalid
-    key: NULL_KEY.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6073"
->C.19. Miscellaneous Integer Constants</A
-></H2
-><P
->There is one uncategorized integer constant which is used in
-    some of the texturing and coloring api: ALL_SIDES</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6076"
->C.20. Miscellaneous String
-    Constants</A
-></H2
-><P
->There is one uncategorized string constant
-    which is used in the <A
-HREF="#AEN4997"
->dataserver</A
-> event:
-    EOF</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6080"
->C.21. Vector Constant</A
-></H2
-><P
->There is only one vector constant which acts as a zero
-    vector: ZERO_VECTOR = &#60;0,0,0&#62;.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6083"
->C.22. Rotation Constant</A
-></H2
-><P
->There is only one rotation constant which acts as a zero
-    rotation: ZERO_ROTATION = &#60;0,0,0,1&#62;.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6086"
->C.23. Simulator Data Constants</A
-></H2
-><P
->These constants are used in calls to the <A
-HREF="#AEN3391"
->llRequestSimulatorData</A
-> api to
-    collect information about a simulator which will be provided in the
-    <A
-HREF="#AEN4997"
->dataserver event</A
->.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Simulator Data Constants</B
-></P
-><DL
-><DT
->DATA_SIM_POS</DT
-><DD
-><P
->The global position of the simulator.  Cast the 
-                value to a vector.</P
-></DD
-><DT
->DATA_SIM_STATUS</DT
-><DD
-><P
->The status of the simulator.  Currently, this may be one of the following: 
-                <P
-></P
-><UL
-><LI
-STYLE="list-style-type: opencircle"
-><P
->up</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->down</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->stopping</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->starting</P
-></LI
-><LI
-STYLE="list-style-type: opencircle"
-><P
->crashed</P
-></LI
-></UL
->
-                </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6112"
->C.24. Vehicle Parameters</A
-></H2
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Parameters</B
-></P
-><DL
-><DT
-><A
-HREF="#AEN956"
->VEHICLE_LINEAR_FRICTION_TIMESCALE</A
-></DT
-><DD
-><P
->A vector of timescales for exponential decay of the
-        vehicle's linear velocity along its preferred axes of motion (at, left,
-        up). Range = [0.07, inf) seconds for each element of the vector.
-        </P
-></DD
-><DT
-><A
-HREF="#AEN956"
->VEHICLE_ANGULAR_FRICTION_TIMESCALE</A
-></DT
-><DD
-><P
->A vector of timescales for exponential decay of the
-        vehicle's angular velocity about its preferred axes of motion (at,
-        left, up). Range = [0.07, inf) seconds for each element of the vector.
-        </P
-></DD
-><DT
-><A
-HREF="#AEN866"
->VEHICLE_LINEAR_MOTOR_DIRECTION</A
-></DT
-><DD
-><P
->The direction and magnitude (in preferred frame) of the
-        vehicle's linear motor. The vehicle will accelerate (or decelerate if
-        necessary) to match its velocity to its motor. Range of magnitude =
-        [0, 30] meters/second.
-                </P
-></DD
-><DT
-><A
-HREF="#AEN866"
->VEHICLE_LINEAR_MOTOR_OFFSET</A
-></DT
-><DD
-><P
->The offset point from the vehicle's center of mass at which
-                the linear motor's impulse is applied. This allows the linear motor
-                to also cause rotational torque.  Range of magnitude = [0, 100]
-                meters.</P
-></DD
-><DT
-><A
-HREF="#AEN866"
->VEHICLE_LINEAR_MOTOR_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential approach to full
-        linear motor velocity.</P
-></DD
-><DT
-><A
-HREF="#AEN866"
->VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential decay of the linear
-        motor's magnitude.</P
-></DD
-><DT
-><A
-HREF="#AEN898"
->VEHICLE_ANGULAR_MOTOR_DIRECTION</A
-></DT
-><DD
-><P
->The direction and magnitude (in preferred frame)
-        of the vehicle's angular motor.The vehicle will accelerate (or
-        decelerate if necessary) to match its velocity to its
-        motor.</P
-></DD
-><DT
-><A
-HREF="#AEN898"
->VEHICLE_ANGULAR_MOTOR_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential approach to full
-        angular motor velocity.</P
-></DD
-><DT
-><A
-HREF="#AEN898"
->VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential decay of the angular
-        motor's magnitude.</P
-></DD
-><DT
-><A
-HREF="#AEN979"
->VEHICLE_HOVER_HEIGHT</A
-></DT
-><DD
-><P
->The height (above the terrain or water, or global)
-        at which the vehicle will try to hover.</P
-></DD
-><DT
-><A
-HREF="#AEN979"
->VEHICLE_HOVER_EFFICIENCY</A
-></DT
-><DD
-><P
->A slider between minimum (0.0 = bouncy) and
-        maximum (1.0 = fast as possible) damped motion of the hover
-        behavior.</P
-></DD
-><DT
-><A
-HREF="#AEN979"
->VEHICLE_HOVER_TIMESCALE</A
-></DT
-><DD
-><P
->The period of bounce (or timescale of exponential
-        approach, depending on the hover efficiency) for the vehicle to
-        hover to the proper height.</P
-></DD
-><DT
-><A
-HREF="#AEN972"
->VEHICLE_BUOYANCY</A
-></DT
-><DD
-><P
->A slider between minimum (0.0) and maximum
-        anti-gravity (1.0).</P
-></DD
-><DT
-><A
-HREF="#vehicle_linear_deflection"
->VEHICLE_LINEAR_DEFLECTION_EFFICIENCY</A
-></DT
-><DD
-><P
->A slider between minimum (0.0) and maximum (1.0)
-        deflection of linear velocity. That is, it's a simple scalar for
-        modulating the strength of linear deflection.</P
-></DD
-><DT
-><A
-HREF="#vehicle_linear_deflection"
->VEHICLE_LINEAR_DEFLECTION_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential success of linear
-        deflection. It is another way to specify how much time
-        it takes for the vehicle's linear velocity to be redirected to
-        it's preferred axis of motion.</P
-></DD
-><DT
-><A
-HREF="#vehicle_angular_deflection"
->VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY</A
-></DT
-><DD
-><P
->A slider between minimum (0.0) and maximum (1.0)
-        deflection of angular orientation. That is, it's a simple scalar
-        for modulating the strength of angular deflection such that the
-        vehicle's preferred axis of motion points toward it's real
-        velocity.</P
-></DD
-><DT
-><A
-HREF="#vehicle_angular_deflection"
->VEHICLE_ANGULAR_DEFLECTION_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for exponential success of angular
-        deflection. It's another way to specify the strength
-        of the vehicle's tendency to reorient itself so that it's
-        preferred axis of motion agrees with it's true
-        velocity.</P
-></DD
-><DT
-><A
-HREF="#AEN938"
->VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY</A
-></DT
-><DD
-><P
->A slider between minimum (0.0 = wobbly) and
-        maximum (1.0 = firm as possible) stability of the vehicle to keep
-        itself upright.</P
-></DD
-><DT
-><A
-HREF="#AEN938"
->VEHICLE_VERTICAL_ATTRACTION_TIMESCALE</A
-></DT
-><DD
-><P
->The period of wobble, or timescale for exponential
-        approach, of the vehicle to rotate such that it's preferred
-        "up" axis is oriented along the world's "up"
-        axis.</P
-></DD
-><DT
-><A
-HREF="#AEN949"
->VEHICLE_BANKING_EFFICIENCY</A
-></DT
-><DD
-><P
->A slider between anti (-1.0), none (0.0), and
-        maximum (1.0) banking strength.</P
-></DD
-><DT
-><A
-HREF="#AEN949"
->VEHICLE_BANKING_MIX</A
-></DT
-><DD
-><P
->A slider between static (0.0) and dynamic (1.0)
-        banking. "Static" means the banking scales only with the
-        angle of roll, whereas "dynamic" is a term that also
-        scales with the vehicle's linear speed.</P
-></DD
-><DT
-><A
-HREF="#AEN949"
->VEHICLE_BANKING_TIMESCALE</A
-></DT
-><DD
-><P
->The timescale for banking to exponentially
-        approach it's maximum effect. This is another way to scale the
-        strength of the banking effect, however it affects the term that
-        is proportional to the difference between what the banking
-        behavior is trying to do, and what the vehicle is actually
-        doing.</P
-></DD
-><DT
-><A
-HREF="#AEN990"
->VEHICLE_REFERENCE_FRAME</A
-></DT
-><DD
-><P
->A rotation of the vehicle's preferred axes of
-        motion and orientation (at, left, up) with respect to the
-        vehicle's local frame (x, y, z).</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6231"
->C.25. Vehicle Flags</A
-></H2
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Flags</B
-></P
-><DL
-><DT
-><A
-NAME="const_vehicle_flag_no_deflection_up"
-></A
->VEHICLE_FLAG_NO_DEFLECTION_UP</DT
-><DD
-><P
->This flag prevents 
-                <A
-HREF="#vehicle_linear_deflection"
->linear deflection</A
-> 
-                parallel to world z-axis. This is useful for preventing ground 
-                vehicles with large linear deflection, like bumper cars, from climbing 
-                their linear deflection into the sky.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_limit_roll_only"
-></A
->VEHICLE_FLAG_LIMIT_ROLL_ONLY</DT
-><DD
-><P
->For vehicles with 
-                <A
-HREF="#AEN938"
->vertical attractor</A
->
-                that want to be able to climb/dive, for instance, airplanes that want 
-        to use the <A
-HREF="#AEN949"
->banking</A
->
-                feature.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_hover_water_only"
-></A
->VEHICLE_FLAG_HOVER_WATER_ONLY</DT
-><DD
-><P
->Ignore terrain height when 
-                <A
-HREF="#AEN979"
->hovering</A
->.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_hover_terrain_only"
-></A
->VEHICLE_FLAG_HOVER_TERRAIN_ONLY</DT
-><DD
-><P
->Ignore water height when 
-                <A
-HREF="#AEN979"
->hovering</A
->.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_hover_global_height"
-></A
->VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT</DT
-><DD
-><P
-><A
-HREF="#AEN979"
->Hover</A
-> at 
-                global height instead of height above ground or water.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_hover_up_only"
-></A
->VEHICLE_FLAG_HOVER_UP_ONLY</DT
-><DD
-><P
-><A
-HREF="#AEN979"
->Hover</A
-> doesn't 
-                push down. Use this flag for hovering
-        vehicles that should be able to jump above their 
-                <A
-HREF="#vehicle_hover_height"
->hover height</A
->.
-        </P
-></DD
-><DT
->VEHICLE_FLAG_LIMIT_MOTOR_UP</DT
-><DD
-><P
->Prevents ground vehicles from motoring into the 
-        sky. This flag has a subtle effect when used with conjunction
-                with <A
-HREF="#AEN949"
->banking</A
->: the strength
-                of the banking will decay when the vehicle no longer experiences
-                collisions. The decay timescale is the same as 
-                <A
-HREF="#vehicle_banking_timescale"
->VEHICLE_BANKING_TIMESCALE
-                </A
->. This is to help prevent ground vehicles from steering
-                when they are in mid jump.
-                </P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_mouselook_steer"
-></A
->VEHICLE_FLAG_MOUSELOOK_STEER</DT
-><DD
-><P
->Steer the vehicle using the mouse.  Use this 
-                flag to make the angular motor try to make the vehicle
-                turn such that its <A
-HREF="#vehicle_roll_pitch_yaw"
->local 
-                x-axis</A
-> points in the same direction as 
-                the client-side camera.</P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_mouselook_bank"
-></A
->VEHICLE_FLAG_MOUSELOOK_BANK</DT
-><DD
-><P
->Same as above, but relies on
-                <A
-HREF="#AEN949"
->banking</A
->.  It remaps 
-                left-right motions of the client camera (also known as "yaw") to 
-                rotations about the vehicle's <A
-HREF="#vehicle_roll_pitch_yaw"
->&#13;          local x-axis</A
->.
-                </P
-></DD
-><DT
-><A
-NAME="const_vehicle_flag_camera_decoupled"
-></A
->VEHICLE_FLAG_CAMERA_DECOUPLED</DT
-><DD
-><P
->Makes mouselook camera rotate independently of 
-                the vehicle.  By default the client mouselook camera will rotate 
-                about with the vehicle, however when this flag is set the camera
-                direction is independent of the vehicle's rotation.
-                </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6288"
->C.26. Vehicle Types</A
-></H2
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Types</B
-></P
-><DL
-><DT
->VEHICLE_TYPE_SLED</DT
-><DD
-><P
->Simple vehicle that bumps along the ground, and likes to move along
-        it's local x-axis.</P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN6296"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// most friction for left-right, least for up-down
-llSetVehicleVectorParam( VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;30, 1, 1000&#62; );
-
-// no angular friction
-llSetVehicleVectorParam( VEHICLE_ANGULAR_FRICTION_TIMESCALE, &#60;1000, 1000, 1000&#62; );
-
-// no linear motor
-llSetVehicleVectorParam( VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_TIMESCALE, 1000 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, 120 );
-
-// no angular motor
-llSetVehicleVectorParam( VEHICLE_ANGULAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_TIMESCALE, 1000 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, 120 );
-
-// no hover (but with timescale of 10 sec if enabled)
-llSetVehicleFloatParam( VEHICLE_HOVER_HEIGHT, 0 );
-llSetVehicleFloatParam( VEHICLE_HOVER_EFFICIENCY, 10 );
-llSetVehicleFloatParam( VEHICLE_HOVER_TIMESCALE, 10 );
-llSetVehicleFloatParam( VEHICLE_BUOYANCY, 0 );
-
-// maximum linear deflection with timescale of 1 second
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 1 );
-
-// no angular deflection 
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 10 );
-
-// no vertical attractor (doesn't mind flipping over)
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 1000 );
-
-// no banking
-llSetVehicleFloatParam( VEHICLE_BANKING_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_BANKING_MIX, 1 );
-llSetVehicleFloatParam( VEHICLE_BANKING_TIMESCALE, 10 );
-
-// default rotation of local frame
-llSetVehicleRotationParam( VEHICLE_REFERENCE_FRAME, &#60;0, 0, 0, 1&#62; );
-
-// remove these flags 
-llRemoveVehicleFlags( VEHICLE_FLAG_HOVER_WATER_ONLY 
-                      | VEHICLE_FLAG_HOVER_TERRAIN_ONLY 
-                      | VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT 
-                      | VEHICLE_FLAG_HOVER_UP_ONLY );
-
-// set these flags (the limit_roll flag will have no effect
-// until banking is enabled, if ever)
-llSetVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP 
-                   | VEHICLE_FLAG_LIMIT_ROLL_ONLY
-                   | VEHICLE_FLAG_LIMIT_MOTOR_UP );
-        </PRE
-><P
-></P
-></DIV
-></DD
-><DT
->VEHICLE_TYPE_CAR</DT
-><DD
-><P
->Another vehicle that bounces along the ground but
-        needs the motors to be driven from external controls or <A
-HREF="#AEN5211"
->timer</A
-> events.</P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN6303"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// most friction for left-right, least for up-down
-llSetVehicleVectorParam( VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;100, 2, 1000&#62; );
-        
-// no angular friction
-llSetVehicleVectorParam( VEHICLE_ANGULAR_FRICTION_TIMESCALE, &#60;1000, 1000, 1000&#62; );
-
-// linear motor wins after about a second, decays after about a minute
-llSetVehicleVectorParam( VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_TIMESCALE, 1 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, 60 );
-
-// angular motor wins after a second, decays in less time than that
-llSetVehicleVectorParam( VEHICLE_ANGULAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_TIMESCALE, 1 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, 0.8 );
-
-// no hover 
-llSetVehicleFloatParam( VEHICLE_HOVER_HEIGHT, 0 );
-llSetVehicleFloatParam( VEHICLE_HOVER_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_HOVER_TIMESCALE, 1000 );
-llSetVehicleFloatParam( VEHICLE_BUOYANCY, 0 );
-
-// maximum linear deflection with timescale of 2 seconds
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 2 );
-
-// no angular deflection 
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 10 );
-        
-// critically damped vertical attractor
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 10 );
-
-// weak negative critically damped banking
-llSetVehicleFloatParam( VEHICLE_BANKING_EFFICIENCY, -0.2 );
-llSetVehicleFloatParam( VEHICLE_BANKING_MIX, 1 );
-llSetVehicleFloatParam( VEHICLE_BANKING_TIMESCALE, 1 );
-
-// default rotation of local frame
-llSetVehicleRotationParam( VEHICLE_REFERENCE_FRAME, &#60;0, 0, 0, 1&#62; );
-
-// remove these flags 
-llRemoveVehicleFlags( VEHICLE_FLAG_HOVER_WATER_ONLY 
-                      | VEHICLE_FLAG_HOVER_TERRAIN_ONLY 
-                      | VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT);
-
-// set these flags 
-llSetVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP 
-                   | VEHICLE_FLAG_LIMIT_ROLL_ONLY 
-                   | VEHICLE_FLAG_HOVER_UP_ONLY
-                   | VEHICLE_FLAG_LIMIT_MOTOR_UP );
-        </PRE
-><P
-></P
-></DIV
-></DD
-><DT
->VEHICLE_TYPE_BOAT</DT
-><DD
-><P
->Hovers over water with lots of friction and some angular deflection.</P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN6309"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// least for forward-back, most friction for up-down
-llSetVehicleVectorParam( VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;10, 3, 2&#62; );
-        
-// uniform angular friction (setting it as a scalar rather than a vector)
-llSetVehicleFloatParam( VEHICLE_ANGULAR_FRICTION_TIMESCALE, 10 );
-
-// linear motor wins after about five seconds, decays after about a minute
-llSetVehicleVectorParam( VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_TIMESCALE, 5 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, 60 );
-
-// angular motor wins after four seconds, decays in same amount of time
-llSetVehicleVectorParam( VEHICLE_ANGULAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_TIMESCALE, 4 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, 4 );
-
-// hover 
-llSetVehicleFloatParam( VEHICLE_HOVER_HEIGHT, 0 );
-llSetVehicleFloatParam( VEHICLE_HOVER_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_HOVER_TIMESCALE, 2.0 );
-llSetVehicleFloatParam( VEHICLE_BUOYANCY, 1 );
-
-// halfway linear deflection with timescale of 3 seconds
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 3 );
-
-// angular deflection 
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 5 );
-        
-// somewhat bouncy vertical attractor 
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 5 );
-
-// weak negative damped banking
-llSetVehicleFloatParam( VEHICLE_BANKING_EFFICIENCY, -0.3 );
-llSetVehicleFloatParam( VEHICLE_BANKING_MIX, 0.8 );
-llSetVehicleFloatParam( VEHICLE_BANKING_TIMESCALE, 1 );
-
-// default rotation of local frame
-llSetVehicleRotationParam( VEHICLE_REFERENCE_FRAME, &#60;0, 0, 0, 1&#62; );
-
-// remove these flags 
-llRemoveVehicleFlags( VEHICLE_FLAG_HOVER_TERRAIN_ONLY 
-                      | VEHICLE_FLAG_LIMIT_ROLL_ONLY 
-                      | VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT);
-
-// set these flags 
-llSetVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP 
-                   | VEHICLE_FLAG_HOVER_WATER_ONLY 
-                   | VEHICLE_FLAG_HOVER_UP_ONLY 
-                   | VEHICLE_FLAG_LIMIT_MOTOR_UP );
-        </PRE
-><P
-></P
-></DIV
-></DD
-><DT
->VEHICLE_TYPE_AIRPLANE</DT
-><DD
-><P
->Uses linear deflection for lift, no hover, and banking to turn.</P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN6315"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// very little friction along forward-back axis
-llSetVehicleVectorParam( VEHICLE_LINEAR_FRICTION_TIMESCALE, &#60;200, 10, 5&#62; );
-        
-// uniform angular friction
-llSetVehicleFloatParam( VEHICLE_ANGULAR_FRICTION_TIMESCALE, 20 );
-
-// linear motor
-llSetVehicleVectorParam( VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_TIMESCALE, 2 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, 60 );
-
-// angular motor
-llSetVehicleVectorParam( VEHICLE_ANGULAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_TIMESCALE, 4 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, 8 );
-
-// no hover 
-llSetVehicleFloatParam( VEHICLE_HOVER_HEIGHT, 0 );
-llSetVehicleFloatParam( VEHICLE_HOVER_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_HOVER_TIMESCALE, 1000 );
-llSetVehicleFloatParam( VEHICLE_BUOYANCY, 0 );
-
-// linear deflection 
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_EFFICIENCY, 0.5 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 0.5 );
-
-// angular deflection 
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY, 1.0 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 2.0 );
-        
-// vertical attractor
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 0.9 );
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 2 );
-
-// banking
-llSetVehicleFloatParam( VEHICLE_BANKING_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_BANKING_MIX, 0.7 );
-llSetVehicleFloatParam( VEHICLE_BANKING_TIMESCALE, 2 );
-
-// default rotation of local frame
-llSetVehicleRotationParam( VEHICLE_REFERENCE_FRAME, &#60;0, 0, 0, 1&#62; );
-
-// remove these flags 
-llRemoveVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP 
-                      | VEHICLE_FLAG_HOVER_WATER_ONLY 
-                      | VEHICLE_FLAG_HOVER_TERRAIN_ONLY 
-                      | VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT 
-                      | VEHICLE_FLAG_HOVER_UP_ONLY
-                      | VEHICLE_FLAG_LIMIT_MOTOR_UP );
-
-// set these flags 
-llSetVehicleFlags( VEHICLE_FLAG_LIMIT_ROLL_ONLY );
-        </PRE
-><P
-></P
-></DIV
-></DD
-><DT
->VEHICLE_TYPE_BALLOON</DT
-><DD
-><P
->Hover, and friction, but no deflection.</P
-><DIV
-CLASS="informalexample"
-><P
-></P
-><A
-NAME="AEN6321"
-></A
-><PRE
-CLASS="programlisting"
->&#13;// uniform linear friction
-llSetVehicleFloatParam( VEHICLE_LINEAR_FRICTION_TIMESCALE, 5 );
-        
-// uniform angular friction
-llSetVehicleFloatParam( VEHICLE_ANGULAR_FRICTION_TIMESCALE, 10 );
-
-// linear motor
-llSetVehicleVectorParam( VEHICLE_LINEAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_TIMESCALE, 5 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE, 60 );
-
-// angular motor
-llSetVehicleVectorParam( VEHICLE_ANGULAR_MOTOR_DIRECTION, &#60;0, 0, 0&#62; );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_TIMESCALE, 6 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE, 10 );
-
-// hover 
-llSetVehicleFloatParam( VEHICLE_HOVER_HEIGHT, 5 );
-llSetVehicleFloatParam( VEHICLE_HOVER_EFFICIENCY, 0.8 );
-llSetVehicleFloatParam( VEHICLE_HOVER_TIMESCALE, 10 );
-llSetVehicleFloatParam( VEHICLE_BUOYANCY, 1 );
-
-// no linear deflection 
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_LINEAR_DEFLECTION_TIMESCALE, 5 );
-
-// no angular deflection 
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_ANGULAR_DEFLECTION_TIMESCALE, 5 );
-        
-// no vertical attractor 
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY, 1 );
-llSetVehicleFloatParam( VEHICLE_VERTICAL_ATTRACTION_TIMESCALE, 1000 );
-
-// no banking
-llSetVehicleFloatParam( VEHICLE_BANKING_EFFICIENCY, 0 );
-llSetVehicleFloatParam( VEHICLE_BANKING_MIX, 0.7 );
-llSetVehicleFloatParam( VEHICLE_BANKING_TIMESCALE, 5 );
-
-// default rotation of local frame
-llSetVehicleRotationParam( VEHICLE_REFERENCE_FRAME, &#60;0, 0, 0, 1&#62; );
-
-// remove all flags 
-llRemoveVehicleFlags( VEHICLE_FLAG_NO_DEFLECTION_UP 
-                      | VEHICLE_FLAG_HOVER_WATER_ONLY 
-                      | VEHICLE_FLAG_LIMIT_ROLL_ONLY 
-                      | VEHICLE_FLAG_HOVER_TERRAIN_ONLY 
-                      | VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT 
-                      | VEHICLE_FLAG_HOVER_UP_ONLY 
-                      | VEHICLE_FLAG_LIMIT_MOTOR_UP );
-        </PRE
-><P
-></P
-></DIV
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6323"
->C.27. Primitive Constants</A
-></H2
-><P
->These constants are used in calls to the <A
-HREF="#AEN4020"
->llSetPrimitiveParams</A
-> and <A
-HREF="#AEN2075"
->llGetPrimitiveParams</A
-> api to
-    specify parameters.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Primitive Parameters</B
-></P
-><DL
-><DT
->PRIM_TYPE</DT
-><DD
-><P
->This allows the various primitive shape parameters to be controlled.  PRIM_TYPE must be followed by
-          appropriate arguments based on which type is selected.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->PRIM_TYPE Values</B
-></P
-><DL
-><DT
->PRIM_TYPE_BOX</DT
-><DD
-><P
->Sets the primitive to a box, followed by integer hole shape, vector cut, float hollow, vector twist, vector top size, and vector top shear.</P
-></DD
-><DT
->PRIM_TYPE_CYLINDER</DT
-><DD
-><P
->Sets the primitive to a cylinder, followed by integer hole shape, vector cut, float hollow, vector twist, vector top size, and vector top shear.</P
-></DD
-><DT
->PRIM_TYPE_PRISM</DT
-><DD
-><P
->Sets the primitive to a prism, followed by integer hole shape, vector cut, float hollow, vector twist, vector top size, and vector top shear.</P
-></DD
-><DT
->PRIM_TYPE_SPHERE</DT
-><DD
-><P
->Sets the primitive to a sphere, followed by integer hole shape, vector cut, float hollow, vector twist, and vector dimple.</P
-></DD
-><DT
->PRIM_TYPE_TORUS</DT
-><DD
-><P
->Sets the primitive to a torus, followed by integer hole shape, vector cut, float hollow, vector twist, vector hole size, vector top shear, vector advanced cut, vector taper, float revolutions, float radius offset, and float skew.</P
-></DD
-><DT
->PRIM_TYPE_TUBE</DT
-><DD
-><P
->Sets the primitive to a tube, followed by integer hole shape, vector cut, float hollow, vector twist, vector hole size, vector top shear, vector advanced cut, vector taper, float revolutions, float radius offset, and float skew.</P
-></DD
-><DT
->PRIM_TYPE_RING</DT
-><DD
-><P
->Sets the primitive to a ring, followed by integer hole shape, vector cut, float hollow, vector twist, vector hole size, vector top shear, vector advanced cut, vector taper, float revolutions, float radius offset, and float skew.</P
-></DD
-></DL
-></DIV
-><P
->Choose hole shape from one of PRIM_HOLE_DEFAULT, PRIM_HOLE_CIRCLE, PRIM_HOLE_SQUARE, or PRIM_HOLE_TRIANGLE.</P
-></DD
-><DT
->PRIM_MATERIAL</DT
-><DD
-><P
->Choose material from one of PRIM_MATERIAL_STONE, PRIM_MATERIAL_METAL, PRIM_MATERIAL_GLASS,
-        PRIM_MATERIAL_WOOD, PRIM_MATERIAL_FLESH, PRIM_MATERIAL_PLASTIC, PRIM_MATERIAL_RUBBER, or PRIM_MATERIAL_LIGHT.</P
-></DD
-><DT
->PRIM_PHYSICS</DT
-><DD
-><P
->Set physics to TRUE or FALSE.</P
-></DD
-><DT
->PRIM_TEMP_ON_REZ</DT
-><DD
-><P
->Set temporary on rez to TRUE or FALSE.</P
-></DD
-><DT
->PRIM_PHANTOM</DT
-><DD
-><P
->Set phantom to TRUE or FALSE.</P
-></DD
-><DT
->PRIM_POSITION</DT
-><DD
-><P
->Sets the position with a vector.</P
-></DD
-><DT
->PRIM_SIZE</DT
-><DD
-><P
->Sets the size with a vector.</P
-></DD
-><DT
->PRIM_ROTATION</DT
-><DD
-><P
->Sets the rotation with a rotation.</P
-></DD
-><DT
->PRIM_TEXTURE</DT
-><DD
-><P
->Followed by an integer face, key id, vector repeats, vector offsets, and float rotation in radians.</P
-></DD
-><DT
->PRIM_COLOR</DT
-><DD
-><P
->Followed by an integer face, vector color, and float alpha.</P
-></DD
-><DT
->PRIM_BUMP_SHINY</DT
-><DD
-><P
->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, PRIM_BUMP_WOOD, PRIM_BUMP_BARK,
-        PRIM_BUMP_BRICKS, PRIM_BUMP_CHECKER, PRIM_BUMP_CONCRETE, PRIM_BUMP_TILE, PRIM_BUMP_STONE, PRIM_BUMP_DISKS,
-        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
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6409"
->C.28. XML-RPC Constants</A
-></H2
-><P
->These constants are passed to the remote_data event: REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, and REMOTE_DATA_REPLY.</P
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6412"
->C.29. Permission Mask Constants</A
-></H2
-><P
->These MASK_* constants are used as arguments to <A
-HREF="#AEN2009"
->llGetObjectPermMask</A
-> and <A
-HREF="#AEN1801"
->llGetInventoryPermMask</A
->.  These functions return combinations of PERM_* constants.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Mask and Permission Constants</B
-></P
-><DL
-><DT
->MASK_BASE</DT
-><DD
-><P
->Specifies base permissions.  These permissions are identical to owner permissions except in the case that the object is locked.  When an object is locked, owner permissions are stripped of move/modify rights (thus, the 'locking').  On unlock, owner permissions revert back to base permissions.</P
-></DD
-><DT
->MASK_OWNER</DT
-><DD
-><P
->Specifies owner permissions.  These are never more permissive than base permissions.</P
-></DD
-><DT
->MASK_GROUP</DT
-><DD
-><P
->Specifies group permissions.  These are never more permissive than owner permissions.</P
-></DD
-><DT
->MASK_EVERYONE</DT
-><DD
-><P
->Specifies everyone permissions.  These are never more permissive than owner permissions.</P
-></DD
-><DT
->MASK_NEXT</DT
-><DD
-><P
->Specifies next owner permissions.  These are never more permissive than base permissions.</P
-></DD
-><DT
->PERM_MOVE</DT
-><DD
-><P
->Set if movement is allowed.</P
-></DD
-><DT
->PERM_MODIFY</DT
-><DD
-><P
->Set if modification is allowed.</P
-></DD
-><DT
->PERM_COPY</DT
-><DD
-><P
->Set if copying is allowed.</P
-></DD
-><DT
->PERM_TRANSFER</DT
-><DD
-><P
->Set if transfers are allowed.</P
-></DD
-><DT
->PERM_ALL</DT
-><DD
-><P
->This is returned if all other PERM_* are set.</P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6459"
->C.30. Parcel Media Constants</A
-></H2
-><P
->These constants are passed to the <A
-HREF="#AEN3031"
->llParcelMediaCommand</A
-> to control playback of movies and other multimedia within a land parcel.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Parcel Media Constants</B
-></P
-><DL
-><DT
->PARCEL_MEDIA_COMMAND_STOP</DT
-><DD
-><P
->Stop the media stream and go back to the first frame.</P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_PAUSE</DT
-><DD
-><P
->Pause the media stream (stop playing but stay on current frame).</P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_PLAY</DT
-><DD
-><P
->Start the media stream playing from the current frame and stop when the end is reached.</P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_LOOP_SET</DT
-><DD
-><P
->Used to get or set the parcel's media looping variable.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_TEXTURE</DT
-><DD
-><P
->Use this to get or set the parcel's media texture.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_URL</DT
-><DD
-><P
->Used to get or set the parcel's media url.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_TYPE</DT
-><DD
-><P
->Used to get or set the parcel's media mimetype.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_DESC</DT
-><DD
-><P
->Used to get or set the parcel's media description.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_SIZE</DT
-><DD
-><P
->Used to get or set the parcel's media pixel size.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_TIME</DT
-><DD
-><P
->Move a media stream to a specific time.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_AGENT</DT
-><DD
-><P
->Applies the media command to the specified agent only.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_UNLOAD</DT
-><DD
-><P
->Completely unloads the movie and restores the original texture.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_AUTO_ALIGN</DT
-><DD
-><P
->Sets the parcel option 'Auto scale content'.
-        </P
-></DD
-><DT
->PARCEL_MEDIA_COMMAND_LOOP</DT
-><DD
-><P
->This command has been depricated in favor of the PARCEL_MEDIA_COMMAND_LOOP_SET above.
-        </P
-></DD
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="section"
-><HR><H2
-CLASS="section"
-><A
-NAME="AEN6521"
->C.31. Click Action Constants</A
-></H2
-><P
->These constants are passed to <A
-HREF="#AEN3791"
->llSetClickAction</A
-> to define default behavior when a resident clicks upon a prim.</P
-><P
-></P
-><DIV
-CLASS="variablelist"
-><P
-><B
->Click Action Constants</B
-></P
-><DL
-><DT
->CLICK_ACTION_NONE</DT
-><DD
-><P
->Disables the click action for this prim.</P
-></DD
-><DT
->CLICK_ACTION_TOUCH</DT
-><DD
-><P
->Sets the click-action behavior of this prim to touch.</P
-></DD
-><DT
->CLICK_ACTION_SIT</DT
-><DD
-><P
->Sets the click-action behavior of this prim to sit.</P
-></DD
-><DT
->CLICK_ACTION_BUY</DT
-><DD
-><P
->Sets the click-action behavior of this prim to buy.</P
-></DD
-><DT
->CLICK_ACTION_PAY</DT
-><DD
-><P
->Sets the click-action behavior of this prim to pay.</P
-></DD
-><DT
->CLICK_ACTION_OPEN</DT
-><DD
-><P
->Sets the click-action behavior of this prim to open.</P
-></DD
-><DT
->CLICK_ACTION_PLAY</DT
-><DD
-><P
->Sets the click-action behavior of this prim to play.</P
-></DD
-><DT
->CLICK_ACTION_OPEN_MEDIA</DT
-><DD
-><P
->Sets the click-action behavior of this prim to open-media.</P
-></DD
-><DT
->CLICK_ACTION_SIT</DT
-><DD
-><P
->Sets the click-action behavior of this prim to sit.</P
-></DD
-><DT
->CLICK_ACTION_SIT</DT
-><DD
-><P
->Sets the click-action behavior of this prim to sit.</P
-></DD
-></DL
-></DIV
-></DIV
-></DIV
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/linden/indra/newview/macmain.h b/linden/indra/newview/macmain.h
index 941766e..c91b232 100644
--- a/linden/indra/newview/macmain.h
+++ b/linden/indra/newview/macmain.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/macutil_Prefix.h b/linden/indra/newview/macutil_Prefix.h
index 81918f3..cdc000f 100644
--- a/linden/indra/newview/macutil_Prefix.h
+++ b/linden/indra/newview/macutil_Prefix.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/macview_Prefix.h b/linden/indra/newview/macview_Prefix.h
index d71dc38..88aecda 100644
--- a/linden/indra/newview/macview_Prefix.h
+++ b/linden/indra/newview/macview_Prefix.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/noise.cpp b/linden/indra/newview/noise.cpp
index 6b8a9b4..4086ea8 100644
--- a/linden/indra/newview/noise.cpp
+++ b/linden/indra/newview/noise.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/noise.h b/linden/indra/newview/noise.h
index dad239c..cc14452 100644
--- a/linden/indra/newview/noise.h
+++ b/linden/indra/newview/noise.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index e7db166..0406520 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -220,6 +220,7 @@ void display_update_camera();
 
 S32             LLPipeline::sCompiles = 0;
 
+BOOL    LLPipeline::sPickAvatar = TRUE;
 BOOL    LLPipeline::sDynamicLOD = TRUE;
 BOOL    LLPipeline::sShowHUDAttachments = TRUE;
 BOOL    LLPipeline::sRenderPhysicalBeacons = TRUE;
@@ -330,8 +331,15 @@ void LLPipeline::init()
         mRenderDebugFeatureMask = 0xffffffff; // All debugging features on
         mRenderDebugMask = 0;   // All debug starts off
 
+        // Don't turn on ground when this is set
+        // Mac Books with intel 950s need this
+        if(!gSavedSettings.getBOOL("RenderGround"))
+        {
+                toggleRenderType(RENDER_TYPE_GROUND);
+        }
+
         mOldRenderDebugMask = mRenderDebugMask;
-        
+
         mBackfaceCull = TRUE;
 
         stop_glerror();
@@ -454,7 +462,7 @@ void LLPipeline::resizeScreenTexture()
                 }
         
                 mScreen.release();
-                mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);          
+                mScreen.allocate(resX, resY, GL_RGBA, TRUE, LLTexUnit::TT_RECT_TEXTURE);                
 
                 llinfos << "RESIZED SCREEN TEXTURE: " << resX << "x" << resY << llendl;
         }
@@ -556,7 +564,7 @@ void LLPipeline::createGLBuffers()
 
                         for (U32 j = 0; j < 3; j++)
                         {
-                                glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mBlurCubeTexture[j]);
+                                gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_CUBE_MAP, mBlurCubeTexture[j]);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                                 glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -583,10 +591,11 @@ void LLPipeline::createGLBuffers()
                         mGlow[i].allocate(512,glow_res,GL_RGBA,FALSE);
                 }
                 
+
                 GLuint resX = gViewerWindow->getWindowDisplayWidth();
                 GLuint resY = gViewerWindow->getWindowDisplayHeight();
-                
-                mScreen.allocate(resX, resY, GL_RGBA, TRUE, GL_TEXTURE_RECTANGLE_ARB);
+        
+                mScreen.allocate(resX, resY, GL_RGBA, TRUE, LLTexUnit::TT_RECT_TEXTURE);
         }
 }
 
@@ -1212,7 +1221,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
         LLVertexBuffer::unbind();
         LLGLDisable blend(GL_BLEND);
         LLGLDisable test(GL_ALPHA_TEST);
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.setColorMask(false, false);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
@@ -1357,7 +1366,7 @@ void LLPipeline::doOcclusion(LLCamera& camera)
         }
         LLGLDisable blend(GL_BLEND);
         LLGLDisable test(GL_ALPHA_TEST);
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 
         if (LLPipeline::sUseOcclusion > 1)
@@ -2334,7 +2343,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 }
         }
 
-        
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:ForceVBO");
         
         //by bao
         //fake vertex buffer updating
@@ -2368,7 +2377,7 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 sUnderWaterRender = FALSE;
         }
 
-        LLViewerImage::sDefaultImagep->bind(0);
+        gGL.getTexUnit(0)->bind(LLViewerImage::sDefaultImagep);
         LLViewerImage::sDefaultImagep->setClamp(FALSE, FALSE);
         
         //////////////////////////////////////////////
@@ -2381,12 +2390,16 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         
         U32 cur_type = 0;
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPools");
+        
         if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_PICKING))
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderForSelect");
                 gObjectList.renderObjectsForSelect(camera, gViewerWindow->getVirtualWindowRect());
         }
         else if (gSavedSettings.getBOOL("RenderDeferred"))
         {
+                LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDeferred");
                 renderGeomDeferred();
         }
         else
@@ -2474,6 +2487,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                         stop_glerror();
                 }
         }
+        
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDrawPoolsEnd");
 
         LLVertexBuffer::unbind();
         LLGLState::checkStates();
@@ -2497,6 +2512,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         LLGLState::checkTextureChannels();
         LLGLState::checkClientArrays();
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderHighlights");
+
         if (!sReflectionRender)
         {
                 renderHighlights();
@@ -2506,6 +2523,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
         // have touch-handlers.
         mHighlightFaces.clear();
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderDebug");
+        
         renderDebug();
 
         LLVertexBuffer::unbind();
@@ -2518,6 +2537,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
                 gObjectList.resetObjectBeacons();
         }
 
+        LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
+
         //HACK: preserve/restore matrices around HUD render
         if (gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_HUD))
         {
@@ -2604,11 +2625,11 @@ void LLPipeline::renderDebug()
                 // Debug composition layers
                 F32 x, y;
 
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 if (gAgent.getRegion())
                 {
-                        gGL.begin(LLVertexBuffer::POINTS);
+                        gGL.begin(LLRender::POINTS);
                         // Draw the composition layer for the region that I'm in.
                         for (x = 0; x <= 260; x++)
                         {
@@ -2654,6 +2675,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
 
         LLGLSDefault gls_default;
         LLGLSObjectSelect gls_object_select;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         LLGLDepthTest gls_depth(GL_TRUE,GL_TRUE);
         disableLights();
         
@@ -3101,7 +3123,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
                 camera_rot.invert();
                 LLVector4 light_pos = light_pos_cam * camera_rot;
                 
-                light_pos.normVec();
+                light_pos.normalize();
 
                 mHWLightColors[1] = diffuse;
                 glLightfv(GL_LIGHT1, GL_DIFFUSE,  diffuse.mV);
@@ -3119,7 +3141,7 @@ void LLPipeline::setupAvatarLights(BOOL for_edit)
                 LLVector3 opposite_pos = -1.f * mSunDir;
                 LLVector3 orthog_light_pos = mSunDir % LLVector3::z_axis;
                 LLVector4 backlight_pos = LLVector4(lerp(opposite_pos, orthog_light_pos, 0.3f), 0.0f);
-                backlight_pos.normVec();
+                backlight_pos.normalize();
                         
                 LLColor4 light_diffuse = mSunDiffuse;
                 LLColor4 backlight_diffuse(1.f - light_diffuse.mV[VRED], 1.f - light_diffuse.mV[VGREEN], 1.f - light_diffuse.mV[VBLUE], 1.f);
@@ -3458,7 +3480,7 @@ void LLPipeline::setupHWLights(LLDrawPool* pool)
                         atten = x / (light_radius); // % of brightness at radius
                         quad = 0.0f;
                 }
-                //mHWLightColors[cur_light] = light_color;
+                mHWLightColors[2] = light_color;
                 S32 gllight = GL_LIGHT2;
                 glLightfv(gllight, GL_POSITION, light_pos_gl.mV);
                 glLightfv(gllight, GL_DIFFUSE,  light_color.mV);
@@ -3999,6 +4021,7 @@ BOOL LLPipeline::getRenderHighlights(void*)
 }
 
 LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+                                                                                                                BOOL pick_transparent,                                                                                          
                                                                                                                 S32* face_hit,
                                                                                                                 LLVector3* intersection,         // return the intersection point
                                                                                                                 LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -4008,6 +4031,12 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 {
         LLDrawable* drawable = NULL;
 
+        LLVector3 local_end = end;
+
+        LLVector3 position;
+
+        sPickAvatar = FALSE; //LLToolMgr::getInstance()->inBuildMode() ? FALSE : TRUE;
+        
         for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
                         iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
         {
@@ -4015,24 +4044,124 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start,
 
                 for (U32 j = 0; j < LLViewerRegion::NUM_PARTITIONS; j++)
                 {
-                        if ((j == LLViewerRegion::PARTITION_VOLUME) || (j == LLViewerRegion::PARTITION_BRIDGE))  // only check these partitions for now
+                        if ((j == LLViewerRegion::PARTITION_VOLUME) || 
+                                (j == LLViewerRegion::PARTITION_BRIDGE) || 
+                                (j == LLViewerRegion::PARTITION_TERRAIN) ||
+                                (j == LLViewerRegion::PARTITION_TREE) ||
+                                (j == LLViewerRegion::PARTITION_GRASS))  // only check these partitions for now
                         {
                                 LLSpatialPartition* part = region->getSpatialPartition(j);
-                                if (part)
+                                if (part && hasRenderType(part->mDrawableType))
                                 {
-                                        LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+                                        LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, face_hit, &position, tex_coord, normal, bi_normal);
                                         if (hit)
                                         {
                                                 drawable = hit;
+                                                local_end = position;                                           
+                                        }
+                                }
+                        }
+                }
+        }
+        
+        if (!sPickAvatar)
+        {
+                //save hit info in case we need to restore
+                //due to attachment override
+                LLVector3 local_normal;
+                LLVector3 local_binormal;
+                LLVector2 local_texcoord;
+                S32 local_face_hit = -1;
+
+                if (face_hit)
+                { 
+                        local_face_hit = *face_hit;
+                }
+                if (tex_coord)
+                {
+                        local_texcoord = *tex_coord;
+                }
+                if (bi_normal)
+                {
+                        local_binormal = *bi_normal;
+                }
+                if (normal)
+                {
+                        local_normal = *normal;
+                }
+                                
+                const F32 ATTACHMENT_OVERRIDE_DIST = 0.1f;
+
+                //check against avatars
+                sPickAvatar = TRUE;
+                for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
+                                iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+                {
+                        LLViewerRegion* region = *iter;
+
+                        LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_BRIDGE);
+                        if (part && hasRenderType(part->mDrawableType))
+                        {
+                                LLDrawable* hit = part->lineSegmentIntersect(start, local_end, pick_transparent, face_hit, &position, tex_coord, normal, bi_normal);
+                                if (hit)
+                                {
+                                        if (!drawable || 
+                                                !drawable->getVObj()->isAttachment() ||
+                                                (position-local_end).magVec() > ATTACHMENT_OVERRIDE_DIST)
+                                        { //avatar overrides if previously hit drawable is not an attachment or 
+                                          //attachment is far enough away from detected intersection
+                                                drawable = hit;
+                                                local_end = position;                                           
+                                        }
+                                        else
+                                        { //prioritize attachments over avatars
+                                                position = local_end;
+
+                                                if (face_hit)
+                                                {
+                                                        *face_hit = local_face_hit;
+                                                }
+                                                if (tex_coord)
+                                                {
+                                                        *tex_coord = local_texcoord;
+                                                }
+                                                if (bi_normal)
+                                                {
+                                                        *bi_normal = local_binormal;
+                                                }
+                                                if (normal)
+                                                {
+                                                        *normal = local_normal;
+                                                }
                                         }
                                 }
                         }
                 }
         }
+
+        //check all avatar nametags (silly, isn't it?)
+        for (std::vector< LLCharacter* >::iterator iter = LLCharacter::sInstances.begin();
+                iter != LLCharacter::sInstances.end();
+                ++iter)
+        {
+                LLVOAvatar* av = (LLVOAvatar*) *iter;
+                if (av->mNameText.notNull() && av->mNameText->lineSegmentIntersect(start, local_end, position))
+                {
+                        drawable = av->mDrawable;
+                        local_end = position;
+                }
+        }
+
+        if (intersection)
+        {
+                *intersection = position;
+        }
+
         return drawable ? drawable->getVObj().get() : NULL;
 }
 
 LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+                                                                                                          BOOL pick_transparent,                                                                                                        
                                                                                                           S32* face_hit,
                                                                                                           LLVector3* intersection,         // return the intersection point
                                                                                                           LLVector2* tex_coord,            // return the texture coordinates of the intersection point
@@ -4047,15 +4176,27 @@ LLViewerObject* LLPipeline::lineSegmentIntersectInHUD(const LLVector3& start, co
         {
                 LLViewerRegion* region = *iter;
 
+                BOOL toggle = FALSE;
+                if (!hasRenderType(LLPipeline::RENDER_TYPE_HUD))
+                {
+                        toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+                        toggle = TRUE;
+                }
+
                 LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_HUD);
                 if (part)
                 {
-                        LLDrawable* hit = part->lineSegmentIntersect(start, end, face_hit, intersection, tex_coord, normal, bi_normal);
+                        LLDrawable* hit = part->lineSegmentIntersect(start, end, pick_transparent, face_hit, intersection, tex_coord, normal, bi_normal);
                         if (hit)
                         {
                                 drawable = hit;
                         }
                 }
+
+                if (toggle)
+                {
+                        toggleRenderType(LLPipeline::RENDER_TYPE_HUD);
+                }
         }
         return drawable ? drawable->getVObj().get() : NULL;
 }
@@ -4209,7 +4350,8 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
 
         LLPipeline::sReflectionRender = TRUE;
 
-        cube_map->bind();
+        gGL.getTexUnit(cube_map->getStage())->bind(cube_map);
+        gGL.getTexUnit(0)->activate();
         GLint width;
         glGetTexLevelParameteriv(GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, 0, GL_TEXTURE_WIDTH, &width);
         if (width != res)
@@ -4221,8 +4363,10 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
                         glTexImage2D(gl_cube_face[i], 0, GL_RGBA, res, res, 0, GL_RGBA, GL_FLOAT, NULL); 
                 }
         }
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
-        cube_map->disable();
+        gGL.getTexUnit(cube_map->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
+        gGL.getTexUnit(cube_map->getStage())->disable();
+        gGL.getTexUnit(0)->activate();
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
         BOOL toggle_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI);
         if (toggle_ui)
@@ -4266,7 +4410,7 @@ void LLPipeline::generateReflectionMap(LLCubeMap* cube_map, LLCamera& cube_cam)
         gPipeline.calcNearbyLights(cube_cam);
 
         stop_glerror();
-        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mCubeFrameBuffer);
         glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
                                                                                 GL_RENDERBUFFER_EXT, mCubeDepth);               
@@ -4422,7 +4566,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
         glPushMatrix();
 
         cube_out->enableTexture(0);
-        cube_out->bind();
+        gGL.getTexUnit(cube_out->getStage())->bind(cube_out);
+        gGL.getTexUnit(0)->activate();
         GLint width;
         glGetTexLevelParameteriv(GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, 0, GL_TEXTURE_WIDTH, &width);
         if (width != res)
@@ -4434,8 +4579,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
                         glTexImage2D(gl_cube_face[i], 0, GL_RGBA, res, res, 0, GL_RGBA, GL_FLOAT, NULL); 
                 }
         }
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
-
+        gGL.getTexUnit(cube_out->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
+        gGL.getTexUnit(0)->activate();
         glViewport(0, 0, res, res);
         LLGLEnable blend(GL_BLEND);
         
@@ -4463,16 +4608,17 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
 
                 if (j == 0)
                 {
-                        cube_in->bind();
+                        gGL.getTexUnit(cube_in->getStage())->bind(cube_in);
                 }
                 else
                 {
-                        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, mBlurCubeTexture[j-1]);
+                        gGL.getTexUnit(cube_in->getStage())->bindManual(LLTexUnit::TT_CUBE_MAP, mBlurCubeTexture[j-1]);
                 }
+                gGL.getTexUnit(0)->activate();
 
                 stop_glerror();
 
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, mBlurCubeBuffer[j]);
                 stop_glerror();
 
@@ -4501,7 +4647,7 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
 
         stop_glerror();
 
-        glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, 0);
+        gGL.getTexUnit(cube_in->getStage())->unbind(LLTexUnit::TT_CUBE_MAP);
         
         glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
         gGL.setColorMask(true, false);
@@ -4510,7 +4656,8 @@ void LLPipeline::blurReflectionMap(LLCubeMap* cube_in, LLCubeMap* cube_out)
         glMatrixMode(GL_MODELVIEW);
         glPopMatrix();
 
-        cube_in->disableTexture();
+        gGL.getTexUnit(cube_in->getStage())->disable();
+        gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
         gViewerWindow->setupViewport();
         gGL.setSceneBlendType(LLRender::BT_ALPHA);
 
@@ -4578,7 +4725,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
         if (for_snapshot)
         {
-                mGlow[1].bindTexture();
+                gGL.getTexUnit(0)->bind(&mGlow[1]);
                 {
                         //LLGLEnable stencil(GL_STENCIL_TEST);
                         //glStencilFunc(GL_NOTEQUAL, 255, 0xFFFFFFFF);
@@ -4587,7 +4734,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         LLGLEnable blend(GL_BLEND);
                         gGL.setSceneBlendType(LLRender::BT_ADD);
                         tc2.setVec(1,1);                                
-                        gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                        gGL.begin(LLRender::TRIANGLE_STRIP);
                         gGL.color4f(1,1,1,1);
                         gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                         gGL.vertex2f(-1,-1);
@@ -4637,15 +4784,15 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 LLGLEnable test(GL_ALPHA_TEST);
                 gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
                 gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
                 
-                glDisable(GL_TEXTURE_2D);
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
-                mScreen.bindTexture();
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);               
+                gGL.getTexUnit(0)->disable();
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
+                gGL.getTexUnit(0)->bind(&mScreen);
 
                 gGL.color4f(1,1,1,1);
                 gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
                 gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                 gGL.vertex2f(-1,-1);
                 
@@ -4659,8 +4806,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 gGL.vertex2f(1,1);
                 gGL.end();
                 
-                glEnable(GL_TEXTURE_2D);
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
                 mGlow[2].flush();
         }
@@ -4690,7 +4836,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
         for (S32 i = 0; i < kernel; i++)
         {
-                LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 {
                         LLFastTimer ftm(LLFastTimer::FTM_RENDER_BLOOM_FBO);
                         mGlow[i%2].bindTarget();
@@ -4699,11 +4845,11 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         
                 if (i == 0)
                 {
-                        mGlow[2].bindTexture();
+                        gGL.getTexUnit(0)->bind(&mGlow[2]);
                 }
                 else
                 {
-                        mGlow[(i-1)%2].bindTexture();
+                        gGL.getTexUnit(0)->bind(&mGlow[(i-1)%2]);
                 }
 
                 if (i%2 == 0)
@@ -4715,7 +4861,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                         gGlowProgram.uniform2f("glowDelta", 0, delta);
                 }
 
-                gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
+                gGL.begin(LLRender::TRIANGLE_STRIP);
                 gGL.texCoord2f(tc1.mV[0], tc1.mV[1]);
                 gGL.vertex2f(-1,-1);
                 
@@ -4780,8 +4926,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
                 LLGLEnable blend(GL_BLEND);
                 gGL.blendFunc(GL_ONE, GL_ONE);
 
-                glDisable(GL_TEXTURE_2D);
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->disable();
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_RECT_TEXTURE);
                 mScreen.bindTexture();
                 
                 gGL.begin(LLVertexBuffer::TRIANGLE_STRIP);
@@ -4801,8 +4947,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 gGL.flush();
                 
-                glEnable(GL_TEXTURE_2D);
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
 
                 gGL.blendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         }*/
@@ -4847,12 +4992,12 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 //tex unit 0
                 gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_TEX_COLOR);
-                
-                mGlow[1].bindTexture();
+        
+                gGL.getTexUnit(0)->bind(&mGlow[1]);
                 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
                 glTexCoordPointer(2, GL_FLOAT, 0, uv0);
                 gGL.getTexUnit(1)->activate();
-                glEnable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(1)->enable(LLTexUnit::TT_RECT_TEXTURE);
                 
                 //tex unit 1
                 gGL.getTexUnit(1)->setTextureColorBlend(LLTexUnit::TBO_ADD, LLTexUnit::TBS_TEX_COLOR, LLTexUnit::TBS_PREV_COLOR);
@@ -4863,14 +5008,16 @@ void LLPipeline::renderBloom(BOOL for_snapshot)
 
                 glVertexPointer(2, GL_FLOAT, 0, v);
                 
-                mScreen.bindTexture();
+                gGL.getTexUnit(1)->bind(&mScreen);
+                gGL.getTexUnit(1)->activate();
                 
                 LLGLEnable multisample(GL_MULTISAMPLE_ARB);
                 glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
                 
-                glDisable(GL_TEXTURE_RECTANGLE_ARB);
+                gGL.getTexUnit(1)->disable();
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
                 gGL.getTexUnit(1)->setTextureBlendType(LLTexUnit::TB_MULT);
+
                 glClientActiveTextureARB(GL_TEXTURE0_ARB);
                 gGL.getTexUnit(0)->activate();
                 glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -4948,7 +5095,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
                 if (!LLViewerCamera::getInstance()->cameraUnderWater())
                 {       //generate planar reflection map
-                        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         glClearColor(0,0,0,0);
                         gGL.setColorMask(true, true);
                         mWaterRef.bindTarget();
@@ -5053,7 +5200,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                         }
                         LLViewerCamera::updateFrustumPlanes(camera);
 
-                        LLViewerImage::unbindTexture(0, GL_TEXTURE_2D);
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         LLColor4& col = LLDrawPoolWater::sWaterFogColor;
                         glClearColor(col.mV[0], col.mV[1], col.mV[2], 0.f);
                         gGL.setColorMask(true, true);
@@ -5185,11 +5332,11 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
         LLVector3 left = camera.getLeftAxis();
         left *= left;
-        left.normVec();
+        left.normalize();
 
         LLVector3 up = camera.getUpAxis();
         up *= up;
-        up.normVec();
+        up.normalize();
 
         tdim.mV[0] = fabsf(half_height * left);
         tdim.mV[1] = fabsf(half_height * up);
@@ -5230,10 +5377,10 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 resY != avatar->mImpostor.getHeight())
         {
                 avatar->mImpostor.allocate(resX,resY,GL_RGBA,TRUE);
-                avatar->mImpostor.bindTexture();
+                gGL.getTexUnit(0)->bind(&avatar->mImpostor);
                 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);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         }
 
         {
@@ -5270,13 +5417,13 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
                 }
                 
                 gGL.setSceneBlendType(LLRender::BT_ADD);
-                LLImageGL::unbindTexture(0, GL_TEXTURE_2D);
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 LLGLDepthTest depth(GL_FALSE, GL_FALSE);
 
                 gGL.color4f(1,1,1,1);
                 gGL.color4ub(64,64,64,255);
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 gGL.vertex3fv((pos+left-up).mV);
                 gGL.vertex3fv((pos-left-up).mV);
                 gGL.vertex3fv((pos-left+up).mV);
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index 5f94e37..e57ad7e 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -131,6 +131,7 @@ public:
                 
         //get the object between start and end that's closest to start.
         LLViewerObject* lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end,
+                                                                                                BOOL pick_transparent,
                                                                                                 S32* face_hit,                          // return the face hit
                                                                                                 LLVector3* intersection = NULL,         // return the intersection point
                                                                                                 LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -138,6 +139,7 @@ public:
                                                                                                 LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point  
                 );
         LLViewerObject* lineSegmentIntersectInHUD(const LLVector3& start, const LLVector3& end,
+                                                                                          BOOL pick_transparent,
                                                                                           S32* face_hit,                          // return the face hit
                                                                                           LLVector3* intersection = NULL,         // return the intersection point
                                                                                           LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
@@ -317,7 +319,6 @@ public:
 //              RENDER_DEBUG_FEATURE_HW_LIGHTING                = 0x0010,
                 RENDER_DEBUG_FEATURE_FLEXIBLE                   = 0x0010,
                 RENDER_DEBUG_FEATURE_FOG                                = 0x0020,
-                RENDER_DEBUG_FEATURE_PALETTE                    = 0x0040,
                 RENDER_DEBUG_FEATURE_FR_INFO                    = 0x0080,
                 RENDER_DEBUG_FEATURE_FOOT_SHADOWS               = 0x0100,
         };
@@ -382,6 +383,7 @@ public:
         static BOOL                             sSkipUpdate; //skip lod updates
         static BOOL                             sWaterReflections;
         static BOOL                             sDynamicLOD;
+        static BOOL                             sPickAvatar;
         static BOOL                             sReflectionRender;
         static BOOL                             sImpostorRender;
         static BOOL                             sUnderWaterRender;
diff --git a/linden/indra/newview/randgauss.h b/linden/indra/newview/randgauss.h
index ab2b07c..52d73d5 100644
--- a/linden/indra/newview/randgauss.h
+++ b/linden/indra/newview/randgauss.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2003&license=viewergpl$
  * 
- * Copyright (c) 2003-2008, Linden Research, Inc.
+ * Copyright (c) 2003-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/res/resource.h b/linden/indra/newview/res/resource.h
index 9fcfa21..cfa014a 100644
--- a/linden/indra/newview/res/resource.h
+++ b/linden/indra/newview/res/resource.h
@@ -3,7 +3,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 002830a..e0cde48 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -231,8 +231,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,20,9,87416
- PRODUCTVERSION 1,20,9,87416
+ FILEVERSION 1,20,15,97417
+ PRODUCTVERSION 1,20,15,97417
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/linden/indra/newview/secondlife setup build dazzle.bat b/linden/indra/newview/secondlife setup build dazzle.bat
deleted file mode 100644
index f09f657..0000000
--- a/linden/indra/newview/secondlife setup build dazzle.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@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/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index ab72b30..68b4507 100644
--- a/linden/indra/newview/skins/default/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <alerts>
         <global name="skipnexttime">
                 Nicht mehr anzeigen
@@ -58,8 +58,7 @@
                         Verbindung mit [SECOND_LIFE] nicht möglich.
 Möglicherweise handelt es sich um einen Systemausfall.
 
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -141,9 +140,7 @@ Sie finden es in der Webpage Studio-Ausstellung.
         </alert>
         <alert name="GrantModifyRights">
                 <message name="message">
-                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen,
-JEDES BELIEBIGE Objekt zu ändern oder an sich zu nehmen, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen
-dieser Erlaubnis.
+                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen, JEDES BELIEBIGE Objekt zu ändern oder an sich zu nehmen, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen dieser Erlaubnis.
 Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?
                 </message>
                 <option name="Yes">
@@ -155,9 +152,7 @@ Möchten Sie [FIRST_NAME] [LAST_NAME] Änderungsrechte gewähren?
         </alert>
         <alert name="GrantModifyRightsMultiple">
                 <message name="message">
-                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen, 
-JEDES BELIEBIGE Objekt zu ändern, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen 
-dieser Erlaubnis.
+                        Die Gewährung von Änderungsrechten an andere Einwohner ermöglicht es diesen, JEDES BELIEBIGE Objekt zu ändern, das Sie in der Second Life-Welt besitzen. Seien Sie SEHR vorsichtig beim Erteilen dieser Erlaubnis.
 Möchten Sie den ausgewählten Einwohnern Änderungsrechte gewähren?
                 </message>
                 <option name="Yes">
@@ -232,8 +227,7 @@ Möchten Sie den ausgewählten Einwohnern Änderungsrechte gewähren?
         <alert name="CreateGroupCanAfford">
                 <message name="message">
                         Das Erstellen einer Gruppe kostet [COST] L$.
-Damit die Gruppe länger als drei Tage bestehen bleibt,
-muss sie aus mindestens zwei Mitgliedern bestehen.
+Damit die Gruppe länger als drei Tage bestehen bleibt, muss sie aus mindestens zwei Mitgliedern bestehen.
  
 Gruppe gründen?
                 </message>
@@ -257,8 +251,7 @@ Sie haben nicht genug L$, um eine Gruppe zu erstellen.
         </alert>
         <alert name="GroupNameUsesReservedWord">
                 <message name="message">
-                        Der Gruppenname enthält ein unerwünschtes Wort. Bitte
-wählen Sie einen anderen Namen.
+                        Der Gruppenname enthält ein unerwünschtes Wort. Bitte wählen Sie einen anderen Namen.
                 </message>
         </alert>
         <alert name="MustSpecifyGroupNoticeSubject">
@@ -294,8 +287,7 @@ Möchten Sie fortfahren?
         </alert>
         <alert name="AssignDangerousActionWarning">
                 <message name="message">
-                        Sie sind im Begriff, der Rolle &apos;[ROLE_NAME]&apos; die Fähigkeit 
-&apos;[ACTION_NAME]&apos; zuzuweisen.
+                        Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen.
  
  *ACHTUNG*
  Mitglieder in einer Rolle mit dieser Fähigkeit können sich selbst -
@@ -304,7 +296,7 @@ Möchten Sie fortfahren?
  Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit
  verleihen.
  
-Der Rolle &apos;[ROLE_NAME]&apos; diese Fähigkeit zuweisen?
+Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
                 </message>
                 <option name="Yes">
                         Ja
@@ -315,15 +307,14 @@ Der Rolle &apos;[ROLE_NAME]&apos; diese Fähigkeit zuweisen?
         </alert>
         <alert name="AssignDangerousAbilityWarning">
                 <message name="message">
-                        Sie sind im Begriff, der Rolle &apos;[ROLE_NAME]&apos; die Fähigkeit 
-&apos;[ACTION_NAME]&apos; zuzuweisen.
+                        Sie sind im Begriff, der Rolle „[ROLE_NAME]“ die Fähigkeit „[ACTION_NAME]“ zuzuweisen.
  
  *ACHTUNG*
  Mitglieder in einer Rolle mit dieser Fähigkeit können sich selbst -
  und allen anderen Mitgliedern – alle Fähigkeiten zuweisen und
  damit fast Eigentümerrechte erreichen.
  
-Der Rolle &apos;[ROLE_NAME]&apos; diese Fähigkeit zuweisen?
+Der Rolle „[ROLE_NAME]“ diese Fähigkeit zuweisen?
                 </message>
                 <option name="Yes">
                         Ja
@@ -332,20 +323,19 @@ Der Rolle &apos;[ROLE_NAME]&apos; diese Fähigkeit zuweisen?
                         Nein
                 </option>
         </alert>
-        <alert name="ClickPublishHelpGroup">
-                <message name="message">
-                        Im Web veröffentlichen
-                </message>
-        </alert>
+        <alert name="ClickPublishHelpGroup"/>
         <alert name="ClickPublishHelpLand">
                 <message name="message">
-                        In Suche veröffentlichen
+                        Auswahl von „In Suche veröffentlichen“  
+Dieses Kontrollkästchen zeigt Folgendes an:
+- diese Parzelle in den Suchergebnissen
+- die öffentlichen Objekte dieser Parzelle
+- diese Parzelle in der Websuche
                 </message>
         </alert>
         <alert name="ClickPublishHelpLandDisabled">
                 <message name="message">
-                        Diese Parzelle kann nicht in der Suche angezeigt werden, da sie sich in
-einer Region befindet, die das verbietet.
+                        Diese Parzelle kann nicht in der Suche angezeigt werden, da sie sich in einer Region befindet, die das verbietet.
                 </message>
         </alert>
         <alert name="ClickPublishHelpPostcard">
@@ -355,7 +345,9 @@ einer Region befindet, die das verbietet.
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        In Suche anzeigen
+                        Auswahl von „In Suche anzeigen“ zeigt Folgendes an:
+- Ihr Profil in den Suchergebnissen
+- einen Link auf Ihr Profil in den öffentlichen Gruppenseiten
                 </message>
         </alert>
         <alert name="ClickPartnerHelpAvatar">
@@ -373,22 +365,22 @@ Die Second Life Website für weitere Informationen über Partnerschaften öffnen
         </alert>
         <alert name="ClickWebProfileHelpAvatar">
                 <message name="message">
-                        Wenn dieser Einwohner eine Webprofil-URL angegeben hat, können Sie:
-* Auf &apos;Laden&apos; klicken und die Seite im integrierten Browser anzuzeigen.
-* Auf Laden &gt; &apos;In externem Browser&apos; klicken, um die Seite extern anzeigen zu lassen.
-* Auf Laden &gt; &apos;Start URL&apos; klicken, um zum Webprofil des Benutzers zurückzukehren.
+                        Wenn dieser Einwohner einen Webprofil-URL angegeben hat, können Sie:
+ * Auf „Laden“ klicken und die Seite in dieser Web-Registerkarte anzeigen.
+ * Auf Laden &gt; „In externem Browser“ klicken und die Seite im Standard-Browser anzeigen.
+ * Auf Laden &gt; „Start-URL“ klicken und zum Webprofil des Bewohners zurückkehren.
  
-In Ihrem eigenen Profil können Sie jede beliebige URL als Ihr Webprofil eingeben und mit OK übernehmen.
-Wenn andere Einwohner Ihr Profil betrachten, können sie diese URL besuchen.
+In Ihrem eigenen Profil können Sie jeden beliebigen URL als Ihr Webprofil eingeben und mit OK übernehmen.
+Wenn sich andere Einwohner Ihr Profil ansehen, können sie diesen URL besuchen.
                 </message>
         </alert>
         <alert name="ClickWebProfileNoWebHelpAvatar">
                 <message name="message">
                         Wenn dieser Einwohner einen Webprofil-URL angegeben hat, können Sie:
- * Auf &apos;Öffnen&apos; klicken und die Seite im externen Browser anzeigen.
+ * Auf Laden klicken und die Seite im Standard-Browser anzeigen.
  
-In Ihrem Profil können Sie jeden URL als Webprofil festlegen.
-Bei Anzeige ihres Profils kann jeder Einwohner diesen URL öffnen.
+In Ihrem eigenen Profil können Sie jeden beliebigen URL als Ihr Webprofil eingeben und mit OK übernehmen.
+Wenn sich andere Einwohner Ihr Profil ansehen, können sie diesen URL besuchen.
                 </message>
         </alert>
         <alert name="ReputationMinGreaterThanMax">
@@ -459,12 +451,12 @@ Fortfahren?
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
                         Der Beitritt zu dieser Gruppe kostet [COST] L$.
-Sie haben nicht genug Geld, um dieser Gruppe beizutreten.
+Sie haben nicht genug L$, um dieser Gruppe beizutreten.
                 </message>
         </alert>
         <alert name="LandBuyPass">
                 <message name="message">
-                        Sie können dieses Land (&apos;[PARCEL_NAME]&apos;) für [COST] L$
+                        Sie können dieses Land („[PARCEL_NAME]“) für [COST] L$
 [TIME] Stunden lang betreten.  Pass kaufen?
                 </message>
                 <option name="OK">
@@ -476,9 +468,7 @@ Sie haben nicht genug Geld, um dieser Gruppe beizutreten.
         </alert>
         <alert name="CannotStartAuctionAlreadyForSale">
                 <message name="message">
-                        Eine Parzelle, die bereits zum Verkauf freigegeben
-ist, kann nicht auktioniert werden. Brechen Sie zuerst den Landverkauf ab,
-wenn Sie eine Auktion starten möchten.
+                        Eine Parzelle, die bereits zum Verkauf freigegeben ist, kann nicht auktioniert werden. Brechen Sie zuerst den Landverkauf ab, wenn Sie eine Auktion starten möchten.
                 </message>
         </alert>
         <alert name="SalePriceRestriction">
@@ -501,7 +491,7 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
         </alert>
         <alert name="ConfirmLandSaleToAnyoneChange">
                 <message name="message">
-                        ACHTUNG: Wenn Sie auf &apos;An jeden verkaufen&apos; klicken, kann jeder in Second Life Ihr Land kaufen, auch Einwohner in anderen Regionen.
+                        ACHTUNG: Wenn Sie auf „An jeden verkaufen“ klicken, kann jeder in Second Life Ihr Land kaufen, auch Einwohner in anderen Regionen.
 
 Die ausgewählten [LAND_SIZE] qm Land werden zum Verkauf freigegeben.
 Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf an [NAME] autorisiert.
@@ -515,12 +505,9 @@ Der Verkaufspreis beträgt [SALE_PRICE] L$ und wird automatisch für den Verkauf
         </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
-                        Möchten Sie alle Ihre Objekte auf dieser Parzelle,
-die der Gruppe &apos;[NAME]&apos; gehören,
-zurück in das jeweilige Inventar ihrer vorherigen Eigentümer transferieren?
+                        Möchten Sie alle Ihre Objekte auf dieser Parzelle, die der Gruppe „[NAME]“ gehören, zurück in das jeweilige Inventar ihrer vorherigen Eigentümer transferieren?
  
-*WARNUNG* Alle nicht transferierbaren Objekte, die der
-Gruppe übertragen wurden, werden dabei gelöscht!
+*WARNUNG* Alle nicht transferierbaren Objekte, die der Gruppe übertragen wurden, werden dabei gelöscht!
  
 Objekte: [N]
                 </message>
@@ -533,9 +520,7 @@ Objekte: [N]
         </alert>
         <alert name="ReturnObjectsOwnedByUser">
                 <message name="message">
-                        Möchten Sie alle Objekte auf dieser Parzelle,
-die dem Einwohner &apos;[NAME]&apos; gehören,
-in das jeweilige Inventar ihrer Eigentümer transferieren?
+                        Möchten Sie alle Objekte auf dieser Parzelle, die dem Einwohner „[NAME]“ gehören, in das jeweilige Inventar ihrer Eigentümer transferieren?
  
 Objekte: [N]
                 </message>
@@ -548,9 +533,7 @@ Objekte: [N]
         </alert>
         <alert name="ReturnObjectsOwnedBySelf">
                 <message name="message">
-                        Möchten Sie alle Objekte
-auf dieser Parzelle, die Ihnen gehören, zurück in Ihr Inventar
-transferieren?
+                        Möchten Sie alle Objekte auf dieser Parzelle, die Ihnen gehören, zurück in Ihr Inventar transferieren?
  
 Objekte: [N]
                 </message>
@@ -563,13 +546,10 @@ Objekte: [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedBySelf">
                 <message name="message">
-                        Möchten Sie alle Objekte auf dieser Parzelle, die NICHT
-Ihnen gehören, in das Inventar ihrer Eigentümer transferieren?
-Transferierbare Objekte, die an eine Gruppe übertragen wurden,
-werden ihren vorherigen Eigentümern zurückgegeben.
+                        Möchten Sie alle Objekte auf dieser Parzelle, die NICHT Ihnen gehören, in das Inventar ihrer Eigentümer transferieren?
+Transferierbare Objekte, die an eine Gruppe übertragen wurden, werden ihren vorherigen Eigentümern zurückgegeben.
  
-*WARNUNG* Alle nicht transferierbaren Objekte, die der
-Gruppe übertragen wurden, werden dabei gelöscht!
+*WARNUNG* Alle nicht transferierbaren Objekte, die der Gruppe übertragen wurden, werden dabei gelöscht!
  
 Objekte: [N]
                 </message>
@@ -582,13 +562,10 @@ Objekte: [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedByUser">
                 <message name="message">
-                        Möchten Sie alle Objekte auf dieser Parzelle, die NICHT
-[NAME] gehören, in das Inventar ihrer Eigentümer transferieren?
-Transferierbare Objekte, die an eine Gruppe übertragen wurden,
-werden ihren vorherigen Eigentümern zurückgegeben.
+                        Möchten Sie alle Objekte auf dieser Parzelle, die NICHT [NAME] gehören, in das Inventar ihrer Eigentümer transferieren?
+Transferierbare Objekte, die an eine Gruppe übertragen wurden, werden ihren vorherigen Eigentümern zurückgegeben.
  
-*WARNUNG* Alle nicht transferierbaren Objekte, die der
-Gruppe übertragen wurden, werden dabei gelöscht!
+*WARNUNG* Alle nicht transferierbaren Objekte, die der Gruppe übertragen wurden, werden dabei gelöscht!
  
 Objekte: [N]
                 </message>
@@ -623,9 +600,7 @@ Objekte: [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedByGroup">
                 <message name="message">
-                        Objekte auf dieser Parzelle, die von der
-Gruppe [NAME] nicht gemeinsam genutzt werden,
-an ihre Eigentümer zurückgeben?
+                        Objekte auf dieser Parzelle, die von der Gruppe [NAME] nicht gemeinsam genutzt werden, an ihre Eigentümer zurückgeben?
  
 Objekte: [N]
                 </message>
@@ -645,13 +620,12 @@ Damit Waffen funktionieren, müssen Skripts erlaubt sein.
         </alert>
         <alert name="MustBeInParcel">
                 <message name="message">
-                        Sie müssen auf einer Landparzelle stehen,
-um ihren Landepunkt festzulegen.
+                        Sie müssen auf einer Landparzelle stehen, um ihren Landepunkt festzulegen.
                 </message>
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
-                        Geben Sie die E-Mail-Adresse des Empfängers ein.
+                        Bitte geben Sie für den/die Empfänger eine gültige Email-Adresse ein.
                 </message>
         </alert>
         <alert name="PromptSelfEmail">
@@ -711,14 +685,6 @@ Der Outfit-Ordner enthält keine Kleidung, Körperteile oder Anhänge.
                         Sie können das Objekt nicht anziehen, weil es noch nicht geladen wurde. Warten Sie kurz und versuchen Sie es dann noch einmal.
                 </message>
         </alert>
-        <alert name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        Sie benötigen ein Konto, um sich in [SECOND_LIFE] anmelden zu können.
-                </message>
-                <option name="OK">
-                        Schließen
-                </option>
-        </alert>
         <alert name="MustHaveAccountToLogIn">
                 <message name="message">
                         Hoppla! Da fehlt noch etwas.
@@ -735,13 +701,7 @@ Sie benötigen ein Benutzerkonto, um [SECOND_LIFE] betreten zu können. Möchten
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        Anzeigen erscheinen für eine Woche unter &apos;Anzeigen&apos;
-im Suchverzeichnis.
-Füllen Sie Ihre Anzeige aus und klicken Sie auf &apos;Veröffentlichen...&apos;, um sie zum
-Verzeichnis hinzuzufügen.
-Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf &apos;Veröffentlichen&apos; klicken.
-Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht,
-erscheint Ihre Anzeige weiter oben in der Liste.
+                        Anzeigen erscheinen für eine Woche unter „Anzeigen“ im Suchverzeichnis. Füllen Sie Ihre Anzeige aus und klicken Sie auf „Veröffentlichen...“, um sie zum Verzeichnis hinzuzufügen. Sie werden gebeten, einen Preis zu bezahlen, wenn Sie auf „Veröffentlichen“ klicken. Wenn Sie mehr bezahlen oder ein Benutzer nach Ihren Suchbegriffen sucht, erscheint Ihre Anzeige weiter oben in der Liste.
                 </message>
                 <option name="OK">
                         OK
@@ -755,7 +715,7 @@ erscheint Ihre Anzeige weiter oben in der Liste.
         </alert>
         <alert name="DeleteClassified">
                 <message name="message">
-                        Anzeige &apos;[NAME]&apos; löschen?
+                        Anzeige „[NAME]“ löschen?
 Gebühren werden nicht rückerstattet.
                 </message>
                 <option name="Delete">
@@ -792,9 +752,7 @@ Gebühren werden nicht rückerstattet.
         </alert>
         <alert name="DisplayChangeRestart">
                 <message name="message">
-                        Einige Änderungen der Bildschirmeinstellungen erfordern einen
-sofortigen Neustart von [SECOND_LIFE], wodurch
-alle laufenden Arbeiten verloren gehen.
+                        Einige Änderungen der Bildschirmeinstellungen erfordern einen sofortigen Neustart von [SECOND_LIFE], wodurch alle laufenden Arbeiten verloren gehen.
 
 Die Änderungen übernehmen und das Programm beenden?
                 </message>
@@ -838,7 +796,7 @@ Die Änderungen übernehmen und das Programm beenden?
         </alert>
         <alert name="ResetShowNextTimeDialogs">
                 <message name="message">
-                        Möchten Sie alle Popups wieder aktivieren, die Sie zuvor auf &apos;Nicht mehr anzeigen&apos; gesetzt haben?
+                        Möchten Sie alle Popups wieder aktivieren, die Sie zuvor auf „Nicht mehr anzeigen“ gesetzt haben?
                 </message>
                 <option name="OK">
                         OK
@@ -881,8 +839,7 @@ Hinweis: Der Cache wird dabei gelöscht/geleert.
         </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
-                        Zur [SECOND_LIFE]-Webseite, um Auktionen anzuzeigen oder
-ein Gebot abzugeben?
+                        Zur [SECOND_LIFE]-Webseite, um Auktionen anzuzeigen oder ein Gebot abzugeben?
                 </message>
                 <option name="GotoPage">
                         OK
@@ -1008,8 +965,7 @@ Möchten Sie diese Objekte löschen?
         </alert>
         <alert name="DisplaySettingsSafe">
                 <message name="message">
-                        Es wurden sichere Anzeige-Einstellungen gewählt,
-da die Option -safe verwendet wurde.
+                        Es wurden sichere Anzeige-Einstellungen gewählt, da die Option -safe verwendet wurde.
                 </message>
         </alert>
         <alert name="UnsupportedGLRequirements">
@@ -1023,9 +979,8 @@ Sollte das Problem fortbestehen, finden Sie weitere Hilfestellung unter: http://
                 <message name="message">
                         Achtung: Ihr System erfüllt nicht die Mindestanforderungen von Second Life. Dies kann eine schlechte Darstellungsleistung in Second Life zur Folge haben. Für nicht unterstützte Systemkonfigurationen bieten wir keinen technischen Support. 
 
-MINDESTANF.
-Die Seite [_URL] für
-weitere Informationen öffnen?
+MINSPECS
+Die Seite [_URL] für weitere Informationen öffnen?
                 </message>
                 <ignore name="ignore">
                         Bei Entdeckung nicht unterstützter Hardware
@@ -1069,8 +1024,7 @@ weitere Informationen öffnen?
                 <message name="message">
                         Ihr System verwendet eine uns zurzeit unbekannte Grafikkarte.  
 Dies ist häufig der Fall bei neuer Hardware, die wir noch nicht testen konnten. 
-Second Life funktioniert aller Voraussicht nach normal, möglicherweise 
-müssen Sie aber die Grafikeinstellungen anpassen.
+Second Life funktioniert aller Voraussicht nach normal, möglicherweise müssen Sie aber die Grafikeinstellungen anpassen.
 (Bearbeiten &gt; Einstellungen &gt; Grafik).
                 </message>
                 <ignore name="ignore">
@@ -1079,8 +1033,7 @@ müssen Sie aber die Grafikeinstellungen anpassen.
         </alert>
         <alert name="DisplaySettingsRecommended">
                 <message name="message">
-                        Es wurden die für Ihre Systemkonfiguration empfohlenen
-Anzeige-Einstellungen gewählt.
+                        Es wurden die für Ihre Systemkonfiguration empfohlenen Anzeige-Einstellungen gewählt.
                 </message>
                 <option name="OK">
                         OK
@@ -1092,7 +1045,7 @@ Anzeige-Einstellungen gewählt.
 Die Grafikqualität wird auf eine niedrige Stufe zurückgesetzt, um einige typische Treiberfehler zu vermeiden.
 Einige Grafikfunktionen werden ausgeschaltet.
 Wir empfehlen die Aktualisierung Ihrer Grafikkartentreiber.
-Sie können die Grafikqualität unter &apos;Einstellungen&apos; &gt; &apos;Grafik&apos; wieder erhöhen.
+Sie können die Grafikqualität unter „Einstellungen“ &gt; „Grafik“ wieder erhöhen.
                 </message>
         </alert>
         <alert name="CannotRequestDomain">
@@ -1104,10 +1057,8 @@ Folgende Domäne konnte nicht aufgelöst werden: [HOST]
         <alert name="CannotFindDomain">
                 <message name="message">
                         Der Server-Domänenname konnte nicht gefunden werden.
-Mögliche Ursachen sind der Verlust der Netzwerkverbindung
-oder ein Serverproblem.
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Mögliche Ursachen sind der Verlust der Netzwerkverbindung oder ein Serverproblem.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -1138,9 +1089,7 @@ falls der Fehler wiederholt auftritt.
 Die Ursache hierfür ist oft eine falsch eingestellte Uhrzeit auf Ihrem Computer.
 
 Bitte vergewissern Sie sich, dass Datum und Uhrzeit korrekt eingestellt sind.
-Bitte melden Sie das Problem unter
-www.secondlife.com/support,
-sollte der Fehler wiederholt auftreten.
+Bitte melden Sie das Problem unter www.secondlife.com/support, sollte der Fehler wiederholt auftreten.
                 </message>
         </alert>
         <alert name="CannotConnectVerificationError">
@@ -1148,9 +1097,7 @@ sollte der Fehler wiederholt auftreten.
                         Verbindung mit [SECOND_LIFE] nicht möglich.
 Der Anmeldeserver konnte sich nicht per SSL verifizieren.
 
-Bitte melden Sie das Problem unter
-www.secondlife.com/support,
-sollte der Fehler wiederholt auftreten.
+Bitte melden Sie das Problem unter www.secondlife.com/support, sollte der Fehler wiederholt auftreten.
                 </message>
         </alert>
         <alert name="CannotConnectUnknownErrorWindows">
@@ -1158,9 +1105,7 @@ sollte der Fehler wiederholt auftreten.
                         Verbindung mit [SECOND_LIFE] nicht möglich.
 Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.
 
-Bitte melden Sie das Problem auf
-www.secondlife.com/support und fügen Sie dem Bericht die Datei SecondLife.log
-an, die Sie hier finden: C:\Dokumente und Einstellungen\(Name)\Anwendungsdaten\SecondLife\logs
+Bitte melden Sie das Problem auf www.secondlife.com/support und fügen Sie dem Bericht die Datei SecondLife.log an, die Sie hier finden: C:\Dokumente und Einstellungen\(Name)\Anwendungsdaten\SecondLife\logs
 Vielen Dank.
                 </message>
         </alert>
@@ -1169,9 +1114,7 @@ Vielen Dank.
                         Verbindung mit [SECOND_LIFE] nicht möglich.
 Trotz all unserer Bemühungen ist ein unerwarteter Fehler aufgetreten.
 
-Bitte melden Sie das Problem auf
-www.secondlife.com/support  und fügen Sie dem Bericht die Datei SecondLife.log
-an, die Sie hier finden: ~/Library/Application Support/SecondLife/logs
+Bitte melden Sie das Problem auf www.secondlife.com/support  und fügen Sie dem Bericht die Datei SecondLife.log an, die Sie hier finden: ~/Library/Application Support/SecondLife/logs
 Vielen Dank.
                 </message>
         </alert>
@@ -1180,16 +1123,14 @@ Vielen Dank.
                         Bei der Prüfung Ihres Authentifizierungs-
 Token ist ein Problem aufgetreten. Bitte melden Sie sich erneut an. 
 
-Wenden Sie sich an www.secondlife.com/support,
-sollte dieser Fehler wiederholt auftreten.
+Wenden Sie sich an www.secondlife.com/support, sollte dieser Fehler wiederholt auftreten.
                 </message>
         </alert>
         <alert name="CannotConnectNoMessage">
                 <message name="message">
                         Unbekanntes Verbindungsproblem.
 
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -1202,8 +1143,7 @@ für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe
                 <message name="message">
                         Verbindung nicht möglich.  Keine Anmeldebestätigung von Simulator.
  
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link zur Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link zur Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -1221,8 +1161,7 @@ für Unterstützung und einen Link zur Systemstatus-Webseite auf &apos;Hilfe&apo
                 <message name="message">
                         Die Installation von [SECOND_LIFE] ist abgeschlossen.
 
-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,
-bevor Sie sich anmelden können.
+Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen, bevor Sie sich anmelden können.
 Möchten Sie auf www.secondlife.com ein Konto erstellen?
                 </message>
                 <option name="NewAccount...">
@@ -1235,8 +1174,7 @@ Möchten Sie auf www.secondlife.com ein Konto erstellen?
         <alert name="ClothingStillDownloading">
                 <message name="message">
                         Ihr Avatar wird noch heruntergeladen.
-Sie können [SECOND_LIFE] normal verwenden und andere
-Einwohner können Sie sehen.
+Sie können [SECOND_LIFE] normal verwenden und andere Einwohner können Sie sehen.
                 </message>
         </alert>
         <alert name="CannotResolveDomain">
@@ -1283,10 +1221,7 @@ Bitte wählen Sie einen männlichen oder weiblichen Avatar.
         </alert>
         <alert name="CannotCopyWarning">
                 <message name="message">
-                        Sie sind nicht berechtigt, dieses
-Objekt zu kopieren und verlieren es
-aus Ihrem Inventar, wenn Sie es weggeben. Möchten
-Sie dieses Objekt anbieten?
+                        Sie sind nicht berechtigt, dieses Objekt zu kopieren und verlieren es aus Ihrem Inventar, wenn Sie es weggeben. Möchten Sie dieses Objekt anbieten?
                 </message>
                 <option name="Yes">
                         Ja
@@ -1317,9 +1252,7 @@ Sie dieses Objekt anbieten?
         </alert>
         <alert name="CannotCopyCountItems">
                 <message name="message">
-                        Sie sind nicht berechtigt, [COUNT] der ausgewählten
-Objekte zu kopieren. Diese Objekte werden aus
-Ihrem Inventar gelöscht.
+                        Sie sind nicht berechtigt, [COUNT] der ausgewählten Objekte zu kopieren. Diese Objekte werden aus Ihrem Inventar gelöscht.
 Möchten Sie diese Objekte weggeben?
                 </message>
                 <option name="Yes">
@@ -1331,15 +1264,13 @@ Möchten Sie diese Objekte weggeben?
         </alert>
         <alert name="CannotGiveCategory">
                 <message name="message">
-                        Sie sind nicht berechtigt, den ausgewählten
-Ordner zu kopieren.
+                        Sie sind nicht berechtigt, den ausgewählten Ordner zu kopieren.
                 </message>
         </alert>
         <alert name="FreezeAvatar">
                 <message name="message">
                         Diesen Avatar einfrieren?
-Der Avatar wird außer Gefecht gesetzt und kann
-sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
+Der Avatar wird außer Gefecht gesetzt und kann sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
                 </message>
                 <option name="Freeze">
                         Einfrieren
@@ -1354,8 +1285,7 @@ sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
         <alert name="FreezeAvatarFullname">
                 <message name="message">
                         [AVATAR_NAME] einfrieren?
-Der Avatar wird außer Gefecht gesetzt und kann
-sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
+Der Avatar wird außer Gefecht gesetzt und kann sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
                 </message>
                 <option name="Freeze">
                         Einfrieren
@@ -1395,6 +1325,28 @@ sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
                         Abbrechen
                 </option>
         </alert>
+        <alert name="EjectAvatarNoBan">
+                <message name="message">
+                        Diesen Avatar aus Ihrem Land werfen?
+                </message>
+                <option name="Eject">
+                        Hinauswerfen
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
+        <alert name="EjectAvatarFullnameNoBan">
+                <message name="message">
+                        [AVATAR_NAME] aus Ihrem Land werfen?
+                </message>
+                <option name="Eject">
+                        Hinauswerfen
+                </option>
+                <option name="Cancel">
+                        Abbrechen
+                </option>
+        </alert>
         <alert name="InvalidUUID">
                 <message name="message">
                         Ungültige UUID.
@@ -1408,16 +1360,13 @@ sich nicht mehr bewegen, chatten oder mit der Welt interagieren.
         <alert name="AcquireErrorObjectSpan">
                 <message name="message">
                         FEHLER: Die Objekte überspannen mehrere Regionen.
-Verschieben Sie alle betreffenden Objekte in dieselbe
-Region.
+Verschieben Sie alle betreffenden Objekte in dieselbe Region.
                 </message>
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
                         Mindestens ein Objekt ist gesperrt oder gehört Ihnen nicht.
-Wenn Ihnen ein Objekt nicht gehört und Sie es nehmen, 
-werden die Rechte für den nächsten Eigentümer angewandt und Sie
-können es möglicherweise nicht bearbeiten oder kopieren.
+Wenn Ihnen ein Objekt nicht gehört und Sie es nehmen, werden die Rechte für den nächsten Eigentümer angewandt und Sie können es möglicherweise nicht bearbeiten oder kopieren.
 
 Möchten Sie diese Objekte nehmen?
                 </message>
@@ -1449,29 +1398,26 @@ Sie können maximal [MAX] Objekte verknüpfen.
         </alert>
         <alert name="CannotLinkIncompleteSet">
                 <message name="message">
-                        Sie können nur vollständige Objektsätze verknüpfen und
-Sie müssen mehr als ein Objekt auswählen.
+                        Sie können nur vollständige Objektsätze verknüpfen und Sie müssen mehr als ein Objekt auswählen.
                 </message>
         </alert>
         <alert name="CannotLinkModify">
                 <message name="message">
-                        Verknüpfung nicht möglich, da Sie nicht alle Objekte bearbeiten
-dürfen.  
+                        Verknüpfung nicht möglich, da Sie nicht alle Objekte bearbeiten dürfen.  
 
 Stellen Sie sicher, dass kein Objekt gesperrt ist und alle Objekte Ihnen gehören.
                 </message>
         </alert>
         <alert name="CannotLinkDifferentOwners">
                 <message name="message">
-                        Verknüpfung nicht möglich, da nicht alle Objekte denselben
-Eigentümer haben. 
+                        Verknüpfung nicht möglich, da nicht alle Objekte denselben Eigentümer haben. 
 
 Stellen Sie sicher, dass alle ausgewählten Objekte Ihnen gehören.
                 </message>
         </alert>
         <alert name="NoFileExtension">
                 <message name="message">
-                        Kein Dateityp für Datei: &apos;[FILE]&apos;
+                        Kein Dateityp für Datei: „[FILE]“
 
 Vergewissern Sie sich, dass die Datei den richtigen Dateityp hat.
                 </message>
@@ -1523,7 +1469,7 @@ Erwartet wurde [VALIDS]
         </alert>
         <alert name="SoundFileInvalidHeader">
                 <message name="message">
-                        &apos;Daten&apos;-Chunk in WAV-Header nicht gefunden: 
+                        „Daten“-Chunk in WAV-Header nicht gefunden: 
 [FILE]
                 </message>
         </alert>
@@ -1593,67 +1539,62 @@ Bitte versuchen Sie es erneut.
         </alert>
         <alert name="CannotCreateLandmarkNotOwner">
                 <message name="message">
-                        Sie können hier keine Landmarke erstellen,
-da der Landeigentümer dies verboten hat.
+                        Sie können hier keine Landmarke erstellen, da der Landeigentümer dies verboten hat.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoScripts">
                 <message name="message">
-                        &apos;Rekompilieren&apos; nicht möglich.
+                        „Rekompilieren“ nicht möglich.
 Objekt mit Skript wählen.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoPermission">
                 <message name="message">
-                        &apos;Rekompilieren&apos; nicht möglich.
+                        „Rekompilieren“ nicht möglich.
 
-Wählen Sie Objekte mit Skripts, die
-Sie bearbeiten dürfen.
+Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoScripts">
                 <message name="message">
-                        &apos;Zurücksetzen&apos; nicht möglich.
+                        „Zurücksetzen“ nicht möglich.
 
 Wählen Sie Objekte mit Skripts.
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoPermission">
                 <message name="message">
-                        &apos;Zurücksetzen&apos; nicht möglich.
+                        „Zurücksetzen“ nicht möglich.
 
-Wählen Sie Objekte mit Skripts, die
-Sie bearbeiten dürfen.
+Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoScripts">
                 <message name="message">
-                        &apos;Ausführen&apos; von Skripts nicht möglich.
+                        „Ausführen“ von Skripts nicht möglich.
 
 Wählen Sie Objekte mit Skripts.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoPermission">
                 <message name="message">
-                        &apos;Ausführen&apos; von Skripts nicht möglich.
+                        „Ausführen“ von Skripts nicht möglich.
 
-Wählen Sie Objekte mit Skripts, die
-Sie bearbeiten dürfen.
+Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoScripts">
                 <message name="message">
-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.
+                        „Deaktivieren“ von Skripts nicht möglich.
 
 Wählen Sie Objekte mit Skripts.
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoPermission">
                 <message name="message">
-                        &apos;Deaktivieren&apos; von Skripts nicht möglich.
+                        „Deaktivieren“ von Skripts nicht möglich.
 
-Wählen Sie Objekte mit Skripts, die
-Sie bearbeiten dürfen.
+Wählen Sie Objekte mit Skripts, die Sie bearbeiten dürfen.
                 </message>
         </alert>
         <alert name="NoFrontmostFloater">
@@ -1719,15 +1660,12 @@ Keine Parzelle ausgewählt.
         </alert>
         <alert name="CannotSetLandOwnerMultipleRegions">
                 <message name="message">
-                        Eine erzwungene Landübertragung ist nicht möglich, da die Auswahl
-mehrere Regionen umfasst. Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.
+                        Eine erzwungene Landübertragung ist nicht möglich, da die Auswahl mehrere Regionen umfasst. Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.
                 </message>
         </alert>
         <alert name="ForceOwnerAuctionWarning">
                 <message name="message">
-                        Diese Parzelle steht zur Auktion. Eine zwangsweise Eigentumsübertragung
-beendet die Auktion und verärgert womöglich Einwohner,
-die bereits ein Gebot abgegeben haben. Eigentumsübertragung erzwingen?
+                        Diese Parzelle steht zur Auktion. Eine zwangsweise Eigentumsübertragung beendet die Auktion und verärgert womöglich Einwohner, die bereits ein Gebot abgegeben haben. Eigentumsübertragung erzwingen?
                 </message>
                 <option name="Force">
                         OK
@@ -1774,7 +1712,7 @@ Kann die Region nicht finden, in der sich dieses Land befindet.
         </alert>
         <alert name="CannotCloseFloaterBuyLand">
                 <message name="message">
-                        Das Fenster &apos;Land kaufen&apos; kann erst geschlossen werden,
+                        Das Fenster „Land kaufen“ kann erst geschlossen werden,
 nachdem Second Life den Transaktionspreis geschätzt hat.
                 </message>
         </alert>
@@ -1794,7 +1732,7 @@ Keine Gruppe ausgewählt.
                 <message name="message">
                         Land kann nicht übertragen werden:
 Kann die Region nicht finden, in der sich dieses Land befindet.
-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.
+Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
                 </message>
         </alert>
         <alert name="CannotDeedLandMultipleSelected">
@@ -1816,8 +1754,7 @@ Wählen Sie eine einzelne Parzelle.
 Streaming-Medien erfordern eine schnelle Internet-Verbindung.
  
 Streaming-Medien abspielen, wenn verfügbar?
-(Sie können diese Option später unter
-&apos;Einstellungen&apos; &gt; &apos;Audio &amp; Video&apos; ändern.)
+(Sie können diese Option später unter „Einstellungen“ &gt; „Audio &amp; Video“ ändern.)
                 </message>
                 <option name="PlayMedia">
                         Medien wiedergeben
@@ -1868,7 +1805,7 @@ Parzellen, die Ihnen gehören, werden grün dargestellt.
                         Land kann nicht aufgegeben werden:
 Kann die Region nicht finden, in der sich dieses Land befindet.
 
-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.
+Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoTransfer">
@@ -1888,8 +1825,7 @@ Wählen Sie eine ganze Parzelle oder teilen Sie Ihre Parzelle.
         <alert name="ReleaseLandWarning">
                 <message name="message">
                         Sie sind im Begriff, [AREA] qm Land aufzugeben.
-Wenn Sie diese Parzelle aufgeben, wird sie ohne
-L$-Erstattung von Ihrem Landbesitz entfernt.
+Wenn Sie diese Parzelle aufgeben, wird sie ohne L$-Erstattung von Ihrem Landbesitz entfernt.
 
 Dieses Land aufgeben?
                 </message>
@@ -1917,9 +1853,7 @@ Wählen Sie einen Parzellenabschnitt aus.
         </alert>
         <alert name="LandDivideWarning">
                 <message name="message">
-                        Wenn Sie dieses Land teilen, wird diese Parzelle in zwei
-geteilt, jede mit ihren eigenen Einstellungen. Einige dieser
-Einstellungen werden aufgrund dieses Vorgangs zurückgesetzt.
+                        Wenn Sie dieses Land teilen, wird diese Parzelle in zwei geteilt, jede mit ihren eigenen Einstellungen. Einige dieser Einstellungen werden aufgrund dieses Vorgangs zurückgesetzt.
  
 Land teilen?
                 </message>
@@ -1935,7 +1869,7 @@ Land teilen?
                         Land kann nicht aufgeteilt werden:
 Kann die Region nicht finden, in der sich dieses Land befindet.
 
-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.
+Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
                 </message>
         </alert>
         <alert name="CannotJoinLandNoRegion">
@@ -1943,7 +1877,7 @@ Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.
                         Land kann nicht zusammengelegt werden:
 Kann die Region nicht finden, in der sich dieses Land befindet.
 
-Bitte melden Sie dies über &apos;Hilfe&apos; -&gt; &apos;Fehler melden&apos;.
+Bitte melden Sie dies über „Hilfe“ &gt; „Fehler melden“.
                 </message>
         </alert>
         <alert name="CannotJoinLandNothingSelected">
@@ -1972,8 +1906,7 @@ Wählen Sie Land auf beiden Parzellen aus.
                 <message name="message">
                         Beim Zusammenlegen entsteht aus den vom Auswahlrechteck 
 erfassten Parzellen eine große Parzelle. 
-Sie müssen der neuen Parzelle einen Namen geben und 
-ihre Optionen festlegen.
+Sie müssen der neuen Parzelle einen Namen geben und ihre Optionen festlegen.
  
 Land zusammenlegen?
                 </message>
@@ -2034,21 +1967,15 @@ Land zusammenlegen?
         </alert>
         <alert name="CannotSaveWearableOutOfSpace">
                 <message name="message">
-                        &apos;[NAME]&apos; konnte nicht in Kleidungsdatei gespeichert werden.  Geben Sie Speicherplatz
-auf dem Computer frei und speichern Sie das
-Kleidungsstück erneut.
+                        „[NAME]“ konnte nicht in Kleidungsdatei gespeichert werden.  Geben Sie Speicherplatz auf dem Computer frei und speichern Sie das Kleidungsstück erneut.
                 </message>
         </alert>
         <alert name="CannotSaveToAssetStore">
                 <message name="message">
                         [NAME] kann nicht in Zentral-Asset-Speicher geladen werden.
-Dies ist ein temporärer Fehler. Bitte
-passen Sie das Kleidungsstück in einigen
-Minuten noch einmal an und speichern Sie es erneut. 
+Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen Minuten noch einmal an und speichern Sie es erneut. 
 
-Tritt dieses Problem wiederholt auf,
-klicken Sie auf das Pulldown-Menü &apos;Hilfe | Fehler melden&apos;
-und geben Sie Details zu Ihrem Netzwerk-Setup an.
+Tritt dieses Problem wiederholt auf, klicken Sie auf das Pulldown-Menü „Hilfe“ &gt; „Fehler melden“ und geben Sie Details zu Ihrem Netzwerk-Setup an.
                 </message>
         </alert>
         <alert name="AppEarlyExit">
@@ -2057,8 +1984,7 @@ und geben Sie Details zu Ihrem Netzwerk-Setup an.
  
 Dieses Problem kann nicht behoben werden. 
 
-Deinstallieren und reinstallieren Sie das Programm. Sollte dieses
-Problem fortbestehen, finden Sie weitere Hilfe in der Tech-Support-FAQ auf:
+Deinstallieren und reinstallieren Sie das Programm. Sollte dieses Problem fortbestehen, finden Sie weitere Hilfe in der Tech-Support-FAQ auf:
 www.secondlife.com/support.
                 </message>
                 <option name="Quit">
@@ -2069,7 +1995,7 @@ www.secondlife.com/support.
                 <message name="message">
                         Sie wurden von [SECOND_LIFE] abgemeldet:
             [MESSAGE]
-Klicken Sie auf &apos;IM &amp; Chat anzeigen&apos;, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Klicken Sie andernfalls auf &apos;Beenden&apos;, um [SECOND_LIFE] sofort zu beenden.
+Klicken Sie auf „IM &amp; Chat anzeigen“, um vorhandene Nachrichten und Chat weiterhin anzuzeigen. Klicken Sie andernfalls auf „Beenden“, um [SECOND_LIFE] sofort zu beenden.
                 </message>
                 <option name="Continue">
                         IM &amp; Chat anzeigen
@@ -2086,11 +2012,13 @@ Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
         </alert>
         <alert name="AddFriend" title="Freund hinzufügen">
                 <message name="message">
-                        Freunde können sich gegenseitig die Berechtigung
-erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen.
+                        Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen.
 
 [NAME] Freundschaft anbieten?
                 </message>
+                <editline name="editline">
+                        Wollen wir Freunde sein?
+                </editline>
                 <option name="Offer">
                         OK
                 </option>
@@ -2100,13 +2028,12 @@ erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen z
         </alert>
         <alert name="AddFriendWithMessage" title="Freund hinzufügen">
                 <message name="message">
-                        Freunde können sich gegenseitig die Berechtigung
-erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen.
+                        Freunde können sich gegenseitig die Berechtigung erteilen, sich auf der Karte zu verfolgen und Online-Status Benachrichtigungen zu empfangen.
 
 [NAME] Freundschaft anbieten?
                 </message>
                 <editline name="editline">
-                        Möchtest du mein Freunde sein?
+                        Wollen wir Freunde sein?
                 </editline>
                 <option name="Offer">
                         OK
@@ -2165,8 +2092,7 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
         </alert>
         <alert name="GodDeleteAllObjectsByUser">
                 <message name="message">
-                        Möchten Sie ALLE Objekte (einschließlich geskriptete)
-von
+                        Möchten Sie ALLE Objekte (einschließlich geskriptete) von
 ** [AVATAR_NAME] **
 auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
                 </message>
@@ -2178,9 +2104,6 @@ auf ALLEN LÄNDERN in diesem Sim LÖSCHEN?
                 </option>
         </alert>
         <alert name="PublishGroupInfoToWeb">
-                <message name="message">
-                        Im Web veröffentlichen
-                </message>
         </alert>
         <alert name="BlankClassifiedName">
                 <message name="message">
@@ -2311,8 +2234,7 @@ Möchten Sie diese Objekte nehmen?
         <alert name="ConfirmObjectTakeNoOwn">
                 <message name="message">
                         Nicht alle Objekte, die Sie aufgenommen haben, gehören Ihnen.
-Wenn Sie fortfahren, werden die Rechte für den nächsten Eigentümer angewandt und Sie können die Objekte
-möglicherweise nicht bearbeiten oder kopieren.
+Wenn Sie fortfahren, werden die Rechte für den nächsten Eigentümer angewandt und Sie können die Objekte möglicherweise nicht bearbeiten oder kopieren.
 
 Möchten Sie diese Objekte nehmen?
                 </message>
@@ -2327,9 +2249,7 @@ Möchten Sie diese Objekte nehmen?
                 <message name="message">
                         Mindestens ein Objekt ist gesperrt.
 Nicht alle Objekte, die Sie aufgenommen haben, gehören Ihnen.
-Wenn Sie fortfahren, werden die Rechte für den nächsten Eigentümer
-abgefragt und Sie können die Objekte
-möglicherweise nicht bearbeiten oder kopieren.
+Wenn Sie fortfahren, werden die Rechte für den nächsten Eigentümer abgefragt und Sie können die Objekte möglicherweise nicht bearbeiten oder kopieren.
 Die aktuelle Auswahl können Sie jedoch aufnehmen.
 
 Möchten Sie diese Objekte nehmen?
@@ -2350,13 +2270,10 @@ Wählen Sie ein kleineres Gebiet und versuchen Sie es erneut.
         </alert>
         <alert name="DeedLandToGroup">
                 <message name="message">
-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe
-über ausreichende Landnutzungsrechte verfügt.
-Dem Eigentümer wird der Kaufpreis für das Land nicht
-rückerstattet. Bei Verkauf der übertragenen Parzelle
-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
+                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
+Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
 
-Der Gruppe &apos;[GROUP_NAME]&apos;
+Der Gruppe „[GROUP_NAME]“
  [AREA] m2 Land schenken?
                 </message>
                 <option name="Deed">
@@ -2368,15 +2285,11 @@ Der Gruppe &apos;[GROUP_NAME]&apos;
         </alert>
         <alert name="DeedLandToGroupWithContribution">
                 <message name="message">
-                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe
-über ausreichende Landnutzungsrechte verfügt.
-Die Schenkung beinhaltet eine Landübertragung
-an die Gruppe von &apos;[FIRST_NAME] [LAST_NAME]&apos;.
-Dem Eigentümer wird der Kaufpreis für das Land nicht
-rückerstattet. Bei Verkauf der übertragenen Parzelle
-wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
+                        Die Schenkung dieser Parzelle setzt voraus, dass die Gruppe über ausreichende Landnutzungsrechte verfügt.
+Die Schenkung beinhaltet eine Landübertragung an die Gruppe von „[FIRST_NAME] [LAST_NAME]“.
+Dem Eigentümer wird der Kaufpreis für das Land nicht rückerstattet. Bei Verkauf der übertragenen Parzelle wird der Erlös zwischen den Gruppenmitgliedern aufgeteilt.
  
-Der Gruppe &apos;[GROUP_NAME]&apos;
+Der Gruppe „[GROUP_NAME]“
  [AREA] m2 Land schenken?
                 </message>
                 <option name="Deed">
@@ -2388,14 +2301,12 @@ Der Gruppe &apos;[GROUP_NAME]&apos;
         </alert>
         <alert name="DisplaySetToSafe">
                 <message name="message">
-                        Es wurden sichere Anzeige-Einstellungen gewählt,
-da die Option -safe verwendet wurde.
+                        Es wurden sichere Anzeige-Einstellungen gewählt, da die Option -safe verwendet wurde.
                 </message>
         </alert>
         <alert name="DisplaySetToRecommended">
                 <message name="message">
-                        Es wurden die für Ihre Systemkonfiguration empfohlenen
-Anzeige-Einstellungen gewählt.
+                        Es wurden die für Ihre Systemkonfiguration empfohlenen Anzeige-Einstellungen gewählt.
                 </message>
         </alert>
         <alert name="UnableToConnect">
@@ -2407,11 +2318,9 @@ Folgende Domäne konnte nicht aufgelöst werden: [HOST_NAME]
         <alert name="CanNotFindServer">
                 <message name="message">
                         Der Server-Domänenname konnte nicht gefunden werden.
-Mögliche Ursachen sind der Verlust der Netzwerkverbindung
-oder ein Serverproblem.
+Mögliche Ursachen sind der Verlust der Netzwerkverbindung oder ein Serverproblem.
 
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -2431,8 +2340,7 @@ Verbindung mit [IP_ADDRESS] nicht möglich
                         Verbindung mit [SECOND_LIFE] nicht möglich.
 Möglicherweise handelt es sich um einen Systemausfall.
 
-Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie
-für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe&apos;.
+Bitte versuchen Sie es in einigen Minuten erneut oder klicken Sie für Unterstützung und einen Link auf die Systemstatus-Webseite auf „Hilfe“.
                 </message>
                 <option name="OK">
                         OK
@@ -2451,8 +2359,7 @@ für Unterstützung und einen Link auf die Systemstatus-Webseite auf &apos;Hilfe
                         QuickTime wurde deaktiviert, weil Sie eine alte Version verwenden
                 </ignore>
                 <message name="message">
-                        Streaming-Video wurde deaktiviert, weil die QuickTime-Version 
-auf Ihrem Computer nicht mehr aktuell ist. 
+                        Streaming-Video wurde deaktiviert, weil die QuickTime-Version auf Ihrem Computer nicht mehr aktuell ist. 
 
 Laden Sie ein Update von http://www.apple.com/quicktime/ herunter.
                 </message>
@@ -2476,8 +2383,7 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
                 <message name="message">
                         Die Installation von [SECOND_LIFE] ist abgeschlossen.
 
-Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen,
-bevor Sie sich anmelden können.
+Wenn Sie [SECOND_LIFE] das erste Mal verwenden, müssen Sie ein Konto anlegen, bevor Sie sich anmelden können.
 Möchten Sie auf www.secondlife.com ein Konto erstellen?
                 </message>
                 <option name="NewAccount...">
@@ -2499,7 +2405,7 @@ Bitte überprüfen Sie Ihre Netzwerkverbindung.
                 <message name="message">
                         Die Verbindung kann nicht hergestellt werden. Möglicherweise besteht ein Problem mit Ihrer Internetverbindung oder den Second Life-Servern.
 
-Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf &apos;Hilfe&apos;, um zu unserer Supportseite zu gelangen, oder klicken Sie auf &apos;Teleportieren&apos;, um nach Hause zu teleportieren.
+Überprüfen Sie Ihre Internetverbindung und versuchen Sie es dann erneut, oder klicken Sie auf „Hilfe“, um zu unserer Supportseite zu gelangen, oder klicken Sie auf „Teleportieren“, um nach Hause zu teleportieren.
                 </message>
                 <option name="OK">
                         OK
@@ -2516,8 +2422,7 @@ Bitte überprüfen Sie Ihre Netzwerkverbindung.
                         Ihr Avatar erscheint jeden Moment.
 
 Benutzen Sie die Pfeiltasten, um sich fortzubewegen.
-Drücken Sie F1 für Hilfe oder für weitere
-Informationen über [SECOND_LIFE].
+Drücken Sie F1 für Hilfe oder für weitere Informationen über [SECOND_LIFE].
                 </message>
         </alert>
         <alert name="WelcomeChooseSex">
@@ -2525,8 +2430,7 @@ Informationen über [SECOND_LIFE].
                         Ihr Avatar erscheint jeden Moment.
 
 Benutzen Sie die Pfeiltasten, um sich fortzubewegen.
-Drücken Sie F1 für Hilfe oder für weitere
-Informationen über [SECOND_LIFE].
+Drücken Sie F1 für Hilfe oder für weitere Informationen über [SECOND_LIFE].
 Bitte wählen Sie einen männlichen oder weiblichen Avatar.
 Sie können sich später noch umentscheiden.
                 </message>
@@ -2539,7 +2443,7 @@ Sie können sich später noch umentscheiden.
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] Sie haben nicht genügend Geld.
+                        [NAME] [PRICE] L$  Sie haben nicht genügend L$, um diese Aktion auszuführen.
                 </message>
         </alert>
         <alert name="GrantedModifyRights">
@@ -2556,8 +2460,7 @@ Sie können sich später noch umentscheiden.
                 <message name="message">
                         Der Kartencache dieser Region wird geleert.
 Diese Aktion ist nur beim Debugging sinnvoll. 
-(Auf dem Produktionssystem warten Sie einfach 5 Minuten. Die Karten werden 
-nach erneuter Anmeldung automatisch aktualisiert.)
+(Auf dem Produktionssystem warten Sie einfach 5 Minuten. Die Karten werden nach erneuter Anmeldung automatisch aktualisiert.)
                 </message>
                 <option name="OK">
                         OK
@@ -2605,8 +2508,7 @@ Wählen Sie ein einzelnes Objekt aus und versuchen Sie es erneut.
                         Die Regionstexturen konnten nicht festgelegt werden: 
 Die Terraintextur [TEXTURE_NUM] hat eine ungültige Bit-Tiefe [TEXTURE_BIT_DEPTH].
 
-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und
-klicken Sie dann erneut auf &quot;Ãœbernehmen&quot;.
+Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf „Übernehmen“.
                 </message>
         </alert>
         <alert name="InvalidTerrainSize">
@@ -2614,21 +2516,17 @@ klicken Sie dann erneut auf &quot;Ãœbernehmen&quot;.
                         Die Regionstexturen konnten nicht festgelegt werden: 
 Die Terraintextur [TEXTURE_NUM] ist mit [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y] zu groß. 
 
-Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und
-klicken Sie dann erneut auf &quot;Ãœbernehmen&quot;.
+Ersetzen Sie die Textur [TEXTURE_NUM] mit einer Bilddatei von maximal 512x512 und 24 Bit und klicken Sie dann erneut auf „Übernehmen“.
                 </message>
         </alert>
         <alert name="RawUploadStarted">
                 <message name="message">
-                        Hochladen gestartet. Je nach Verbindungsgeschwindigkeit 
-kann der Vorgang bis zu 2 Minuten dauern.
+                        Hochladen gestartet. Je nach Verbindungsgeschwindigkeit kann der Vorgang bis zu 2 Minuten dauern.
                 </message>
         </alert>
         <alert name="ConfirmBakeTerrain">
                 <message name="message">
-                        Möchten Sie das aktuelle Terrain formen, 
-es zum Mittelpunkt der oberen und unteren Terraingrenzen 
-und zum Standard des &apos;Zurücksetzen&apos;-Tools machen?
+                        Möchten Sie das aktuelle Terrain formen, es zum Mittelpunkt der oberen und unteren Terraingrenzen und zum Standard des „Zurücksetzen“-Tools machen?
                 </message>
                 <option name="Bake">
                         OK
@@ -2671,7 +2569,7 @@ und zum Standard des &apos;Zurücksetzen&apos;-Tools machen?
         </alert>
         <alert name="OwnerCanNotBeDenied">
                 <message name="message">
-                        Der Eigentümer des Grundstücks kann nicht zur Liste der &apos;Verbannten Einwohner&apos; hinzugefügt werden.
+                        Der Eigentümer des Grundstücks kann nicht zur Liste der „Verbannten Einwohner“ hinzugefügt werden.
                 </message>
         </alert>
         <alert name="CanNotChangeAppearanceUntilLoaded">
@@ -2681,13 +2579,12 @@ und zum Standard des &apos;Zurücksetzen&apos;-Tools machen?
         </alert>
         <alert name="ClassifiedMustBeAlphanumeric">
                 <message name="message">
-                        Der Name der Anzeige muss mit einem Buchstaben von 
-A bis Z oder einer Ziffer beginnen.  Satzzeichen sind nicht erlaubt.
+                        Der Name der Anzeige muss mit einem Buchstaben von A bis Z oder einer Ziffer beginnen.  Satzzeichen sind nicht erlaubt.
                 </message>
         </alert>
         <alert name="CantSetBuyObject">
                 <message name="message">
-                        &apos;Objekt kaufen&apos; nicht möglich, da das Objekt nicht zum Verkauf freigegeben ist. 
+                        „Objekt kaufen“ nicht möglich, da das Objekt nicht zum Verkauf freigegeben ist. 
 Geben Sie das Objekt zum Verkauf frei und versuchen Sie es erneut.
                 </message>
         </alert>
@@ -2966,9 +2863,7 @@ In Ihren Anwendungsordner herunterladen?
         </alert>
         <alert name="ReturnToOwner">
                 <message name="message">
-                        Möchten Sie die ausgewählten Objekte
-an ihre Eigentümer zurückgeben? Transferierbare übertragene
-Objekte werden ihren früheren Eigentümern zurückgegeben.
+                        Möchten Sie die ausgewählten Objekte an ihre Eigentümer zurückgeben? Transferierbare übertragene Objekte werden ihren früheren Eigentümern zurückgegeben.
 
 *WARNUNG* Nicht transferierbare übertragene Objekte werden dabei gelöscht!
                 </message>
@@ -3019,7 +2914,7 @@ Diese Gruppe verlassen?
         </alert>
         <alert name="MuteLinden">
                 <message name="message">
-                        Linden können nicht stummgeschaltet werden.
+                        Lindens können nicht stummgeschaltet werden.
                 </message>
                 <option name="OK">
                         OK
@@ -3035,8 +2930,7 @@ Diese Gruppe verlassen?
         </alert>
         <alert name="RemoveItemWarn">
                 <message name="message">
-                        Diese Aktion ist zwar erlaubt, aber beim Löschen von
-Inhalten wird das Objekt beschädigt. Möchten Sie dieses Element löschen?
+                        Diese Aktion ist zwar erlaubt, aber beim Löschen von Inhalten wird das Objekt beschädigt. Möchten Sie dieses Element löschen?
                 </message>
                 <option name="Yes">
                         OK
@@ -3080,10 +2974,7 @@ Inhalten wird das Objekt beschädigt. Möchten Sie dieses Element löschen?
         <alert name="BusyModeSet">
                 <message name="message">
                         Beschäftigt-Modus aktiviert.
-Chat und Instant Messages werden ausgeblendet. Instant
-Messages erhalten Ihre Beschäftigt-Antwort. Alle Teleport-
-Angebote werden ausgeschlagen. Alle Inventar-Angebote werden in den
-Papierkorb verschoben.
+Chat und Instant Messages werden ausgeblendet. Instant Messages erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden ausgeschlagen. Alle Inventar-Angebote werden in den Papierkorb verschoben.
                 </message>
                 <ignore name="ignore">
                         Beim Aktivieren des Beschäftigt-Modus
@@ -3102,8 +2993,7 @@ Papierkorb verschoben.
         </alert>
         <alert name="NotecardAttachPermFail">
                 <message name="message">
-                        An Notizkarten lassen sich nur Objekte mit uneingeschränkten
-&apos;Nächster Eigentümer&apos;-Rechten anfügen.
+                        An Notizkarten lassen sich nur Objekte mit uneingeschränkten „Nächster Eigentümer“-Rechten anfügen.
                 </message>
                 <option name="OK">
                         OK
@@ -3111,11 +3001,8 @@ Papierkorb verschoben.
         </alert>
         <alert name="JoinedTooManyGroupsMember">
                 <message name="message">
-                        Sie sind bereits in zu vielen Gruppen Mitglied
-und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe,
-bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
-Die Option zum Austritt aus einer Gruppe finden Sie unter
-&apos;Bearbeiten&apos; &gt; &apos;Gruppen...&apos;.
+                        Sie sind bereits in zu vielen Gruppen Mitglied und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe, bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
+Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ &gt; „Gruppen...“.
 [NAME] hat Sie eingeladen, einer Gruppe beizutreten.
 [INVITE]
                 </message>
@@ -3128,11 +3015,8 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
         </alert>
         <alert name="JoinedTooManyGroupsOfficer">
                 <message name="message">
-                        Sie sind bereits in zu vielen Gruppen Mitglied
-und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe,
-bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
-Die Option zum Austritt aus einer Gruppe finden Sie unter
-&apos;Bearbeiten&apos; &gt; &apos;Gruppen...&apos;.
+                        Sie sind bereits in zu vielen Gruppen Mitglied und können keiner weiteren beitreten. Bitte verlassen Sie eine Gruppe, bevor Sie dieser beitreten oder lehnen Sie das Angebot ab.
+Die Option zum Austritt aus einer Gruppe finden Sie unter „Bearbeiten“ &gt; „Gruppen...“.
 [NAME] hat Sie eingeladen, einer Gruppe als Officer beizutreten.
 [INVITE]
                 </message>
@@ -3254,8 +3138,7 @@ Die Option zum Austritt aus einer Gruppe finden Sie unter
         </alert>
         <alert name="MessageEstate" title="Nachricht an alle auf diesem Grundstück">
                 <message name="message">
-                        Geben Sie eine kurze Nachricht ein, die
-an jede Person auf Ihrem Grundstück gesendet wird.
+                        Geben Sie eine kurze Nachricht ein, die an jede Person auf Ihrem Grundstück gesendet wird.
                 </message>
                 <option name="OK">
                         OK
@@ -3266,12 +3149,9 @@ an jede Person auf Ihrem Grundstück gesendet wird.
         </alert>
         <alert name="ChangeLindenEstate" title="Linden-Grundstück ändern">
                 <message name="message">
-                        Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, 
-Teen-Raster, Orientierung usw.) zu verändern. 
+                        Sie sind im Begriff, ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern. 
 
-Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen 
-auf das Benutzererlebnis hat.  Auf dem Mainland werden tausende 
-Regionen geändert, was den Spaceserver stark belastet.
+Dies ist ÄUSSERST GEFÄHRLICH, da es grundlegende Auswirkungen auf das Benutzererlebnis hat.  Auf dem Mainland werden tausende Regionen geändert, was den Spaceserver stark belastet.
  
 Fortfahren?
                 </message>
@@ -3284,14 +3164,10 @@ Fortfahren?
         </alert>
         <alert name="ChangeLindenAccess" title="Zugang zu Linden-Grundstück ändern">
                 <message name="message">
-                        Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz 
-(Mainland, Teen-Raster, Orientierung usw.) zu verändern. 
+                        Sie sind im Begriff, die Zugangsliste für ein Grundstück in Linden-Besitz (Mainland, Teen-Raster, Orientierung usw.) zu verändern. 
 
-Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ 
-per Hack in und aus dem Raster zu 
-entfernen. 
-Tausende Regionen werden verändert und der 
-Spaceserver wird dadurch stark belastet.
+Dies ist GEFÄHRLICH und sollte nur erfolgen, um Objekte/L$ per Hack in und aus dem Raster zu entfernen. 
+Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belastet.
                 </message>
                 <option name="ChangeEstate">
                         OK
@@ -3544,8 +3420,7 @@ Anzeige für [AMOUNT] L$ veröffentlichen?
         </alert>
         <alert name="MessageRegion" title="Nachricht an alle in dieser Region">
                 <message name="message">
-                        Geben Sie eine kurze Nachricht ein, die
-an jede Person in dieser Region gesendet wird.
+                        Geben Sie eine kurze Nachricht ein, die an jede Person in dieser Region gesendet wird.
                 </message>
                 <option name="OK">
                         OK
@@ -3556,90 +3431,74 @@ an jede Person in dieser Region gesendet wird.
         </alert>
         <alert name="HelpRegionBlockTerraform" title="Terraformen blockieren">
                 <message name="message">
-                        Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht
-terraformen. Ausgenommen davon ist die parzelleneigene Einstellung &apos; Terrain bearbeiten&apos;.
+                        Wenn diese Option aktiviert ist, können Landeigentümer Ihr Land nicht terraformen. Ausgenommen davon ist die parzelleneigene Einstellung „Terrain bearbeiten“.
 
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionBlockFly" title="Fliegen blockieren">
                 <message name="message">
-                        Wenn diese Option aktiviert ist, ist Fliegen in dieser Region nicht möglich,
-auch wenn für die Parzelle eine andere Einstellung aktiv ist.
+                        Wenn diese Option aktiviert ist, ist Fliegen in dieser Region nicht möglich, auch wenn für die Parzelle eine andere Einstellung aktiv ist.
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionAllowDamage" title="Schaden zulassen">
                 <message name="message">
-                        Wenn diese Option aktiviert ist, ist das Gesundheitssystem auf
-allen Parzellen aktiviert, unabhängig von den Parzelleneinstellungen. Ist die Option links
-deaktiviert, können die Parzelleneigentümer das Gesundheitssystem 
-individuell einschalten.
+                        Wenn diese Option aktiviert ist, ist das Gesundheitssystem auf allen Parzellen aktiviert, unabhängig von den Parzelleneinstellungen. Ist die Option links deaktiviert, können die Parzelleneigentümer das Gesundheitssystem individuell einschalten.
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionAgentLimit" title="Avatar-Limit">
                 <message name="message">
                         Legt die maximale Anzahl an Avataren für diese Region fest.
-Die Leistung hängt von der Anzahl der
-Avatare in der Region ab.
+Die Leistung hängt von der Anzahl der Avatare in der Region ab.
  
 Standard: 40
                 </message>
         </alert>
         <alert name="HelpRegionObjectBonus" title="Objektbonus">
                 <message name="message">
-                        Der Objektbonus ist ein Multiplikator für die Anzahl an zulässigen Primitiven
-auf einer Parzelle. Gültig sind Werte zwischen 1 und 10. &apos;1&apos; erlaubt auf einer 512 qm
-großen Parzelle 117 Objekte. &apos;2&apos; erlaubt auf einer 512 qm großen Parzelle
-234 Objekte, also die doppelte Menge. Die maximale Objektanzahl
-in einer Region beträgt unabhängig vom Objektbonus 15.000.
-Eine nachträglich Senkung des Objektbonus führt dazu, dass Objekte zurückgegeben
-oder gelöscht werden. 
+                        Der Objektbonus ist ein Multiplikator für die Anzahl an zulässigen Primitiven auf einer Parzelle. Gültig sind Werte zwischen 1 und 10. „1“ erlaubt auf einer 512 qm großen Parzelle 117 Objekte. „2“ erlaubt auf einer 512 qm großen Parzelle 234 Objekte, also die doppelte Menge. Die maximale Objektanzahl in einer Region beträgt unabhängig vom Objektbonus 15.000.
+Eine nachträglich Senkung des Objektbonus führt dazu, dass Objekte zurückgegeben oder gelöscht werden. 
  
 Standard: 1.0
                 </message>
         </alert>
         <alert name="HelpRegionMaturity" title="Alterseinstufung">
                 <message name="message">
-                        Legt die Alterseinstufung für diese Region fest, wie oben
-                        im Bildschirm und in den Popup-Tipps auf der Karte gezeigt. Diese Einstellung
-hat auch Auswirkungen auf die Suchergebnisse – Einwohner können
-entscheiden, dass Ab-18-Regionen nicht angezeigt werden.
+                        Legt die Alterseinstufung für diese Region fest, wie oben im Bildschirm und in den Popup-Tipps auf der Karte gezeigt. Diese Einstellung hat auch Auswirkungen auf die Suchergebnisse – Einwohner können entscheiden, dass Ab-18-Regionen nicht angezeigt werden.
  
-Es kann eine Weile dauern, bis sich diese Änderung auf 
-die Karte auswirkt.
+Es kann eine Weile dauern, bis sich diese Änderung auf die Karte auswirkt.
  
 Standard: Jugendfrei
                 </message>
         </alert>
         <alert name="HelpRegionRestrictPushObject" title="Stoßen beschränken">
                 <message name="message">
-                        Aktivieren sie diese Option, um in der gesamten Region das Stoßen zu
-beschränken. Wenn aktiviert, können Einwohner nur von sich selbst
-oder vom Parzelleneigentümer gestoßen werden.
+                        Aktivieren sie diese Option, um in der gesamten Region das Stoßen zu beschränken. Wenn aktiviert, können Einwohner nur von sich selbst oder vom Parzelleneigentümer gestoßen werden.
 (Stoßen meint die LSL-Funktion llPushObject().)
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpParcelChanges" title="Parzelle zusammenlegen/teilen">
                 <message name="message">
-                        Dieses Kontrollkästchen steuert, ob Parzellen des Grundstückseigentümers
-zusammengelegt bzw. unterteilt werden können. Wenn deaktiviert:
+                        Dieses Kontrollkästchen steuert, ob Parzellen des Grundstückseigentümers zusammengelegt bzw. unterteilt werden können. Wenn deaktiviert:
  * Nur Grundstückseigentümer bzw. –verwalter können Parzellen zusammenlegen/teilen.  * Sie können nur Parzellen zusammenlegen/teilen, die dem Eigentümer oder einer Gruppe gehören, bei der sie entsprechende Gruppenrechte innehaben.
 Wenn aktiviert:
- * Die Parzelleneigentümer können ihre Parzellen selbst zusammenlegen/teilen.  * Parzellen in Gruppeneigentum können von Mitgliedern mit den
-       entsprechenden Rechten zusammengelegt bzw. unterteilt werden.
- Standard: aktiviert
+ * Die Parzelleneigentümer können ihre Parzellen selbst zusammenlegen/teilen.
+ * Parzellen in Gruppeneigentum können von Mitgliedern mit den entsprechenden Rechten zusammengelegt bzw. unterteilt werden.
+ 
+Standard: aktiviert
                 </message>
         </alert>
         <alert name="HelpRegionSearch" title="Nicht in Suche anzeigen">
                 <message name="message">
                         Wenn Sie diese Option auswählen, können Parzelleneigentümer ihre Parzellen nicht in der Suche anzeigen lassen
-Standard: aus
+
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpParcelSearch" title="Nicht in Suche anzeigen">
@@ -3652,8 +3511,7 @@ Standard: aus
         <alert name="RegionMaturityChange" title="Alterseinstufung der Region ändern">
                 <message name="message">
                         Die Alterseinstufung dieser Region wurde aktualisiert. 
-Es kann eine Weile dauern, bis sich die Änderung auf 
-die Karte auswirkt.
+Es kann eine Weile dauern, bis sich die Änderung auf die Karte auswirkt.
                 </message>
         </alert>
         <alert name="HelpRegionLandResell" title="Landwiederverkauf">
@@ -3667,112 +3525,79 @@ Standard: deaktiviert
         </alert>
         <alert name="HelpEstateCovenantID" title="Vertrag-Asset-ID">
                 <message name="message">
-                        Legt die Notizkarten-Asset-ID für den Grundstücksvertrag dieses Grundstücks
-fest. 
+                        Legt die Notizkarten-Asset-ID für den Grundstücksvertrag dieses Grundstücks fest. 
  
 Standard: 00000000-0000-0000-0000-000000000000 oder leer
                 </message>
         </alert>
         <alert name="HelpRegionDisableScripts" title="Skripts deaktivieren">
                 <message name="message">
-                        Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie
-die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für &apos;Simulator Physics FPS&apos; (Simulator Physik-FPS) an.
-Wenn der Wert unter 45 liegt, öffnen Sie den Bereich &apos;Time&apos; (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für &quot;Script Time&quot; (Skriptzeit) 25 ms oder höher ist, klicken Sie auf &apos;Top-Skripts&apos;. Der Name und die Position der Skripts, die für die schlechte Performance verantwortlich sind, werden angezeigt.
- Wenn Sie das Kontrollkästchen &apos;Skripts deaktivieren&apos; aktivieren und auf &apos;Übernehmen&apos; klicken, werden alle Skripts in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten &apos;Top-Skripts&apos; reisen können. Sobald Sie dort angekommen sind, sollten Sie das Skript auf die Ursache des Problems hin untersuchen. Möglicherweise müssen Sie sich an den Skript-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um die Skripte in der Region wieder zu aktivieren, deaktivieren Sie &apos;Skript deaktivieren&apos; und klicken Sie auf &apos;Übernehmen&apos;.
- Standard: aus
+                        Schlechte Sim-Performance ist oftmals auf ein Skript zurückzuführen. Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert für „Simulator Physics FPS“ (Simulator Physik-FPS) an.
+Wenn der Wert unter 45 liegt, öffnen Sie den Bereich „Time“ (Zeit) ganz unten in der Statistikleiste. Wenn der Wert für „Script Time“ (Skriptzeit) 25 ms oder höher ist, klicken Sie auf „Top-Skripts“. Der Name und die Position der Skripts, die für die schlechte Performance verantwortlich sind, werden angezeigt.
+Wenn Sie das Kontrollkästchen „Skripts deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Skripts in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Skripts“ reisen können. Sobald Sie dort angekommen sind, sollten Sie das Skript auf die Ursache des Problems hin untersuchen. Möglicherweise müssen Sie sich an den Skript-Eigentümer wenden oder das Objekt löschen bzw. zurückgeben. Um die Skripte in der Region wieder zu aktivieren, deaktivieren Sie „Skript deaktivieren“ und klicken Sie auf „Übernehmen“.
+
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionDisableCollisions" title="Kollisionen deaktivieren">
                 <message name="message">
                         Schlechte Sim-Performance ist oftmals auf physische Objekte zurückzuführen. 
-Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert &apos;Simulator 
-Physics FPS&apos; an. Liegt dieser unter 45, öffnen Sie unten in der 
-Statistikleiste den &apos;Time&apos;-Bereich. Liegt die &apos;Sim Time (Physics)&apos; 
-bei 20 ms oder darüber, klicken Sie auf &apos;Top-Kollisionsobjekte&apos;. 
-Der Name und der Standort der physischen Objekte, die das  
-Problem verursachen, werden angezeigt.
+Öffnen Sie die Statistikleiste (Strg-Umschalt-1). Sehen Sie sich den Wert „Simulator Physics FPS“ an. Liegt dieser unter 45, öffnen Sie unten in der Statistikleiste den „Time“-Bereich. Liegt die „Sim Time (Physics)“ bei 20 ms oder darüber, klicken Sie auf „Top-Kollisionsobjekte“. 
+Der Name und der Standort der physischen Objekte, die das Problem verursachen, werden angezeigt.
  
-Wenn Sie das Kontrollkästchen &apos;Kollisionen deaktivieren&apos; aktivieren und auf
-&apos;Ãœbernehmen&apos; klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt 
-ist eventuell notwendig, damit Sie an die Position des gemeldeten 
-&apos;Top-Kollisionsobjekts&apos; reisen können. Überprüfen Sie das Objekt an der angegebenen Position. 
-Kollidiert es ständig mit anderen Objekten? Wenden Sie sich 
-eventuell an den Eigentümer des Objekts, löschen Sie es oder geben Sie es zurück. 
-Deaktivieren Sie die Option &apos;Kollisionen deaktivieren&apos; und klicken Sie auf &apos;Ãœbernehmen&apos;, 
-um Kollisionen in dieser Region wieder zu aktivieren.
+Wenn Sie das Kontrollkästchen „Kollisionen deaktivieren“ aktivieren und auf „Übernehmen“ klicken, werden alle Objekt-Objekt-Kollisionen in der Region zeitweilig deaktiviert. Dieser Schritt ist eventuell notwendig, damit Sie an die Position des gemeldeten „Top-Kollisionsobjekts“ reisen können. Überprüfen Sie das Objekt an der angegebenen Position. 
+Kollidiert es ständig mit anderen Objekten? Wenden Sie sich eventuell an den Eigentümer des Objekts, löschen Sie es oder geben Sie es zurück. 
+Deaktivieren Sie die Option „Kollisionen deaktivieren“ und klicken Sie auf „Übernehmen“, um Kollisionen in dieser Region wieder zu aktivieren.
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionDisablePhysics" title="Physik deaktivieren">
                 <message name="message">
-                        Das Deaktivieren der Physik ähnelt dem Deaktivieren von Kollisionen, 
-außer dass die gesamte Physiksimulation ausgeschaltet wird.  Das hat nicht nur zur Folge, dass 
-Objekte nicht mehr kollidieren, sondern dass Avatare sich nicht mehr bewegen können. 
+                        Das Deaktivieren der Physik ähnelt dem Deaktivieren von Kollisionen, außer dass die gesamte Physiksimulation ausgeschaltet wird.  Das hat nicht nur zur Folge, dass Objekte nicht mehr kollidieren, sondern dass Avatare sich nicht mehr bewegen können. 
  
-Diese Option sollte nur verwendet werden, wenn das Deaktivieren 
-von Kollisionen keine ausreichende Leistungssteigerung bringt, 
-um Physikprobleme in der Region oder die Top-Kollisionsobjekte zu erkennen.
+Diese Option sollte nur verwendet werden, wenn das Deaktivieren von Kollisionen keine ausreichende Leistungssteigerung bringt, um Physikprobleme in der Region oder die Top-Kollisionsobjekte zu erkennen.
  
-Schalten Sie die Physiksimulation hinterher wieder ein. Andernfalls 
-können sich Avatare nicht mehr bewegen. 
+Schalten Sie die Physiksimulation hinterher wieder ein. Andernfalls können sich Avatare nicht mehr bewegen. 
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionTopColliders" title="Top-Kollisionsobjekte">
                 <message name="message">
-                        Zeigt eine Liste der Objekte mit den potenziell meisten 
-Objekt-Objekt-Kollisionen an.  Diese Objekte können 
-die Leistung beeinträchtigen.  Wählen Sie &apos;Ansicht&apos; &gt; &apos;Statistikleiste&apos; aus und 
-sehen Sie unter &apos;Simulator&apos; &gt; &apos;Time&apos; &gt; &apos;Sim Time (Physics)&apos; nach, 
-ob die Physikberechnung länger als 20 ms dauert.
+                        Zeigt eine Liste der Objekte mit den potenziell meisten Objekt-Objekt-Kollisionen an.  Diese Objekte können die Leistung beeinträchtigen.  Wählen Sie „Ansicht“ &gt; „Statistikleiste“ aus und sehen Sie unter „Simulator“ &gt; „Time“ &gt; „Sim Time (Physics)“ nach, ob die Physikberechnung länger als 20 ms dauert.
                 </message>
         </alert>
         <alert name="HelpRegionTopScripts" title="Top-Skripts">
                 <message name="message">
-                        Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen um 
-LSL-Skripts auszuführen.  Diese Objekte können die Leistung beeinträchtigen. 
-Wählen Sie &apos;Ansicht&apos; &gt; &apos;Statistikleiste&apos; und 
-sehen Sie unter &apos;Simulator&apos; &gt; &apos;Time&apos; &gt; &apos;Script Time&apos; nach, 
-ob mehr als 25 ms für Skripts benötigt werden.
+                        Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um LSL-Skripts auszuführen.  Diese Objekte können die Leistung beeinträchtigen. 
+Wählen Sie „Ansicht“ &gt; „Statistikleiste“ und sehen Sie unter „Simulator“ &gt; „Time“ &gt; „Script Time“ nach, ob mehr als 25 ms für Skripts benötigt werden.
                 </message>
         </alert>
         <alert name="HelpRegionRestart" title="Region neu starten">
                 <message name="message">
-                        Starten Sie den Serverprozess für diese Region nach der 
-2-Minuten-Warnung neu.   Die Verbindung aller Einwohner in dieser Region wird 
-getrennt.  Die Region wird gespeichert und sollte nach 
-90 Sekunden wieder verfügbar sein. 
+                        Starten Sie den Serverprozess für diese Region nach der 2-Minuten-Warnung neu. Die Verbindung aller Einwohner in dieser Region wird getrennt.  Die Region wird gespeichert und sollte nach 90 Sekunden wieder verfügbar sein. 
  
-Der Neustart der Region behebt die meisten Leistungs- 
-probleme, sollte aber nur nach Anweisung erfolgen.
+Der Neustart der Region behebt die meisten Leistungs-probleme, sollte aber nur nach Anweisung erfolgen.
                 </message>
         </alert>
         <alert name="HelpRegionWaterHeight" title="Wasserhöhe">
                 <message name="message">
-                        Die Höhe der Wasserlinie in Metern. Liegt 
-dieser Wert unter 20 und haben Sie Wasser nahe am Rand der 
-Welt oder &apos;offenes&apos; Wasser definiert, wird eine 
-deutliche Lücke sichtbar. 
+                        Die Höhe der Wasserlinie in Metern. Liegt dieser Wert unter 20 und haben Sie Wasser nahe am Rand der Welt oder „offenes“ Wasser definiert, wird eine deutliche Lücke sichtbar. 
  
 Standard: 20
                 </message>
         </alert>
         <alert name="HelpRegionTerrainRaise" title="Obere Terraingrenze">
                 <message name="message">
-                        Der maximale Betrag in Metern, um den Parzelleneigentümer 
-ihr Terrain über die Standardhöhe des &apos;geformten&apos; Terrains 
-erhöhen können. 
+                        Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain über die Standardhöhe des „geformten“ Terrains erhöhen können. 
  
 Standard: 4
                 </message>
         </alert>
         <alert name="HelpRegionTerrainLower" title="Untere Terraingrenze">
                 <message name="message">
-                        Der maximale Betrag in Metern, um den Parzelleneigentümer 
-ihr Terrain unter die Standardhöhe des &apos;geformten&apos; Terrains 
-absenken können. 
+                        Der maximale Betrag in Metern, um den Parzelleneigentümer ihr Terrain unter die Standardhöhe des „geformten“ Terrains absenken können. 
  
 Standard: -4
                 </message>
@@ -3784,124 +3609,89 @@ Standard: -4
         </alert>
         <alert name="HelpRegionDownloadRaw" title="RAW-Terrain herunterladen">
                 <message name="message">
-                        Mit dieser Schaltfläche laden Sie eine Datei herunter, welche 
-die Höhendaten, Maße, den Verkaufsstatus der Parzelle und einige 
-Parzellenrechte für diese Region enthält. Wenn Sie diese Datei in einem Programm wie 
-Photoshop öffnen, müssen Sie die Bilddaten eingeben. Diese 
-sind: RGB, 256x256 mit 13 Kanälen. Anders lässt sich diese 
-Terraindatei nicht öffnen. 
+                        Mit dieser Schaltfläche laden Sie eine Datei herunter, welche die Höhendaten, Maße, den Verkaufsstatus der Parzelle und einige Parzellenrechte für diese Region enthält. Wenn Sie diese Datei in einem Programm wie Photoshop öffnen, müssen Sie die Bilddaten eingeben. Diese sind: RGB, 256x256 mit 13 Kanälen. Anders lässt sich diese Terraindatei nicht öffnen. 
  
 Weitere Informationen zur Bearbeitung der Höhendaten der Region enthält die F1-Hilfe.
                 </message>
         </alert>
         <alert name="HelpRegionUseEstateSun" title="Grundstücksonne verwenden">
                 <message name="message">
-                        Aktivieren Sie diese Option, um in dieser Region denselben 
-Sonnenstand wie auf dem restlichen Grundstück einzustellen. 
+                        Aktivieren Sie diese Option, um in dieser Region denselben Sonnenstand wie auf dem restlichen Grundstück einzustellen. 
  
-Standard: ein
+Standard: aktiviert
                 </message>
         </alert>
         <alert name="HelpRegionFixedSun" title="Sonne fest">
                 <message name="message">
-                        Aktivieren Sie diese Option, um den Sonnenstand auf 
-die im Regler definierte Position festzulegen und die Animation auszuschalten. 
+                        Aktivieren Sie diese Option, um den Sonnenstand auf die im Regler definierte Position festzulegen und die Animation auszuschalten. 
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpRegionBakeTerrain" title="Terrain formen">
                 <message name="message">
-                        Mit dieser Schaltfläche speichern Sie die aktuelle Terrain-Form 
-als neuen Standard für die Region. Nach der Formung können Sie und andere 
-das Land mit der Option &apos;Terrain bearbeiten&apos; &gt; &apos;Zurücksetzen&apos;
-in den ursprünglichen Zustand zurückversetzen. Das geformte Terrain ist auch das Zentrum 
-für die oberen und unteren Terraingrenzen.
+                        Mit dieser Schaltfläche speichern Sie die aktuelle Terrain-Form als neuen Standard für die Region. Nach der Formung können Sie und andere das Land mit der Option „Terrain bearbeiten“ &gt; „Zurücksetzen“ in den ursprünglichen Zustand zurückversetzen. Das geformte Terrain ist auch das Zentrum für die oberen und unteren Terraingrenzen.
                 </message>
         </alert>
         <alert name="HelpEstateEstateManager" title="Grundstücksverwalter">
                 <message name="message">
-                        Ein Grundstücksverwalter ist ein Einwohner, dem Sie die Kontrolle 
-über die Regions- und Grundstückseinstellungen übertragen haben.  Ein Grundstücksverwalter 
-kann alle Einstellungen ändern, außer das Hochladen, 
-Herunterladen und Formen von Terrain.  Vor allem kann er Einwohner 
-auf dem Grundstück erlauben und davon verbannen.  
+                        Ein Grundstücksverwalter ist ein Einwohner, dem Sie die Kontrolle über die Regions- und Grundstückseinstellungen übertragen haben.  Ein Grundstücksverwalter kann alle Einstellungen ändern, außer das Hochladen, Herunterladen und Formen von Terrain.  Vor allem kann er Einwohner auf dem Grundstück erlauben und davon verbannen.  
  
-Nur der Eigentümer kann den Grundstücksverwalter 
-bestimmen und entlassen. Der Verwalter hat dieses Recht nicht.  Wählen Sie nur vertrauenswürdige 
-Einwohner als Grundstücksverwalter, da Sie letztlich für 
-deren Handlungen verantwortlich sind.
+Nur der Eigentümer kann den Grundstücksverwalter bestimmen und entlassen. Der Verwalter hat dieses Recht nicht.  Wählen Sie nur vertrauenswürdige Einwohner als Grundstücksverwalter, da Sie letztlich für deren Handlungen verantwortlich sind.
                 </message>
         </alert>
         <alert name="HelpEstateUseGlobalTime" title="Globale Zeit verwenden">
                 <message name="message">
-                        Aktivieren Sie diese Option, um auf Ihrem Grundstück 
-denselben Sonnenstand wie auf dem Linden-&apos;Mainland&apos; 
-einzustellen. 
+                        Aktivieren Sie diese Option, um auf Ihrem Grundstück denselben Sonnenstand wie auf dem Linden-„Mainland“ einzustellen. 
  
-Standard: ein
+Standard: aktiviert
                 </message>
         </alert>
         <alert name="HelpEstateFixedSun" title="Sonne fest">
                 <message name="message">
-                        Aktivieren Sie diese Option, um den Sonnenstand auf 
-die im Regler definierte Position festzulegen und die Animation auszuschalten.
+                        Aktivieren Sie diese Option, um den Sonnenstand auf die im Regler definierte Position festzulegen und die Animation auszuschalten.
                 </message>
         </alert>
         <alert name="HelpEstateExternallyVisible" title="Öffentlich">
                 <message name="message">
-                        Aktivieren Sie diese Option, um Einwohnern den Zugang zu diesem Grundstück zu
-erlauben, ohne auf der Zugangsliste zu stehen.
+                        Aktivieren Sie diese Option, um Einwohnern den Zugang zu diesem Grundstück zu erlauben, ohne auf der Zugangsliste zu stehen.
  
-Standard: ein
+Standard: aktiviert
                 </message>
         </alert>
         <alert name="HelpEstateAllowDirectTeleport" title="Direktteleport zulassen">
                 <message name="message">
-                        Wenn aktiviert, können sich Einwohner an jede Stelle auf 
-Ihrem Grundstück teleportieren.  Wenn deaktiviert, werden Einwohner 
-zum nächstgelegenen Telehub teleportiert. 
+                        Wenn aktiviert, können sich Einwohner an jede Stelle auf Ihrem Grundstück teleportieren.  Wenn deaktiviert, werden Einwohner zum nächstgelegenen Telehub teleportiert. 
  
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="HelpEstateAllowResident" title="Zugang erlauben">
                 <message name="message">
-                        Der Zugang zu diesem Grundstück wird auf die hier 
-aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
-nur verfügbar, wenn &apos;Öffentlich&apos; 
-deaktiviert ist.
+                        Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist nur verfügbar, wenn „Öffentlich“ deaktiviert ist.
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="Gruppenzugang erlauben">
                 <message name="message">
-                        Der Zugang zu diesem Grundstück wird auf die hier 
-aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist 
-nur verfügbar, wenn &apos;Öffentlich&apos; 
-deaktiviert ist.
+                        Der Zugang zu diesem Grundstück wird auf die hier aufgeführten Einwohner und Gruppen beschränkt.  Diese Einstellung ist nur verfügbar, wenn „Öffentlich“ deaktiviert ist.
                 </message>
         </alert>
         <alert name="HelpEstateAbuseEmailAddress" title="E-Mail-Adresse für Missbrauchsmeldungen">
                 <message name="message">
-                        Geben Sie hier eine E-Mail-Adresse ein, an die 
-Missbrauchsmeldungen von diesem Grundstück gesendet werden. 
-Wenn dieses Feld leer ist, werden Missbrauchsmeldungen
-nur an Linden Lab gesendet.
+                        Geben Sie hier eine E-Mail-Adresse ein, an die Missbrauchsmeldungen von diesem Grundstück gesendet werden. 
+Wenn dieses Feld leer ist, werden Missbrauchsmeldungen nur an Linden Lab gesendet.
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="Zugang verweigern">
                 <message name="message">
-                        Einwohnern auf dieser Liste wird der Zugang zum Grundstück verwehrt, 
-unabhängig von etwaigen anderen Einstellungen.
+                        Einwohnern auf dieser Liste wird der Zugang zum Grundstück verwehrt, unabhängig von etwaigen anderen Einstellungen.
                 </message>
         </alert>
         <alert name="HelpEstateVoiceChat" title="Voice-Chat erlauben">
                 <message name="message">
-                        Die Parzellen auf diesem Grundstück können über eigene Voice-
-Channel verfügen, die es Einwohnern ermöglichen, sich mit
-anderen Personen in der Nähe zu unterhalten.
+                        Die Parzellen auf diesem Grundstück können über eigene Voice-Channel verfügen, die es Einwohnern ermöglichen, sich mit anderen Personen in der Nähe zu unterhalten.
 
-Standard: aus
+Standard: deaktiviert
                 </message>
         </alert>
         <alert name="VoiceVersionMismatch" title="Falsche Voice-Version">
@@ -3911,7 +3701,7 @@ Standard: aus
         </alert>
         <alert name="HelpEstateCovenant" title="Grunstücksvertrag">
                 <message name="message">
-                        Ein Grundstücksvertrag ermöglicht es Ihnen, Grundstücksparzellen zu verkaufen. Ohne Vertrag können Sie kein Land verkaufen. Wenn Sie keine Regeln festlegen oder Käufern vor dem Kauf keine anderen Informationen über das Land bereitstellen möchten, können Sie die Vertrags-Notizkarte auch leer lassen.  Ein Vertrag kann Regeln und Richtlinien, kulturelle Informationen oder einfach nur Ihre eigenen Erwartungen bezüglich der Landnutzung durch den Käufer enthalten. Das kann Zoning, Baubeschränkungen, Zahloptionen und alle möglichen anderen Informationen betreffen, die der neue Eigentümer Ihrer Meinung nach kennen und akzeptieren sollte.  Der Käufer muss dem Vertrag durch Auswahl dieses Kontrollkästchens zustimmen, bevor der Kauf abgeschlossen werden kann. Grundstücksverträge sind jederzeit unter &apos;Land-Info&apos; für jede Parzelle einsehbar, für die ein Vertrag definiert wurde.
+                        Ein Grundstücksvertrag ermöglicht es Ihnen, Grundstücksparzellen zu verkaufen. Ohne Vertrag können Sie kein Land verkaufen. Wenn Sie keine Regeln festlegen oder Käufern vor dem Kauf keine anderen Informationen über das Land bereitstellen möchten, können Sie die Vertrags-Notizkarte auch leer lassen.  Ein Vertrag kann Regeln und Richtlinien, kulturelle Informationen oder einfach nur Ihre eigenen Erwartungen bezüglich der Landnutzung durch den Käufer enthalten. Das kann Zoning, Baubeschränkungen, Zahloptionen und alle möglichen anderen Informationen betreffen, die der neue Eigentümer Ihrer Meinung nach kennen und akzeptieren sollte.  Der Käufer muss dem Vertrag durch Auswahl dieses Kontrollkästchens zustimmen, bevor der Kauf abgeschlossen werden kann. Grundstücksverträge sind jederzeit unter „Land-Info“ für jede Parzelle einsehbar, für die ein Vertrag definiert wurde.
                 </message>
         </alert>
         <alert name="BuyObjectOneOnly" title="Objekte können nicht gekauft werden">
@@ -4068,9 +3858,7 @@ Geben Sie Ihr Kennwort erneut ein und klicken Sie auf OK.
         <alert name="SetPickLocation">
                 <message name="message">
                         Hinweis:
-Sie haben die Position dieser
-Auswahl aktualisiert, aber die anderen
-Daten behalten ihre ursprünglichen Werte.
+Sie haben die Position dieser Auswahl aktualisiert, aber die anderen Daten behalten ihre ursprünglichen Werte.
                 </message>
                 <option name="OK">
                         OK
@@ -4078,7 +3866,7 @@ Daten behalten ihre ursprünglichen Werte.
         </alert>
         <alert name="MoveInventoryFromObject">
                 <message name="message">
-                        Sie haben &apos;nicht kopierfähige&apos; Inventarobjekte ausgewählt.
+                        Sie haben „nicht kopierfähige“ Inventarobjekte ausgewählt.
 Diese Objekte werden nicht kopiert, sondern in Ihr Inventar verschoben.
  
 Inventarobjekt(e) verschieben?
@@ -4095,10 +3883,8 @@ Inventarobjekt(e) verschieben?
         </alert>
         <alert name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        Sie haben &apos;nicht kopierfähige&apos; Inventarobjekte ausgewählt.  Diese Objekte 
-werden nicht kopiert, sondern in Ihr Inventar verschoben.
-Da es sich um ein geskriptetes Objekt handelt, geht 
-die Skriptfunktion beim Verschieben in das Inventar möglicherweise verloren. 
+                        Sie haben „nicht kopierfähige“ Inventarobjekte ausgewählt.  Diese Objekte werden nicht kopiert, sondern in Ihr Inventar verschoben.
+Da es sich um ein geskriptetes Objekt handelt, geht die Skriptfunktion beim Verschieben in das Inventar möglicherweise verloren. 
  
 Inventarobjekt(e) verschieben?
                 </message>
@@ -4114,11 +3900,10 @@ Inventarobjekt(e) verschieben?
         </alert>
         <alert name="ClickActionNotPayable">
                 <message name="message">
-                        Achtung: Die Klick-Aktion &apos;Objekt bezahlen&apos; wurde definiert, sie 
-funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt wird.
+                        Achtung: Die Klick-Aktion „Objekt bezahlen“ wurde definiert, sie funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt wird.
                 </message>
                 <ignore name="ignore">
-                        Beim Einrichten von Events mit &apos;Objektbezahlung&apos; ohne Geld
+                        Beim Einrichten von Events mit „Objektbezahlung“ ohne Geld
                 </ignore>
         </alert>
         <alert name="OpenObjectCannotCopy">
@@ -4184,34 +3969,28 @@ funktioniert aber nur, wenn ein Skript mit einem money() Ereignis hinzugefügt w
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        Verwenden Sie dieses Tool, um Verletzungen der Servicebedingungen 
-und Community-Standards zu melden. Siehe:
+                        Verwenden Sie dieses Tool, um Verletzungen der Servicebedingungen und Community-Standards zu melden. Siehe:
 
 http://secondlife.com/corporate/tos.php 
 http://secondlife.com/corporate/cs.php
 
-Alle gemeldeten Verletzungen der Servicebedingungen und Community-Standards 
-werden geprüft und geklärt. Sie können den Prozess im 
-Police Blotter verfolgen:
+Alle gemeldeten Verletzungen der Servicebedingungen und Community-Standards werden geprüft und geklärt Sie können den Prozess im Incident Report (Vorfallsbericht) verfolgen:
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
                 <message name="message">
                         WICHTIG: Diese Meldung wird an den Eigentümer der Region gesendet, in der Sie sich gerade befinden, nicht an Linden Lab.
 -
-Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet. Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind. (Den Vertrag können Sie unter &apos;Welt&apos; &gt; &apos;Land-Info&apos; einsehen.)
+Als besonderen Service für Einwohner und Besucher übernimmt der Eigentümer dieser Region die Bearbeitung aller anfallenden Meldungen. Von diesem Standort aus eingereichte Meldungen werden nicht von Linden Lab bearbeitet. Der Eigentümer der Region bearbeitet Meldungen auf Grundlage der Richtlinien, die im für diese Region geltenden Grundstücksvertrag festgelegt sind. (Den Vertrag können Sie unter „Welt“ &gt; „Land-Info“ einsehen.)
 -
 Das Resultat, das sich aus dieser Meldung ergibt, betrifft nur diese Region; der Einwohnerzugang zu anderen Bereichen von Second Life ist davon nicht betroffen. Nur Linden Lab kann den Zugang zu Second Life beschränken.
                 </message>
         </alert>
         <alert name="HelpReportBug">
                 <message name="message">
-                        Verwenden Sie dieses Tool *nur*, um technische Features zu melden,
-die nicht wie beschrieben oder erwartet funktionieren. Bitte machen
-Sie so viele Angaben wie möglich. Sie können auf die automatische
-Antwort-E-Mail antworten, um Ihre Meldung noch zu ergänzen.
+                        Verwenden Sie dieses Tool *nur*, um technische Features zu melden, die nicht wie beschrieben oder erwartet funktionieren. Bitte machen Sie so viele Angaben wie möglich. Sie können auf die automatische Antwort-E-Mail antworten, um Ihre Meldung noch zu ergänzen.
 Alle gemeldeten Fehler werden geprüft und bewertet. Sie erhalten keine persönliche Antwort auf Ihre E-Mail.
 -
 Bei technischen Problemen wenden Sie sich bitte an den Support unter: 
@@ -4259,33 +4038,29 @@ Eine genaue Zusammenfassung hilft uns, Fehler schneller zu beseitigen.
         <alert name="HelpReportAbuseDetailsEmpty">
                 <message name="message">
                         Bitte geben Sie eine ausführliche Beschreibung des Vorfalls ein.
-Eine möglichst genaue Beschreibung mit Namen und
-Einzelheiten
-hilft uns, Fälle von Missbrauch zu ahnden.
+Eine möglichst genaue Beschreibung mit Namen und Einzelheiten hilft uns, Fälle von Missbrauch zu ahnden.
                 </message>
         </alert>
         <alert name="HelpReportBugDetailsEmpty">
                 <message name="message">
                         Bitte geben Sie eine ausführliche Fehlerbeschreibung ein.
-Eine möglichst genaue Beschreibung mit Schritten zur Reproduktion des Fehlers
-hilft uns,
-Fehler schneller zu beseitigen.
+Eine möglichst genaue Beschreibung mit Schritten zur Reproduktion des Fehlers hilft uns, Fehler schneller zu beseitigen.
                 </message>
         </alert>
         <alert name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         Sehr geehrte(r) Einwohner(in),
+ 
+Sie melden eine Urheberrechtsverletzung. Sind Sie wirklich sicher, dass Sie eine Verletzung des Urheberrechts melden möchten?
 
-achten Sie bei der Meldung einer Urheberrechtsverletzung darauf, dass Sie dabei korrekt vorgehen:
-
-1. Missbrauch melden. Wenn Sie der Meinung sind, ein Einwohner nutzt das Berechtigungssystem von Second Life auf unerlaubte Weise zu seinem Vorteil aus, indem er zum Beispiel einen CopyBot oder verwandte Kopiertools verwendet und damit eine Urheberrechtsverletzung begeht, können Sie diesen Missbrauch melden.Das Missbrauchsteam untersucht etwaige Verstöße gegen die Second Life Community Standards oder die Nutzungsbedingungen und verhängt entsprechende Strafen.Das Missbrauchsteam ist jedoch nicht dafür zuständig, Inhalte aus der Second Life-Welt zu entfernen und reagiert auch nicht auf entsprechende Anfragen.
+1. Missbrauch melden. Wenn Sie der Meinung sind, ein Einwohner nutzt das Berechtigungssystem von Second Life auf unerlaubte Weise zu seinem Vorteil aus, indem er zum Beispiel einen CopyBot oder ähnliche Kopiertools verwendet und damit eine Urheberrechtsverletzung begeht, können Sie diesen Missbrauch melden. Das Missbrauchsteam untersucht etwaige Verstöße gegen die Second Life Community Standards oder die Nutzungsbedingungen und verhängt entsprechende Strafen. Das Missbrauchsteam ist jedoch nicht dafür zuständig, Inhalte aus der Second Life-Welt zu entfernen und reagiert auch nicht auf entsprechende Anfragen.
 
-2. Die DMCA oder Inhaltsentfernungs-Vorgehensweise. Sie können das Entfernen von Inhalten aus Second Life beantragen. Dazu müssen Sie eine Urheberrechtsverletzung gemäß den in unserer DMCA-Richtlinie unter http://secondlife.com/corporate/dmca.php dargelegten Anweisungen einreichen.
+2. Der DMCA oder das Entfernen von Inhalten. Sie können das Entfernen von Inhalten aus Second Life beantragen. Dazu MÜSSEN Sie eine Urheberrechtsverletzung gemäß den in unserer DMCA-Richtlinie unter http://secondlife.com/corporate/dmca.php dargelegten Anweisungen einreichen.
 
-Wenn Sie jetzt mit der Missbrauchmeldung fortfahren möchten, schließen Sie bitte dieses Fenster und senden Sie Ihren Bericht ein.
+Wenn Sie mit der Missbrauchmeldung jetzt fortfahren möchten, schließen Sie bitte dieses Fenster und senden Sie Ihren Bericht ein.  Möglicherweise müssen Sie Kategorie „CopyBot oder Berechtigungs-Exploit“ auswählen.
 
 Vielen Dank,
-
+ 
 Linden Lab
                 </message>
         </alert>
@@ -4312,12 +4087,9 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
         </alert>
         <alert name="BusyModePay" title="Beschäftigt-Modus-Warnung">
                 <message name="message">
-                        Sie sind im Beschäftigt-Modus, sodass
-Sie im Austausch für diese Zahlung keine
-Objekte erhalten können.
+                        Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
  
-Möchten Sie den Bechäftigt-Modus verlassen,
-bevor Sie diese Transaktion abschließen?
+Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
                 </message>
                 <ignore name="ignore">
                         Beim Bezahlen einer Person oder eines Objekts im Beschäftigt-Modus
@@ -4331,8 +4103,7 @@ bevor Sie diese Transaktion abschließen?
         </alert>
         <alert name="ConfirmEmptyTrash">
                 <message name="message">
-                        Möchten Sie den Inhalt Ihres Papierkorbs
-wirklich löschen?
+                        Möchten Sie den Inhalt Ihres Papierkorbs wirklich löschen?
                 </message>
                 <ignore name="ignore">
                         Beim Leeren des Inventar-Papierkorbs
@@ -4379,8 +4150,7 @@ wirklich löschen?
         </alert>
         <alert name="ConfirmEmptyLostAndFound">
                 <message name="message">
-                        Möchten Sie den Inhalt Ihres Fundstücke-Ordners
-wirklich permanent löschen?
+                        Möchten Sie den Inhalt Ihres Fundstücke-Ordners wirklich permanent löschen?
                 </message>
                 <ignore name="ignore">
                         Beim Leeren von Inventar und Fundstückeordner-
@@ -4397,8 +4167,7 @@ wirklich permanent löschen?
                         Die folgende SLURL wurde in die Zwischenablage kopiert:
  [SLURL] 
 
-Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort
-zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.
+Veröffentlichen Sie sie auf einer Website, um anderen den Zugang zu diesem Ort zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Browsers kopieren.
                 </message>
                 <ignore name="ignore">
                         Beim Kopieren einer SLURL in die Zwischenablage
@@ -4406,7 +4175,7 @@ zu erleichtern, oder testen Sie sie, indem Sie sie in die Adressleiste Ihres Bro
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client.  Im Fenster &apos;Einstellungen&apos; &gt; &apos;Grafik&apos; stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen &apos;Benutzerdefiniert&apos;, um die folgenden Einstellungen zu bearbeiten:
+                        Die Optionen in diesem Dialog steuern Fenstergröße und Auflösung sowie die Qualität der Grafikdarstellung im Client.  Im Fenster „Einstellungen“ &gt; „Grafik“ stehen vier Grafikeinstellungen zur Wahl: Niedrig, Mittel, Hoch und Ultra. Die Grafikeinstellungen lassen sich auch individuell anpassen; aktivieren Sie das Kontrollkästchen „Benutzerdefiniert“, um die folgenden Einstellungen zu bearbeiten:
 
 Shader: Aktivieren oder deaktivieren Sie die verschiedenen Pixel-Shader. 
 
@@ -4484,34 +4253,34 @@ Terraindetails: Legt den Detailgrad bei der Berechnung der Terraintextur fest.
                 <message name="message">
                         Diese Einstellungen haben Auswirkung auf die lokale Darstellung der Umwelt auf Ihrem Computer. Zugriff auf alle Einstellungen haben Sie nur, wenn Ihre Grafikkarte Atmosphären-Shader unterstützt.
  
-Mit dem Regler &quot;Tageszeit&quot; stellen Sie die lokal in Ihrem Viewer dargestellte Tageszeit ein.
+Mit dem Regler „Tageszeit“ stellen Sie die lokal in Ihrem Viewer dargestellte Tageszeit ein.
  
-Mit dem Regler &quot;Wolkendecke&quot; steuern Sie die Wolkendichte am Himmel.
+Mit dem Regler „Wolkendecke“ steuern Sie die Wolkendichte am Himmel.
  
-Unter &quot;Wasserfarbe&quot; können Sie eine Farbe für die Wasserdarstellung auswählen.
+Unter „Wasserfarbe“ können Sie eine Farbe für die Wasserdarstellung auswählen.
  
-Mit dem Regler &quot;Wassertrübung&quot; steuern Sie die Sichtweite unter Wasser.
+Mit dem Regler „Wassertrübung“ steuern Sie die Sichtweite unter Wasser.
  
-Klicken Sie auf &quot;Grundstückszeit verw.&quot;, um die aktuelle Zeit in der Region fest als Tageszeit einzustellen.  
+Klicken Sie auf „Grundstückszeit verw.“, um die aktuelle Zeit in der Region fest als Tageszeit einzustellen.  
  
-Klicken Sie auf &quot;Himmel (erweitert)&quot;, um einen Editor mit erweiterten Einstellungen für die Himmeldarstellung anzuzeigen. 
+Klicken Sie auf „Himmel (erweitert)“, um einen Editor mit erweiterten Einstellungen für die Himmeldarstellung anzuzeigen. 
  
-Klicken Sie auf &quot;Wasser (erweitert)&quot;, um einen Editor mit erweiterten Einstellungen für die Wasserdarstellung anzuzeigen.
+Klicken Sie auf „Wasser (erweitert)“, um einen Editor mit erweiterten Einstellungen für die Wasserdarstellung anzuzeigen.
                 </message>
         </alert>
         <alert name="HelpDayCycle">
                 <message name="message">
                         Im Tageszyklus-Editor steuern Sie den Tag-/Nachtzyklus am Second Life Himmel. Dabei handelt es sich um den Zyklus, der mit dem Tageszeit-Regler im Umwelt-Basiseditor gesteuert wird.
 
-Der Tageszyklus-Editor verwendet sogenannte Keyframes zur Steuerung des Tag-/Nachtablaufs. Dabei handelt es sich um &quot;Schlüsselbilder&quot; (die grauen Kreise auf der Zeitskala), für die bestimmte Himmelseinstellungen definiert wurden. Bei voranschreitender Tageszeit interpoliert WindLight den Übergang zwischen diesen Keyframes und erzeugt eine entsprechende Himmelsanimation. 
+Der Tageszyklus-Editor verwendet sogenannte Keyframes zur Steuerung des Tag-/Nachtablaufs. Dabei handelt es sich um „Schlüsselbilder“ (die grauen Kreise auf der Zeitskala), für die bestimmte Himmelseinstellungen definiert wurden. Bei voranschreitender Tageszeit interpoliert WindLight den Übergang zwischen diesen Keyframes und erzeugt eine entsprechende Himmelsanimation. 
 
-Der gelbe Pfeil über der Zeitskala repräsentiert die aktuelle Tageszeit-Darstellung. Ziehen Sie den Pfeil, um die Tagesanimation anzuzeigen. Mit &quot;Key hinzu&quot; und &quot;Key löschen&quot; rechts neben der Zeitskala können Sie neue Keys einfügen und vorhandene löschen.
+Der gelbe Pfeil über der Zeitskala repräsentiert die aktuelle Tageszeit-Darstellung. Ziehen Sie den Pfeil, um die Tagesanimation anzuzeigen. Mit „Key hinzu“ und „Key löschen“ rechts neben der Zeitskala können Sie neue Keys einfügen und vorhandene löschen.
 
-Keyframes lassen sich einfach entlang der Zeitskala verschieben, oder Sie geben die Werte manuell unter &quot;Keyframe-Einstellungen&quot; ein. Hier wählen Sie auch eine WindLight-Voreinstellung für den Keyframe aus.
+Keyframes lassen sich einfach entlang der Zeitskala verschieben, oder Sie geben die Werte manuell unter „Keyframe-Einstellungen“ ein. Hier wählen Sie auch eine WindLight-Voreinstellung für den Keyframe aus.
 
-&quot;Zykluslänge&quot; bestimmt die Gesamtlänge eines &quot;Tages&quot;. Ein niedriger Wert (z.B. 2 Minuten) führt dazu, dass ein ganzer 24-Stunden-Tag innerhalb von zwei Minuten Echtzeit abgespult wird! Wenn Sie alle Einstellungen auf der Zeitskala und für die einzelnen Keyframes vorgenommen haben, können Sie mit &quot;Start&quot; und &quot;Stopp&quot; die Animation anzeigen. Das funktioniert natürlich genauso interaktiv, indem Sie den gelben Pfeil über der Zeitskala verschieben. Mit der Schaltfläche &quot;Grundstückszeit verw.&quot; synchronisieren Sie die Tageszeit und -länge mit den auf dem Grundstück geltenden Einstellungen.
+„Zykluslänge“ bestimmt die Gesamtlänge eines „Tages“. Ein niedriger Wert (z.B. 2 Minuten) führt dazu, dass ein ganzer 24-Stunden-Tag innerhalb von zwei Minuten Echtzeit abgespult wird! Wenn Sie alle Einstellungen auf der Zeitskala und für die einzelnen Keyframes vorgenommen haben, können Sie mit „Start“ und „Stopp“ die Animation anzeigen. Das funktioniert natürlich genauso interaktiv, indem Sie den gelben Pfeil über der Zeitskala verschieben. Mit der Schaltfläche „Grundstückszeit verw.“ synchronisieren Sie die Tageszeit und -länge mit den auf dem Grundstück geltenden Einstellungen.
 
-Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen &quot;Testtag speichern&quot; und &quot;Testtag laden&quot; speichern bzw. laden. Bis dato kann nur ein Tageszyklus gleichzeitig in Verwendung sein.
+Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen „Testtag speichern“ und „Testtag laden“ speichern bzw. laden. Bis dato kann nur ein Tageszyklus gleichzeitig in Verwendung sein.
                 </message>
         </alert>
         <alert name="HelpBlueHorizon">
@@ -4521,11 +4290,7 @@ Ihre Tageszyklus-Einstellungen lassen sich mit den Schaltflächen &quot;Testtag
         </alert>
         <alert name="HelpHazeHorizon">
                 <message name="message">
-                        Horizonttrübung ist einer der wichtigsten Parameter, um 
-die Gesamtlichtsituation in der Szene zu steuern.  Damit
-lassen sich viele Belichtungseinstellungen simulieren,
-z.B. ein Ãœberstrahlen durch die Sonne oder 
-starker Dunst.
+                        Horizonttrübung ist einer der wichtigsten Parameter, um die Gesamtlichtsituation in der Szene zu steuern.  Damit lassen sich viele Belichtungseinstellungen simulieren, z.B. ein Überstrahlen durch die Sonne oder starker Dunst.
                 </message>
         </alert>
         <alert name="HelpBlueDensity">
@@ -4535,32 +4300,22 @@ starker Dunst.
         </alert>
         <alert name="HelpHazeDensity">
                 <message name="message">
-                        Trübungsintensität steuert die Stärke des grauen
-Dunsts in der Atmosphäre.  Damit lassen sich 
-zum Beispiel starker Rauch oder Luftverschmutzung
-simulieren.  Auch für Nebel und
-Sprühregen geeignet.
+                        Trübungsintensität steuert die Stärke des grauen Dunsts in der Atmosphäre.  Damit lassen sich zum Beispiel starker Rauch oder Luftverschmutzung simulieren.  Auch für Nebel und Sprühregen geeignet.
                 </message>
         </alert>
         <alert name="HelpDensityMult">
                 <message name="message">
-                        Der Dichtemultiplikator beeinflusst die Gesamtdichte der Atmosphäre. Niedrige Einstellungen erzeugen die Anmutung &quot;dünner, sauberer Luft&quot;, hohe Einstellungen erzeugen den Eindruck schweren Smogs.
+                        Der Dichtemultiplikator beeinflusst die Gesamtdichte der Atmosphäre. Niedrige Einstellungen erzeugen den Eindruck dünner, sauberer Luft, hohe Einstellungen erzeugen den Eindruck schweren Smogs.
                 </message>
         </alert>
         <alert name="HelpDistanceMult">
                 <message name="message">
-                        Steuert die Entfernungswirkung von WindLight.  Ein Wert von
-Null schaltet den Einfluss von WindLight auf Terrain und
-Objekte praktisch aus.  Werte über 1 simulieren
-größere Entfernungen und verstärken den Atmosphäreneffekt.
+                        Steuert die Entfernungswirkung von WindLight.  Ein Wert von Null schaltet den Einfluss von WindLight auf Terrain und Objekte praktisch aus.  Werte über 1 simulieren größere Entfernungen und verstärken den Atmosphäreneffekt.
                 </message>
         </alert>
         <alert name="HelpMaxAltitude">
                 <message name="message">
-                        Max. Höhe steuert die Höhenberechnungen von WindLight
-bei der Berechnung der atmosphärischen Beleuchtung.  Zu
-späteren Tageszeiten lässt sich damit zum Beispiel
-die &quot;Intensität&quot; des Sonnenuntergangs beeinflussen.
+                        Max. Höhe steuert die Höhenberechnungen von WindLight bei der Berechnung der atmosphärischen Beleuchtung. Zu späteren Tageszeiten lässt sich damit zum Beispiel die „Intensität“ des Sonnenuntergangs beeinflussen.
                 </message>
         </alert>
         <alert name="HelpSunlightColor">
@@ -4575,9 +4330,8 @@ die &quot;Intensität&quot; des Sonnenuntergangs beeinflussen.
         </alert>
         <alert name="HelpSunGlow">
                 <message name="message">
-                        Der Regler &quot;Größe&quot; steuert die Größe der Sonne.
-Der Regler &quot;Fokus&quot; steuert, wie unscharf die Sonne 
-am Himmel erscheint.
+                        Der Regler „Größe“ steuert die Größe der Sonne.
+Der Regler „Fokus“ steuert, wie unscharf die Sonne am Himmel erscheint.
                 </message>
         </alert>
         <alert name="HelpSceneGamma">
@@ -4604,24 +4358,17 @@ Entspricht dem Azimut.
         </alert>
         <alert name="HelpCloudColor">
                 <message name="message">
-                        Steuert die Wolkenfarbe.  Generell empfiehlt
-sich hier ein Weißton, aber hey,
-warum nicht ein bisschen Spaß haben?
+                        Steuert die Wolkenfarbe. Generell empfiehlt sich hier ein Weißton, aber hey, warum nicht ein bisschen Spaß haben?
                 </message>
         </alert>
         <alert name="HelpCloudDetail">
                 <message name="message">
-                        Steuert das Detailbild, welches über das Wolken-
-Hauptbild gelegt wird.  X und Y bestimmen
-seine Position.  D (Dichte) regelt, wie ausgebeult oder 
-zerrissen die Wolken wirken.
+                        Steuert das Detailbild, welches über das Wolken-Hauptbild gelegt wird.  X und Y bestimmen seine Position.  D (Dichte) regelt, wie ausgebeult oder zerrissen die Wolken wirken.
                 </message>
         </alert>
         <alert name="HelpCloudDensity">
                 <message name="message">
-                        Mit den X- und Y-Reglern steuern Sie die
-Position der Wolken, mit dem Regler D die
-Wolkendichte.
+                        Mit den X- und Y-Reglern steuern Sie die Position der Wolken, mit dem Regler D die Wolkendichte.
                 </message>
         </alert>
         <alert name="HelpCloudCoverage">
@@ -4786,13 +4533,12 @@ Wolkendichte.
         </alert>
         <alert name="Cannot_Purchase_an_Attachment">
                 <message name="message">
-                        Objekte können nicht gekauft werden,
-solange sie Teil eines Anhangs sind.
+                        Objekte können nicht gekauft werden, solange sie Teil eines Anhangs sind.
                 </message>
         </alert>
         <alert name="DebitPermissionDetails" title="Info zur Abfrage der Abbucherlaubnis">
                 <message name="message">
-                        Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object&apos;s owner must delete the object or reset the scripts in the object.
+                        Wenn Sie dieser Anfrage zustimmen, erhält das Skript die Erlaubnis, regelmäßig Linden-Dollar (L$) von Ihrem Konto abzubuchen. Diese Erlaubnis kann nur zurückgezogen werden, wenn der Eigentümer das Objekt löscht oder die Skripts in dem Objekt zurücksetzt.
                 </message>
                 <option name="OK">
                         OK
@@ -4818,8 +4564,7 @@ solange sie Teil eines Anhangs sind.
  [SLURL]
 Die meisten Links ähneln dem Folgenden:
 
-secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
-fd37083abc4c/about
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
 
 Überprüfen Sie die Schreibweise und versuchen Sie es erneut.
                 </message>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about.xml b/linden/indra/newview/skins/default/xui/de/floater_about.xml
index 7c9b242..238dfd5 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Ãœber Second Life">
         <text_editor name="credits_editor">
-                Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ und vielen anderen.
+                Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les und vielen anderen.
 
-Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,7 +26,7 @@ Alle Rechte vorbehalten. Details siehe licenses.txt.
 Voice-Chat-Audiocoding: Polycom(R) Siren14(TM) (ITU-T Empf.G.722.1 Anhang C)
 
 
-Wir können nur eine kurze Distanz in die Zukunft blicken, aber dort können wir eine Menge sehen, was getan werden muss. --Alan Turing
+I get by with a little help from my friends. (etwa: Ich überlebe mit ein bisschen Unterstützung von meinen Freunden.) --Richard Starkey
         </text_editor>
         <text name="you_are_at">
                 Sie befinden sich in [POSITION]
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about_land.xml b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
index b75eeba..ecb7875 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -1,287 +1,259 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="Land-Info">
         <tab_container name="landtab">
                 <panel label="Allgemein" name="land_general_panel">
-                        <text type="string" length="1" name="Name:">
+                        <text name="Name:">
                                 Name:
                         </text>
-                        <text type="string" length="1" name="Description:">
+                        <text name="Description:">
                                 Beschreibung:
                         </text>
-                        <text type="string" length="1" name="Owner:">
+                        <text name="Owner:">
                                 Eigentümer:
                         </text>
-                        <text type="string" length="1" name="OwnerText">
+                        <text name="OwnerText">
                                 Leyla Linden
                         </text>
-                        <button label="Profil..." label_selected="Profil..." name="Profile..." />
-                        <text type="string" length="1" name="Group:">
+                        <button label="Profil..." label_selected="Profil..." name="Profile..."/>
+                        <text name="Group:">
                                 Gruppe:
                         </text>
-                        <button label="Einstellen..." label_selected="Einstellen..." name="Set..." />
-                        <check_box label="Ãœbertragung an Gruppe zulassen" name="check deed"
-                             tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet." />
-                        <button label="Ãœbertragen..." label_selected="Ãœbertragen..." name="Deed..."
-                             tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind." />
-                        <check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib"
-                             tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten." />
-                        <text type="string" length="1" name="For Sale:">
+                        <button label="Einstellen..." label_selected="Einstellen..." name="Set..."/>
+                        <check_box label="Übertragung an Gruppe zulassen" name="check deed" tool_tip="Ein Gruppen-Officer kann dieses Land der Gruppe übertragen. Das Land wird dann über die Landzuteilung der Gruppe verwaltet."/>
+                        <button label="Übertragen..." label_selected="Übertragen..." name="Deed..." tool_tip="Sie können Land nur übertragen, wenn Sie in der ausgewählten Gruppe Officer sind."/>
+                        <check_box label="Eigentümer leistet Beitrag durch Übertragung" name="check contrib" tool_tip="Wenn das Land an die Gruppe übertragen wird, trägt der frühere Eigentümer ausreichend Landnutzungsrechte bei, um es zu halten."/>
+                        <text name="For Sale:">
                                 Zum Verkauf:
                         </text>
-                        <text type="string" length="1" name="Not for sale.">
+                        <text name="Not for sale.">
                                 Nicht zu verkaufen.
                         </text>
-                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+                        <text name="For Sale: Price L$[PRICE].">
                                 Preis: [PRICE] L$.
                         </text>
-                        <button label="Land verkaufen..." label_selected="Land verkaufen..."
-                             name="Sell Land..." />
-                        <text type="string" length="1" name="For sale to">
+                        <button label="Land verkaufen..." label_selected="Land verkaufen..." name="Sell Land..." bottom="-200"/>
+                        <text name="For sale to">
                                 Zum Verkauf an: [BUYER]
                         </text>
-                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
+                        <text name="Sell with landowners objects in parcel." width="210">
                                 Objekte sind im Verkauf eingeschlossen.
                         </text>
-                        <text type="string" length="1" name="Selling with no objects in parcel.">
+                        <text name="Selling with no objects in parcel." width="237">
                                 Objekte sind im Verkauf nicht eingeschlossen.
                         </text>
-                        <button label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen"
-                             name="Cancel Land Sale" />
-                        <text type="string" length="1" name="Claimed:">
+                        <button label="Landverkauf abbrechen" label_selected="Landverkauf abbrechen" name="Cancel Land Sale" bottom="-204"/>
+                        <text name="Claimed:">
                                 Gekauft am:
                         </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text name="DateClaimText">
                                 Dienstag, 15. Aug. 2006, 13:47:25
                         </text>
-                        <text type="string" length="1" name="PriceLabel">
+                        <text name="PriceLabel">
                                 Gebiet:
                         </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text name="PriceText">
                                 4048 qm
                         </text>
-                        <text type="string" length="1" name="Traffic:">
+                        <text name="Traffic:">
                                 Traffic:
                         </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text name="DwellText">
                                 0
                         </text>
-                        <button label="Land kaufen..." label_selected="Land kaufen..." name="Buy Land..." />
-                        <button label="Für Gruppe kaufen..." label_selected="Für Gruppe kaufen..."
-                             name="Buy For Group..." />
-                        <button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..."
-                             tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land." />
-                        <button label="Land aufgeben..." label_selected="Land aufgeben..."
-                             name="Abandon Land..." />
-                        <button label="Land in Besitz nehmen..." label_selected="Land in Besitz nehmen..."
-                             name="Reclaim Land..." />
-                        <button label="Linden-Verkauf..." label_selected="Linden-Verkauf..."
-                             name="Linden Sale..."
-                             tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen." />
-                        <text name="new users only">
+                        <button label="Land kaufen..." label_selected="Land kaufen..." name="Buy Land..."/>
+                        <button label="Für Gruppe kaufen..." label_selected="Für Gruppe kaufen..." name="Buy For Group..."/>
+                        <button label="Pass kaufen..." label_selected="Pass kaufen..." name="Buy Pass..." tool_tip="Ein Pass gibt Ihnen zeitbegrenzten Zugang zu diesem Land."/>
+                        <button label="Land aufgeben..." label_selected="Land aufgeben..." name="Abandon Land..."/>
+                        <button label="Land in Besitz nehmen..." label_selected="Land in Besitz nehmen..." name="Reclaim Land..."/>
+                        <button label="Linden-Verkauf..." label_selected="Linden-Verkauf..." name="Linden Sale..." tool_tip="Land muss Eigentum und auf Inhalt gesetzt sein und nicht zur Auktion stehen."/>
+                        <string name="new users only">
                                 Nur neue Benutzer
-                        </text>
-                        <text name="anyone">
+                        </string>
+                        <string name="anyone">
                                 Jeder
-                        </text>
-                        <text name="area_text">
+                        </string>
+                        <string name="area_text">
                                 Gebiet:
-                        </text>
-                        <text name="area_size_text">
+                        </string>
+                        <string name="area_size_text">
                                 [AREA] qm
-                        </text>
-                        <text name="auction_id_text">
+                        </string>
+                        <string name="auction_id_text">
                                 Auktions-ID: [ID]
-                        </text>
-                        <text name="need_tier_to_modify">
+                        </string>
+                        <string name="need_tier_to_modify">
                                 Bestätigen Sie den Kauf, um dieses Land zu bearbeiten.
-                        </text>
-                        <text name="group_owned_text">
+                        </string>
+                        <string name="group_owned_text">
                                 (In Gruppenbesitz)
-                        </text>
-                        <text name="profile_text">
+                        </string>
+                        <string name="profile_text">
                                 Profil...
-                        </text>
-                        <text name="info_text">
+                        </string>
+                        <string name="info_text">
                                 Info...
-                        </text>
-                        <text name="public_text">
+                        </string>
+                        <string name="public_text">
                                 (öffentlich)
-                        </text>
-                        <text name="none_text">
-                                (-)
-                        </text>
-                        <text name="sale_pending_text">
+                        </string>
+                        <string name="none_text">
+                                (keiner)
+                        </string>
+                        <string name="sale_pending_text">
                                 (Wird verkauft)
-                        </text>
+                        </string>
                         <string name="no_selection_text">
                                 Keine Parzelle ausgewählt.
-Öffnen Sie &quot;Welt&quot; &gt; &quot;Land-Info&quot; oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
+Öffnen Sie „Welt“ &gt; „Land-Info“ oder wählen Sie eine andere Parzelle aus, um Informationen darüber anzuzeigen.
                         </string>
                 </panel>
                 <panel label="Vertrag" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text name="covenant_timestamp_text">
                                 Letzte Änderung am Mittwoch, den 31. Dez. 1969, 16:00:00
                         </text>
-                        <text type="string" length="1" name="region_name_lbl">
+                        <text name="region_name_lbl">
                                 Region:
                         </text>
-                        <text type="string" length="1" name="region_name_text">
+                        <text name="region_name_text">
                                 leyla
                         </text>
-                        <text type="string" length="1" name="estate_name_lbl">
+                        <text name="estate_name_lbl">
                                 Grundstück:
                         </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text name="estate_name_text">
                                 Mainland
                         </text>
-                        <text type="string" length="1" name="estate_owner_lbl">
+                        <text name="estate_owner_lbl">
                                 Eigentümer:
                         </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text name="estate_owner_text">
                                 (keiner)
                         </text>
-                        <text type="string" length="1" name="resellable_clause">
+                        <text name="resellable_clause">
                                 Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
                         </text>
-                        <text type="string" length="1" name="changeable_clause">
+                        <text name="changeable_clause">
                                 Gekauftes Land in dieser Region kann nicht zusammengelegt/geteilt werden.
                         </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
+                        <text_editor name="covenant_editor">
                                 Für dieses Grundstück fehlt der Vertrag.
                         </text_editor>
-                        <text name="can_resell">
+                        <string name="can_resell">
                                 Gekauftes Land in dieser Region kann wiederverkauft werden.
-                        </text>
-                        <text name="can_not_resell">
+                        </string>
+                        <string name="can_not_resell">
                                 Gekauftes Land in dieser Region kann nicht wiederverkauft werden.
-                        </text>
-                        <text name="can_change">
+                        </string>
+                        <string name="can_change">
                                 Gekauftes Land in dieser Region kann zusammengelegt und geteilt werden.
-                        </text>
-                        <text name="can_not_change">
+                        </string>
+                        <string name="can_not_change">
                                 Gekauftes Land in dieser Region kann nicht zusammengelegt und geteilt werden.
-                        </text>
+                        </string>
                 </panel>
                 <panel label="Objekte" name="land_objects_panel">
                         <text name="parcel_object_bonus">
                                 Objektbonusfaktor in Region: [BONUS]
                         </text>
-                        <text type="string" length="1" name="Simulator primitive usage:">
+                        <text name="Simulator primitive usage:">
                                 Primitive in Simulator:
                         </text>
                         <text name="objects_available">
                                 [COUNT] von [MAX] ([AVAILABLE] verfügbar)
                         </text>
-                        <text name="objects_available_text">
+                        <string name="objects_available_text">
                                 [COUNT] von [MAX] ([AVAILABLE] verfügbar)
-                        </text>
-                        <text name="objects_deleted_text">
+                        </string>
+                        <string name="objects_deleted_text">
                                 [COUNT] von [MAX] ([DELETED] werden gelöscht)
-                        </text>
+                        </string>
                         <text name="Primitives parcel supports:" width="200">
                                 Von Parzelle unterstützte Primitiva:
                         </text>
-                        <text left="204" name="object_contrib_text" width="152">
+                        <text name="object_contrib_text"  left="204" width="152">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Primitives on parcel:">
+                        <text name="Primitives on parcel:">
                                 Primitiva auf Parzelle:
                         </text>
-                        <text left="204" name="total_objects_text" width="48">
+                        <text name="total_objects_text" left="204" width="48">
                                 [COUNT]
                         </text>
-                        <text left="14" name="Owned by parcel owner:" width="200">
+                        <text name="Owned by parcel owner:" left="14" width="200">
                                 Im Eigentum des Parzellenbesitzers:
                         </text>
-                        <text left="204" name="owner_objects_text" width="48">
+                        <text name="owner_objects_text" left="204" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135"
-                             width="60" />
-                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOwner..."
-                             right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-                             width="119" />
-                        <text left="14" name="Set to group:" width="200">
+                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowOwner" right="-135" width="60"/>
+                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOwner..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+                        <text name="Set to group:" left="14" width="200">
                                 Der Gruppe übereignen:
                         </text>
-                        <text left="204" name="group_objects_text" width="48">
+                        <text name="group_objects_text" left="204" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup" right="-135"
-                             width="60" />
-                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnGroup..."
-                             right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-                             width="119" />
-                        <text left="14" name="Owned by others:" width="128">
+                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowGroup" width="60" right="-135" />
+                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnGroup..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+                        <text name="Owned by others:" left="14" width="128">
                                 Im Eigentum anderer:
                         </text>
-                        <text left="204" name="other_objects_text" width="48">
+                        <text name="other_objects_text" left="204" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135"
-                             width="60" />
-                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOther..."
-                             right="-10" tool_tip="Objekte an ihre Eigentümer zurückgeben."
-                             width="119" />
-                        <text left="14" name="Selected / sat upon:" width="140">
+                        <button label="Anzeigen" label_selected="Anzeigen" name="ShowOther" right="-135" width="60"/>
+                        <button label="Zurückgeben..." label_selected="Zurückgeben..." name="ReturnOther..." tool_tip="Objekte an ihre Eigentümer zurückgeben." right="-10" width="119"/>
+                        <text name="Selected / sat upon:" left="14" width="140">
                                 Ausgewählt/gesessen auf:
                         </text>
-                        <text left="204" name="selected_objects_text" width="48">
+                        <text name="selected_objects_text" left="204" width="48">
                                 [COUNT]
                         </text>
-                        <text left="4" name="Autoreturn" width="380">
+                        <text name="Autoreturn" width="380" left="4" >
                                 Objekte anderer Einwohner automatisch zurückgeben (Minuten, 0 für aus):
                         </text>
                         <line_editor name="clean other time" right="-10" width="56" />
-                        <text type="string" length="1" name="Object Owners:">
+                        <text name="Object Owners:">
                                 Objekteigentümer:
                         </text>
-                        <button label="Liste aktualisieren" label_selected="Liste aktualisieren"
-                             name="Refresh List" />
-                        <button label="Objekte zurückgeben..." label_selected="Objekte zurückgeben..."
-                             name="Return objects..." />
-                        <button label="" label_selected="" name="Type" tool_tip="Nach Typ sortieren" />
-                        <button label="Name" label_selected="Name" name="Name" tool_tip="Nach Name sortieren" />
-                        <button label="Zählen" label_selected="Zählen" name="Count"
-                             tool_tip="Nach Anzahl sortieren" />
-                        <name_list label="Zählen" name="owner list">
-                                <column label="Typ" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Zählen" name="count" />
+                        <button label="Liste aktualisieren" label_selected="Liste aktualisieren" name="Refresh List"/>
+                        <button label="Objekte zurückgeben..." label_selected="Objekte zurückgeben..." name="Return objects..."/>
+                        <name_list name="owner list">
+                                <column label="Typ" name="type"/>
+                                <column label="Name" name="name"/>
+                                <column label="Zählen" name="count"/>
+                                <column label="Aktuellster" name="mostrecent"/>
                         </name_list>
-                        /&gt;
                 </panel>
                 <panel label="Optionen" name="land_options_panel">
-                        <text type="string" length="1" name="allow_label">
+                        <text name="allow_label">
                                 Anderen Einwohnern gestatten:
                         </text>
-                        <check_box label="Terrain bearbeiten" name="edit land check" />
-                        <check_box label="Landmarken erstellen" name="check landmark" />
-                        <check_box label="Fliegen" name="check fly" />
-                        <text type="string" length="1" name="allow_label2">
+                        <check_box label="Terrain bearbeiten" name="edit land check" tool_tip="Falls aktiviert, kann jeder Ihr Land terraformen. Am besten ist es, wenn Sie diese Option deaktiviert lassen. Sie können Ihr eigenes Land jederzeit bearbeiten."/>
+                        <check_box label="Landmarken erstellen" name="check landmark"/>
+                        <check_box label="Fliegen" name="check fly" tool_tip="Falls aktiviert, können Einwohner auf Ihrem Land fliegen. Falls nicht aktiviert, können Einwohner lediglich auf Ihr Land fliegen und dort landen (dann jedoch nicht wieder weiterfliegen) oder über Ihr Land hinweg fliegen."/>
+                        <text name="allow_label2">
                                 Objekte erstellen:
                         </text>
-                        <check_box label="Alle Einwohner" name="edit objects check" />
-                        <check_box label="Gruppe" name="edit group objects check" />
-                        <text type="string" length="1" name="allow_label3">
+                        <check_box label="Alle Einwohner" name="edit objects check"/>
+                        <check_box label="Gruppe" name="edit group objects check"/>
+                        <text name="allow_label3">
                                 Objekteintritt:
                         </text>
-                        <check_box label="Alle Einwohner" name="all object entry check" />
-                        <check_box label="Gruppe" name="group object entry check" />
-                        <text type="string" length="1" name="allow_label4">
+                        <check_box label="Alle Einwohner" name="all object entry check"/>
+                        <check_box label="Gruppe" name="group object entry check"/>
+                        <text name="allow_label4">
                                 Skripts ausführen:
                         </text>
-                        <check_box label="Alle Einwohner" name="check other scripts" />
-                        <check_box label="Gruppe" name="check group scripts" />
-                        <text type="string" length="1" name="land_options_label">
+                        <check_box label="Alle Einwohner" name="check other scripts"/>
+                        <check_box label="Gruppe" name="check group scripts"/>
+                        <text name="land_options_label">
                                 Landoptionen:
                         </text>
-                        <check_box label="Sicher (kein Schaden)" name="check safe" />
-                        <check_box label="Stoßen beschränken" name="PushRestrictCheck"
-                             tool_tip="llPushObject funktioniert nur in Skripts des Parzelleneigentümers oder in Skripts, die dem Stoßenden gehören." />
-                        <check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck"
-                             tool_tip="Diese Parzelle in Suchergebnissen anzeigen." />
-                        <combo_box left="266" max_chars="20" mouse_opaque="true" name="land category" width="130">
+                        <check_box label="Sicher (kein Schaden)" name="check safe" tool_tip="Falls aktiviert, wird Land auf Option „Sicher“ eingestellt, Kampfschäden sind deaktiviert. Falls nicht aktiviert, sind Kampfschäden aktiviert."/>
+                        <check_box label="Kein Stoßen" name="PushRestrictCheck" tool_tip="Verhindert Skripte am Stoßen. Durch Aktivieren dieser Option verhindern Sie störendes Verhalten auf Ihrem Land."/>
+                        <check_box label="Ort in Suche anzeigen (30 L$/Woche) unter" name="ShowDirectoryCheck" tool_tip="Diese Parzelle in Suchergebnissen anzeigen."/>
+                        <combo_box name="land category" left="266" width="130">
                                 <combo_item name="AnyCategory">
                                         Alle Kategorien
                                 </combo_item>
@@ -322,67 +294,59 @@
                                         Sonstige
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Ab-18-Inhalt" name="MatureCheck"
-                             tool_tip="Die Informationen oder Inhalte Ihrer Parzelle sind nicht jugenfrei." />
-                        <check_box label="Liste im Web veröffentlichen" name="PublishCheck"
-                             tool_tip="Veröffentlicht Informationen über Ihre Parzelle im Web." />
-                        <button label="?" label_selected="?" name="?" />
-                        <text type="string" length="1" name="Snapshot:">
+                        <button label="?" label_selected="?" name="?"/>
+                        <check_box label="Ab-18-Inhalt" name="MatureCheck" tool_tip="Die Informationen oder Inhalte Ihrer Parzelle sind nicht jugenfrei."/>
+                        <text name="Snapshot:">
                                 Foto:
                         </text>
-                        <texture_picker label="" name="snapshot_ctrl"
-                             tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
-                        <text type="string" length="1" name="Landing Point: (none)">
-                                Landepunkt: (keiner)
-                        </text>
+                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
                         <text name="landing_point">
                                 Landepunkt: [LANDING]
                         </text>
-                        <text name="landing_point_none">
-                                (-)
-                        </text>
-                        <button label="Festlegen" label_selected="Festlegen" left="234" name="Set"
-                             tool_tip="Den Landepunkt auf die aktuelle Position des Avatars setzen. Muss sich innerhalb dieser Parzelle befinden."
-                             width="70" />
-                        <button label="Löschen" label_selected="Löschen" left="312" name="Clear"
-                             tool_tip="Landepunkt löschen." width="70" />
-                        <text type="string" length="1" name="Teleport Routing: ">
+                        <string name="landing_point_none">
+                                (keiner)
+                        </string>
+                        <button label="Festlegen" label_selected="Festlegen" name="Set" tool_tip="Legt den Landepunkt fest, an dem Besucher ankommen. Legt die Position Ihres Avatars innerhalb dieser Parzelle fest." width="70" left="234"/>
+                        <button label="Löschen" label_selected="Löschen" name="Clear" tool_tip="Landepunkt löschen." width="70" left="312"/>
+                        <text name="Teleport Routing: ">
                                 Teleport-Route:
                         </text>
-                        <combo_box name="landing type"
-                             tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
-                                <combo_item type="string" length="1" name="Blocked">
+                        <combo_box name="landing type" tool_tip="Teleport-Route -- festlegen, wie Teleports auf Ihrem Land gehandhabt werden sollen." >
+                                <combo_item name="Blocked">
                                         Blockiert
                                 </combo_item>
-                                <combo_item type="string" length="1" name="LandingPoint">
+                                <combo_item name="LandingPoint">
                                         Landepunkt
                                 </combo_item>
-                                <combo_item type="string" length="1" name="Anywhere">
+                                <combo_item name="Anywhere">
                                         Ãœberall
                                 </combo_item>
                         </combo_box>
-                        <text name="push_restrict_text">
-                                Stoßen beschränken
-                        </text>
-                        <text name="push_restrict_region_text">
-                                Stoßen beschränken (regional)
-                        </text>
+                        <string name="push_restrict_text">
+                                Kein Stoßen
+                        </string>
+                        <string name="push_restrict_region_text">
+                                Kein Stoßen (regional)
+                        </string>
                 </panel>
                 <panel label="Medien" name="land_media_panel">
-                        <text name="at URL:">
-                                Medien-URL:
-                        </text>
-                        <button label="Einstellen..." label_selected="Einstellen..." name="set_media_url" />
                         <text name="with media:">
                                 Medientyp:
                         </text>
-                        <combo_box name="media type"
-                             tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein" />
+                        <combo_box name="media type" tool_tip="Geben Sie einen URL für den Film, die Webseite oder ein anderes Medium ein"/>
+                        <text name="at URL:">
+                                Medien-URL:
+                        </text>
+                        <button label="Einstellen..." label_selected="Einstellen..." name="set_media_url"/>
                         <text name="Description:">
                                 Inhalt:
                         </text>
-                        <line_editor name="url_description"
-                             tool_tip="Text, der neben der Abspielen/Laden-Schaltfläche angezeigt wird" />
+                        <line_editor name="url_description" tool_tip="Text, der neben der Abspielen/Laden-Schaltfläche angezeigt wird"/>
+                        <text name="Media texture:">
+                                Textur
+ersetzen:
+                        </text>
+                        <texture_picker label="" name="media texture" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
                         <text name="replace_texture_help">
                                 (Objekte mit dieser Textur zeigen nach Anklicken
 des Abspielen-Pfeils den Film oder die Webseite an.)
@@ -391,20 +355,15 @@ des Abspielen-Pfeils den Film oder die Webseite an.)
                                 Medien-
 Optionen:
                         </text>
-                        <check_box label="Als Schleife wiedergeben" name="media_loop"
-                             tool_tip="Spielt das Medium in einer Schleife ab.  Der Abspielvorgang wird immer wieder von vorne fortgesetzt." />
-                        <check_box label="Medien-URL verstecken" name="hide_media_url"
-                             tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar." />
-                        <check_box label="Musik-URL verstecken" name="hide_music_url"
-                             tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können." />
-                        <text name="media_size"
-                             tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen.">
+                        <check_box label="Automatisch skalieren" name="media_auto_scale" tool_tip="Aktivieren Sie diese Option, um den Inhalt für diese Parzelle automatisch zu skalieren. Dies ist eventuell langsamer und die Qualität ist schlechter, aber Sie müssen keine weitere Texturskalierung oder -anpassung vornehmen."/>
+                        <check_box label="Als Schleife wiedergeben" name="media_loop" tool_tip="Spielt das Medium in einer Schleife ab.  Der Abspielvorgang wird immer wieder von vorne fortgesetzt."/>
+                        <check_box label="Medien-URL verstecken" name="hide_media_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Medien-URL sehen können. Diese Option ist für HTML-Medien nicht verfügbar."/>
+                        <check_box label="Musik-URL verstecken" name="hide_music_url" tool_tip="Aktivieren Sie diese Option, wenn Sie nicht möchten, dass unautorisierte Personen die Musik-URL sehen können."/>
+                        <text name="media_size" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen.">
                                 Größe:
                         </text>
-                        <spinner name="media_size_width"
-                             tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen." />
-                        <spinner name="media_size_height"
-                             tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen." />
+                        <spinner name="media_size_width" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen."/>
+                        <spinner name="media_size_height" tool_tip="Darstellungsgröße von Webmedien, für Standard bei 0 belassen."/>
                         <text name="pixels">
                                 Pixel
                         </text>
@@ -414,28 +373,11 @@ Optionen:
                         <text name="Sound:">
                                 Sound:
                         </text>
-                        <check_box label="Umgebungssound auf diese Parzelle beschränken" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
-                                Musik-URL:
-                        </text>
-                        <text type="string" length="1" name="Media texture:">
-                                Textur
-ersetzen:
-                        </text>
-                        <text type="string" length="1" name="Replace this texture:">
-                                Diese Textur ersetzen:
-                        </text>
-                        <texture_picker label="" name="media texture"
-                             tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
-                        <text type="string" length="1" name="with content from this URL:">
-                                mit Inhalt von diesem URL ersetzen:
-                        </text>
-                        <check_box label="Automatisch skalieren" name="media_auto_scale"
-                             tool_tip="Aktivieren Sie diese Option, um den Inhalt für diese Parzelle automatisch zu skalieren. Dies ist eventuell langsamer und die Qualität ist schlechter, aber Sie müssen keine weitere Texturskalierung oder -anpassung vornehmen." />
+                        <check_box label="Umgebungssound auf diese Parzelle beschränken" name="check sound local"/>
                         <text name="Voice settings:">
                                 Voice:
                         </text>
-                        <radio_group name="parcel_voice_channel">
+                        <radio_group name="parcel_voice_channel" width="310">
                                 <radio_item name="Estate">
                                         Voice-Channel des Grundstücks verwenden
                                 </radio_item>
@@ -448,67 +390,42 @@ ersetzen:
                         </radio_group>
                 </panel>
                 <panel label="Zugang" name="land_access_panel">
-                        <text type="string" length="1" name="Limit access to this parcel to:">
+                        <text name="Limit access to this parcel to:">
                                 Zugang zu dieser Parzelle
                         </text>
-                        <check_box label="Freien Zugang erlauben" name="public_access" />
+                        <check_box label="Freien Zugang erlauben" name="public_access"/>
                         <text name="Only Allow">
                                 Zugang verweigern für:
                         </text>
-                        <check_box
-                             label="Einwohner, die keine Zahlungsinformationen bei Linden Lab hinterlegt haben"
-                             name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen." />
-                        <check_box label="Einwohner, die keine altersgeprüften Erwachsenen sind"
-                             name="limit_age_verified"
-                             tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com." />
+                        <check_box label="Einwohner, die keine Zahlungsinformationen bei Linden Lab hinterlegt haben" name="limit_payment" tool_tip="Nicht identifizierte Einwohner verbannen."/>
+                        <check_box label="Einwohner, die keine altersgeprüften Erwachsenen sind" name="limit_age_verified" tool_tip="Einwohner ohne Altersprüfung verbannen. Weitere Informationen finden Sie auf support.secondlife.com."/>
                         <string name="estate_override">
                                 Eine oder mehrere dieser Optionen gelten auf Grundstücksebene
                         </string>
-                        <check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck"
-                             tool_tip="Gruppe im Register &apos;Allgemein&apos; festlegen." />
+                        <check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
+                        <check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
                         <combo_box name="pass_combo">
                                 <combo_item name="Anyone">
-                                        Jeder
+                                        Jeden
                                 </combo_item>
                                 <combo_item name="Group">
                                         Gruppe
                                 </combo_item>
                         </combo_box>
+                        <spinner label="Preis in L$:" name="PriceSpin"/>
+                        <spinner label="Online-Zeit:" name="HoursSpin"/>
                         <text label="Immer erlauben" name="AllowedText">
                                 Zulässige Einwohner
                         </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="BanCheck">
+                        <name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_allowed"/>
+                        <button label="Entfernen" label_selected="Entfernen" name="remove_allowed"/>
+                        <text label="Verbannen" name="BanCheck">
                                 Verbannte Einwohner
-                        </check_box>
-                        <name_list name="AccessList" tool_tip="([LISTED] angezeigt, max. [MAX])">
-                                <column label="Allowed Residents" name="name" />
-                        </name_list>
-                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="Add..." />
-                        <button label="Entfernen" label_selected="Entfernen" name="Remove" />
-                        <check_box label="Pässe verkaufen an:" name="PassCheck"
-                             tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle" />
-                        <spinner label="Preis in L$:" name="PriceSpin" />
-                        <spinner label="Online-Zeit:" name="HoursSpin" />
-                        <name_list name="BannedList" tool_tip="([LISTED] angezeigt, max. [MAX])" />
-                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_banned" />
-                        <button label="Entfernen" label_selected="Entfernen" name="remove_banned" />
-                </panel>
-                <panel label="Verbannen" name="land_ban_panel">
-                        <check_box label="Diese Avatare verbannen: ([LISTED] angezeigt, max. [MAX])"
-                             name="LandBanCheck" />
-                        <name_list name="LandBanList">
-                                <column label="Banned Residents" name="name" />
-                        </name_list>
-                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="Add..." />
-                        <button label="Entfernen" label_selected="Entfernen" name="Remove" />
-                        <text type="string" length="1" name="Deny by Payment Status:">
-                                Nach Zahlungsstatus verweigern:
-                        </text>
-                        <check_box label="Verweigern - keine archivierte Zahlungsinfo" name="DenyAnonymousCheck" />
-                        <check_box label="Verweigern - Zahlungsinfo archiviert" name="DenyIdentifiedCheck" />
-                        <check_box label="Verweigern - Zahlungsinfo verwendet" name="DenyTransactedCheck" />
+                        </text>
+                        <name_list name="BannedList" tool_tip="([LISTED] angezeigt, max. [MAX])"/>
+                        <button label="Hinzufügen..." label_selected="Hinzufügen..." name="add_banned"/>
+                        <button label="Entfernen" label_selected="Entfernen" name="remove_banned"/>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 3cbcf08..299b6a7 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -1,42 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
         <text name="name_label">
                 Name:
         </text>
-        <line_editor name="name_form" />
+        <line_editor name="name_form"/>
         <text name="description_label">
                 Beschreibung:
         </text>
-        <spinner label="Priorität" name="priority"
-             tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können." />
-        <text name="preview_label" width="97">
-                Vorschau während:
-        </text>
-        <combo_box label="" left_delta="107" name="preview_base_anim"
-             tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-                <combo_item name="Standing">
-                        Stehend
-                </combo_item>
-                <combo_item name="Walking">
-                        Geht
-                </combo_item>
-                <combo_item name="Sitting">
-                        Sitzt
-                </combo_item>
-                <combo_item name="Flying">
-                        Fliegend
-                </combo_item>
-        </combo_box>
-        <check_box label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife." bottom_delta="-18" />
-        <spinner label="In (%)" name="loop_in_point"
-             tool_tip="Anfang einer Animationsschleife festlegen." />
-        <spinner label="Aus (%)" name="loop_out_point"
-             tool_tip="Ende einer Animationsschleife festlegen." />
+        <spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können."/>
+        <check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife."/>
+        <spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen."/>
+        <spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen."/>
         <text name="hand_label">
                 Handhaltung
         </text>
-        <combo_box label="" name="hand_pose_combo"
-             tool_tip="Controls what hands do during animation.">
+        <combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
                 <combo_item name="Spread">
                         Dehnen
                 </combo_item>
@@ -80,10 +58,9 @@
         <text name="emote_label">
                 Ausdruck
         </text>
-        <combo_box label="" name="emote_combo"
-             tool_tip="Controls what face does during animation.">
+        <combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
                 <combo_item name="[None]">
-                        [None]
+                        [Keine]
                 </combo_item>
                 <combo_item name="Aaaaah">
                         Aaaaah
@@ -119,7 +96,7 @@
                         Lachen
                 </combo_item>
                 <combo_item name="Plllppt">
-                        Plllppt
+                        Bäääh
                 </combo_item>
                 <combo_item name="Repulsed">
                         Zurückgestoßen
@@ -143,31 +120,46 @@
                         Sorgenvoll
                 </combo_item>
         </combo_box>
-        <spinner label="Eingang glätten (s)" name="ease_in_time"
-             tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." label_width="105" width="175"  />
-        <spinner label="Ausgang glätten (s)" name="ease_out_time"
-             tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." left="10" bottom_delta="-20" label_width="105" width="175" />
-        <button label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben." bottom_delta="-32" />
-        <button label="" name="stop_btn" tool_tip="Animation anhalten" />
-        <slider label="" name="playback_slider" />
+        <text name="preview_label" width="97">
+                Vorschau während:
+        </text>
+        <combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
+                <combo_item name="Standing">
+                        Stehend
+                </combo_item>
+                <combo_item name="Walking">
+                        Geht
+                </combo_item>
+                <combo_item name="Sitting">
+                        Sitzt
+                </combo_item>
+                <combo_item name="Flying">
+                        Fliegend
+                </combo_item>
+        </combo_box>
+        <spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+        <spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
+        <button bottom_delta="-32" label="" name="play_btn" tool_tip="Animation stoppen/wiedergeben."/>
+        <button label="" name="stop_btn" tool_tip="Animation anhalten"/>
+        <slider label="" name="playback_slider"/>
         <text name="bad_animation_text">
                 Animationsdatei konnte nicht gelesen werden.
-        
-        Wir empfehlen exportierte BVH-Dateien aus Poser 4.
+
+Wir empfehlen exportierte BVH-Dateien aus Poser 4.
         </text>
-        <button label="Abbrechen" name="cancel_btn" />
-        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn" />
-        <text name="failed_to_initialize">
+        <button label="Abbrechen" name="cancel_btn"/>
+        <button label="Hochladen ([AMOUNT] L$)" name="ok_btn"/>
+        <string name="failed_to_initialize">
                 Bewegung konnte nicht initialisiert werden
-        </text>
-        <text name="anim_too_long">
+        </string>
+        <string name="anim_too_long">
                 Animationsdatei ist [LENGTH] Sekunden lang.
 
 Maximal erlaubt sind [MAX_LENGTH] Sekunden.
-        </text>
-        <text name="failed_file_read">
+        </string>
+        <string name="failed_file_read">
                 Animationsdatei konnte nicht gelesen werden.
 
 [STATUS]
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
index f02ffd2..b6b8792 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_picker.xml
@@ -12,6 +12,6 @@ Einwohners ein:
         <button label="Auswählen" label_selected="Auswählen" name="Select" />
         <button label="Schließen" label_selected="Schließen" name="Close" />
         <text name="NotFound">
-                &apos;[TEXT]&apos; nicht gefunden
+                „[TEXT]“ nicht gefunden
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
index edf80f1..13c4156 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_avatar_textures.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="Avatar-Texturen">
-        <text name="">
-                Geformte Texturen not sure about this one ... missing context
-        </text>
-        <text name="">
-                Zusammengesetzte Texturen
-        </text>
-        <text name="baked_label">
+        <text name="baked_label" width="128">
                 Gebackene Texturen
         </text>
-        <text name="composite_label">
+        <text name="composite_label" width="150">
                 Zusammengesetzte Texturen
         </text>
         <texture_picker label="Kopf" name="baked_head" />
-        <texture_picker label="Make-Uup" name="head_bodypaint" />
+        <texture_picker label="Make-Up" name="head_bodypaint" />
         <texture_picker label="Haar" name="hair" />
         <button label="Abladen" label_selected="Abladen" name="Dump" />
         <texture_picker label="Augen" name="baked_eyes" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_beacons.xml b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
new file mode 100644
index 0000000..d1ec9d9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="beacons" title="Beacons">

+        <panel name="beacons_panel">

+                <check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>

+                <check_box label="Skripting-Objekte" name="scripted"/>

+                <check_box label="Physische Objekte" name="physical"/>

+                <check_box label="Soundquellen" name="sounds"/>

+                <check_box label="Partikelquellen" name="particles"/>

+                <check_box label="Glanzlichter anzeigen" name="highlights"/>

+                <check_box label="Beacons anzeigen" name="beacons"/>

+                <text name="beacon_width_label">

+                        Beacon-Breite:

+                </text>

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
index c2ee63e..01858b3 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_contents.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="Inhalte kaufen">
+<floater name="floater_buy_contents" title="Inhalte kaufen" min_width="300">
         <text name="contains_text">
                 [NAME] enthält:
         </text>
         <text name="buy_text">
                 [AMOUNT] L$ von [NAME] kaufen?
         </text>
-        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
         <button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
         <check_box label="Kleidung jetzt anziehen" name="wear_check" />
         <text name="no_copy_text">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
index adfa766..332c900 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -52,7 +52,7 @@
         <text name="info_price">
                 1500 L$, Objekte eingeschlossen
         </text>
-        <text name="info_action">
+        <text name="info_action" width="275">
                 Bei Landkauf:
         </text>
         <text name="error_message">
@@ -204,9 +204,7 @@ unterstützt [AMOUNT2] Objekte
                 mit Objekten verkauft
         </text>
         <text name="insufficient_land_credits">
-                Die Gruppe [GROUP] benötigt ausreichende 
-Landnutzungsrechte für diese Parzelle, um den Kauf 
-abzuschließen.
+                Die Gruppe [GROUP] benötigt ausreichende Landnutzungsrechte für diese Parzelle, um den Kauf abzuschließen.
         </text>
         <text name="have_enough_lindens">
                 Sie haben [AMOUNT] L$, genug zum Kauf dieses Landes.
diff --git a/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
index 910df26..3cfa59f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_buy_object.xml
@@ -6,7 +6,7 @@
         <text name="buy_text">
                 [AMOUNT] L$ von [NAME] kaufen?
         </text>
-        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" width="73" />
         <button label="Kaufen" label_selected="Kaufen" name="buy_btn" />
         <text name="title_buy_text">
                 Kaufen
diff --git a/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
index 94118a0..4a1d91b 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_chat_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="chat floater" title="Lokaler Chat">
         <string name="ringing">
                 Verbindung mit In-Welt-Voice-Chat...
@@ -42,6 +42,9 @@
                                         <flyout_button_item name="say_item">
                                                 Reden
                                         </flyout_button_item>
+                                        <flyout_button_item name="whisper_item">
+                                                Flüstern
+                                        </flyout_button_item>
                                 </flyout_button>
                         </panel>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml
index c540ad3..f53a113 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_color_picker.xml
@@ -13,10 +13,10 @@
                 Farbton:
         </text>
         <text name="s_val_text">
-                Sat.:
+                Sätt.:
         </text>
         <text name="l_val_text">
-                Lum:
+                Hell.:
         </text>
         <check_box label="Sofort übernehmen" name="apply_immediate" />
         <button label="" label_selected="" name="color_pipette" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_customize.xml b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
index 65f4fa7..7ceb7bd 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_customize.xml
@@ -108,7 +108,7 @@ und diese anziehen.
                         <button label="Farbe" label_selected="Farbe" name="Color" />
                         <button label="Stil" label_selected="Stil" name="Style" />
                         <button label="Augenbrauen" label_selected="Augenbrauen" name="Eyebrows" />
-                        <button label="Gesichts" label_selected="Gesichts" name="Facial" />
+                        <button label="Gesichtshaar" label_selected="Gesichtshaar" name="Facial" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_directory.xml b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
index c149fb4..8c4a989 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_directory.xml
@@ -291,11 +291,11 @@ Zeit gemessen, die Benutzer dort verbringen.
                         <button label="Suchen" label_selected="Suchen" name="Search" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-38" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="354"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="32" left="374"
                              mouse_opaque="true" name="land" v_pad="0" width="430">
                                 Land kann direkt für Linden Dollar (L$) oder bei einer Auktion für L$
-oder US$ erworben werden. Um direkt zu kaufen, klicken Sie auf dem betreffenden
-Land in der Titelleiste auf den Namen.
+oder US$ erworben werden. Um direkt zu kaufen, klicken sie auf den
+Namen des Landes in der Titelleiste
                         </text>
                         <scroll_list name="results">
                                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
index 3e32e45..3717ff6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -14,7 +14,7 @@
         </text>
         <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
         <text name="EnvWaterFogText">
-                Wasser
+                Wasser-
 trübung
         </text>
         <button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
index 6356dff..dcb6982 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="Gott-Tools">
+<floater name="godtools floater" title="Gott-Werkzeuge">
         <tab_container name="GodTools Tabs">
                 <panel label="Raster" name="grid">
                         <button label="Alle Benutzer hinauswerfen" label_selected="Alle Benutzer hinauswerfen"
-                             name="Kick all users" />
+                             name="Kick all users" width="175" />
                         <button label="Sichtbarkeits-Cache dieser Regionskarte leeren"
                              label_selected="Sichtbarkeits-Cache dieser Regionskarte leeren"
-                             name="Flush This Region&apos;s Map Visibility Caches" />
+                             name="Flush This Region&apos;s Map Visibility Caches" width="285" />
                 </panel>
                 <panel label="Region" name="region">
-                        <text name="Sim Name:">
+                        <text name="Sim Name:" width="55">
                                 Sim-Name:
                         </text>
                         <check_box label="Startbereich Einleitung" name="check prelude"
                              tool_tip="Diese Region zu einem Startbereich machen." />
                         <check_box label="Sonne fest" name="check fixed sun"
-                             tool_tip="Fixiert den Sonnenstand (wie in &apos;Region/Grundstück&apos; &gt; &apos;Terrain&apos;." />
-                        <check_box label="Zuhause auf Teleport zurücksetzen" name="check reset home"
-                             tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." />
+                             tool_tip="Fixiert den Sonnenstand (wie in „Region/Grundstück“ &gt; „Terrain“." />
+                        <check_box label="Zuhause auf Teleport &#10;zurücksetzen" name="check reset home"
+                             tool_tip="Wenn Einwohner wegteleportieren, ihr Zuhause auf Zielposition setzen." height="32" />
                         <check_box label="Sichtbar" name="check visible"
-                             tool_tip="Diese Region für Nicht-Götter sichtbar machen." />
+                             tool_tip="Diese Region für Nicht-Götter sichtbar machen." bottom_delta="-32" />
                         <check_box label="Schaden" name="check damage"
                              tool_tip="Schaden in dieser Region aktivieren." />
                         <check_box label="Trafficüberwachung blockieren" name="block dwell"
@@ -29,28 +29,30 @@
                         <check_box label="Sandkasten" name="is sandbox"
                              tool_tip="Sandkastenregion ein-/ausschalten." />
                         <button label="Terrain formen" label_selected="Terrain formen" name="Bake Terrain"
-                             tool_tip="Das aktuelle Terrain als Standard speichern." />
+                             tool_tip="Das aktuelle Terrain als Standard speichern." width="118" />
                         <button label="Terrain zurücksetzen" label_selected="Terrain zurücksetzen"
                              name="Revert Terrain"
-                             tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." />
+                             tool_tip="Das aktuelle Terrain mit dem Standard ersetzen." width="118" />
                         <button label="Terrain tauschen" label_selected="Terrain tauschen" name="Swap Terrain"
-                             tool_tip="Aktuelles Terrain gegen Standard austauschen." />
+                             tool_tip="Aktuelles Terrain gegen Standard austauschen." width="118" />
                         <text name="estate id">
                                 Grundstücks-ID:
                         </text>
                         <text name="parent id">
-                                Ãœbergeordnet-ID:
+                                Parent ID:
                         </text>
                         <line_editor name="parentestate" tool_tip="Das übergeordnete Grundstück dieser Region" />
                         <text name="Grid Pos: ">
                                 Raster-Pos.:
                         </text>
-                        <line_editor name="gridposx" tool_tip="Die X-Rasterposition dieser Region" />
-                        <line_editor name="gridposy" tool_tip="Die Y-Rasterposition dieser Region" />
-                        <text name="Redirect to Grid: ">
+                        <line_editor name="gridposx" tool_tip="Die X-Rasterposition dieser Region" left_delta="110" width="35" />
+                        <line_editor name="gridposy" tool_tip="Die Y-Rasterposition dieser Region" left_delta="45" width="35" />
+                        <text name="Redirect to Grid: " >
                                 Auf Raster umleiten:
                         </text>
-                        <text name="billable factor text">
+                        <line_editor left_delta="110" name="redirectx" width="35" />
+                        <line_editor left_delta="45" name="redirecty" width="35" />
+                        <text name="billable factor text" font="SansSerifSmall" >
                                 Abrechnungsfaktor:
                         </text>
                         <text name="land cost text">
@@ -62,21 +64,21 @@
                              tool_tip="Klicken Sie hier, um die obigen Änderungen zu übernehmen." />
                         <button label="Region auswählen" label_selected="Region auswählen"
                              name="Select Region"
-                             tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." />
+                             tool_tip="Die gesamte Region mit dem Landwerkzeug auswählen." width="130" left="136"/>
                         <button label="Automatisch speichern" label_selected="Automatisch speichern"
                              name="Autosave now"
-                             tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." />
+                             tool_tip="gzipped-Status im Autosave-Verzeichnis speichern." width="130" left="136"/>
                 </panel>
                 <panel label="Objekte" name="objects">
-                        <text name="Sim Name:">
+                        <text name="Sim Name:" width="55">
                                 Sim-Name:
                         </text>
                         <text name="region name">
-                                Walisisch
+                                Welsh
                         </text>
-                        <check_box label="Skripts deaktivieren" name="disable scripts"
+                        <check_box label="Skripts &#10;deaktivieren" name="disable scripts"
                              tool_tip="Skripts in dieser Region komplett abschalten" />
-                        <check_box label="Kollisionen deaktivieren" name="disable collisions"
+                        <check_box label="Kollisionen &#10;deaktivieren" name="disable collisions"
                              tool_tip="Nicht-Avatar-Kollisionen in dieser Region komplett abschalten" />
                         <check_box label="Physik deaktivieren" name="disable physics"
                              tool_tip="Die Physik in dieser Region komplett abschalten" />
@@ -101,12 +103,12 @@
                              tool_tip="Alle dem Ziel gehörenden Objekte in dieser Region löschen. Objekte (nicht kopierfähig) werden zurückgegeben." />
                         <button label="Top-Kollisionsobjekte" label_selected="Top-Kollisionsobjekte"
                              name="Get Top Colliders"
-                             tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." />
+                             tool_tip="Zeigt eine Liste der Objekte mit den meisten Callbacks in der nahen Phase an." width="130" />
                         <button label="Top-Skripts" label_selected="Top-Skripts" name="Get Top Scripts"
-                             tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." />
+                             tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit über Skripts ausführen." width="130" />
                         <button label="Scripting-Ãœbersicht" label_selected="Scripting-Ãœbersicht"
                              name="Scripts digest"
-                             tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." />
+                             tool_tip="Zeigt eine Liste aller Skripts mit Häufigkeit an." width="130" />
                 </panel>
                 <panel label="Anfrage" name="request">
                         <text name="Destination:">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
index 9d1dde8..7d07c9f 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_group_info.xml
@@ -84,7 +84,7 @@
                                                 Gruppenwahl
                                         </text>
                                         <text name="instructions">
-                                                Klicken Sie auf &apos;Wahl starten&apos;, um eine neue Wahl zu starten. 
+                                                Klicken Sie auf „Wahl starten“, um eine neue Wahl zu starten. 
 Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
                                         </text>
                                         <text name="lbl">
@@ -134,7 +134,7 @@ Zu den Kandidaten gehören alle Mitglieder, die keine Officer sind.
                                                 Gruppenanfragen
                                         </text>
                                         <text name="instructions">
-                                                Keine aktiven Anfragen.  Klicken Sie auf &apos;Neue Anfrage&apos;,
+                                                Keine aktiven Anfragen.  Klicken Sie auf „Neue Anfrage“,
 um eine neue Anfrage zu erstellen.
                                         </text>
                                         <text name="proposal_lbl">
@@ -191,7 +191,7 @@ um eine neue Anfrage zu erstellen.
                                                 Sie können die Abstimmergebisse anzeigen, indem Sie die Abstimmung auswählen und auf
                                         </text>
                                         <text name="instructions2">
-                                                &apos;Objekt anzeigen&apos; klicken.
+                                                „Objekt anzeigen“ klicken.
                                         </text>
                                         <text name="history_list_lbl">
                                                 Alte Abstimmungen:
@@ -212,7 +212,7 @@ um eine neue Anfrage zu erstellen.
                                 Einladungen werden als Instant Message gesendet.
                         </text>
                         <text name="txt3">
-                                Klicken Sie auf &apos;Hinzufügen&apos;, um Benutzer zur Liste hinzuzufügen.
+                                Klicken Sie auf „Hinzufügen“, um Benutzer zur Liste hinzuzufügen.
                         </text>
                         <text name="lbl">
                                 Officers:
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
new file mode 100644
index 0000000..37f9ea5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="htmlfloater" title="">
+        <button label="Schließen" name="close_btn" />
+        <button label="Zurück" name="back_btn" />
+        <button label="Zuhause" name="home_btn" />
+        <button label="Weiter" name="forward_btn" />
+        <button label="Los" name="go_btn" />
+        <string name="home_page_url">
+                http://de.secondlife.com
+        </string>
+        <string name="support_page_url">
+                http://de.secondlife.com/support
+        </string>       
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
index 9efbe38..f8c9b62 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Objekt prüfen" min_width="440" >
+<floater name="inspect" title="Objekt prüfen" min_width="450" >
         <scroll_list name="object_list"
              tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
                 <column label="Objektname" name="object_name" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
index 8984abb..cb0f7fa 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml
@@ -7,7 +7,7 @@
                 Wird verbunden...
         </string>
         <string name="connected">
-                Verbunden. Klicken Sie auf &apos;Anruf beenden&apos;, um die Verbindung zu trennen
+                Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen
         </string>
         <string name="hang_up">
                 Anruf beendet
diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
index 6828d0d..dc29f32 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
@@ -44,7 +44,7 @@
                 Voice-Chat wird beigetreten...
         </string>
         <string name="connected">
-                Verbunden. Klicken Sie auf &apos;Anruf beenden&apos;, um die Verbindung zu trennen
+                Verbunden. Klicken Sie auf „Anruf beenden“, um die Verbindung zu trennen
         </string>
         <string name="hang_up">
                 Voice-Chat verlassen
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
index d731d00..c8c6724 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory.xml
@@ -2,8 +2,8 @@
 <floater name="Inventory" title="Inventar">
         <search_editor label="Suchanfrage hier eintippen" name="inventory search editor" />
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="All Items" name="All Items" />
-                <inventory_panel label="Recent Items" name="Recent Items" />
+                <inventory_panel label="Alle Objekte" name="All Items" />
+                <inventory_panel label="Letzte Objekte" name="Recent Items" />
         </tab_container>
         <menu_bar name="Inventory Menu">
                 <menu label="Datei" name="File">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
index 1477cdb..0028f1d 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
@@ -30,7 +30,7 @@
                 Sie können:
         </text>
         <check_box label="Bearbeiten" name="CheckOwnerModify" />
-        <check_box label="Kopieren" name="CheckOwnerCopy" />
+        <check_box label="Kopieren" name="CheckOwnerCopy" left_delta="85" />
         <check_box label="Verkaufen/Weggeben" name="CheckOwnerTransfer" />
         <text name="BaseMaskDebug">
                 B:
@@ -49,17 +49,17 @@
         </text>
         <check_box label="Mit Gruppe teilen" name="CheckShareWithGroup" />
         <check_box label="Kopieren allen erlauben" name="CheckEveryoneCopy" />
-        <text name="NextOwnerLabel">
+        <text name="NextOwnerLabel" width="150">
                 Nächster Eigentümer kann:
         </text>
         <check_box label="Bearbeiten" name="CheckNextOwnerModify" />
-        <check_box label="Kopieren" name="CheckNextOwnerCopy" />
+        <check_box label="Kopieren" name="CheckNextOwnerCopy" left_delta="85" />
         <check_box label="Verkaufen/Weggeben" name="CheckNextOwnerTransfer" />
         <text name="SaleLabel">
                 Objekt markieren:
         </text>
         <check_box label="Zum Verkauf" name="CheckPurchase" />
-        <radio_group name="RadioSaleType">
+        <radio_group name="RadioSaleType" left_delta="85"  width="245" >
                 <radio_item name="radio">
                         Original
                 </radio_item>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index e2d3bdf..4dd9fd6 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -99,7 +99,7 @@
                 Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
         </text>
         <text name="network_packet_loss_cause_msg">
-                Möglicherweise schlechte Verbindung oder zu hoher Wert für &apos;Bandbreite&apos;.
+                Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
         </text>
         <text name="network_ping_cause_msg">
                 Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
diff --git a/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml
index f9dcfc9..2594489 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_land_holdings.xml
@@ -2,8 +2,8 @@
 <floater name="land holdings floater" title="Mein Land">
         <scroll_list name="parcel list">
                 <column label="Name" name="name" />
-                <column label="Location" name="location" />
-                <column label="Area" name="area" />
+                <column label="Lage" name="location" />
+                <column label="Gebiet" name="area" />
                 <column label="" name="hidden" />
         </scroll_list>
         <button label="Teleportieren" label_selected="Teleportieren" name="Teleport"
@@ -14,8 +14,8 @@
                 Beiträge zu Ihren Gruppen:
         </text>
         <scroll_list name="grant list">
-                <column label="Group" name="group" />
-                <column label="Area" name="area" />
+                <column label="Gruppe" name="group" />
+                <column label="Gebiet" name="area" />
         </scroll_list>
         <text name="allowed_label">
                 Zulässiger Landbesitz bei aktuellem Zahlungsplan:
diff --git a/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index 8704c32..d7f56b3 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
@@ -3,5 +3,5 @@
         <check_box label="Cursor folgen" name="lock_check" />
         <combo_box label="Sperren" name="history_combo" />
         <button label="Zurück" name="back_btn" />
-        <button label="Weiterleiten" name="fwd_btn" />
+        <button label="Weiter" name="fwd_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_mute.xml b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
index cc9919a..5dbb9fc 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_mute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte">
+<floater name="mute floater" title="Stummgeschaltete Einwohner und Objekte" short_title="Stummschalten-Liste">
         <scroll_list name="mutes" tool_tip="List of currently muted residents" />
         <button label="Einwohner stummschalten..." label_selected="Einwohner stummschalten..."
              name="Mute resident..."
diff --git a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
index 5f5e1cc..052f654 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_name_description.xml
@@ -6,6 +6,6 @@
         <text name="description_label">
                 Beschreibung:
         </text>
-        <button label="Abbrechen" name="cancel_btn" />
-        <button label="Hochladen (10 L$)" name="ok_btn" />
+        <button label="Abbrechen" name="cancel_btn" width="80" />
+        <button label="Hochladen (10 L$)" name="ok_btn" width="120" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
index 861ecaf..73c6760 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_new_outfit_dialog.xml
@@ -62,7 +62,7 @@
                 Outfits sind Ordner, die Kleider und Körperteile enthalten.
 Ziehen Sie einen Outfit-Ordner auf Ihren Avatar, um ihn anzuziehen.
  
-&quot;Neues Outfit&quot; erstellt einen neuen Ordner und speichert darin Kopien der
+„Neues Outfit“ erstellt einen neuen Ordner und speichert darin Kopien der
 Objekte, die Sie gerade tragen.
         </text>
         <text type="string" length="1" name="Folder name:">
diff --git a/linden/indra/newview/skins/default/xui/de/floater_openobject.xml b/linden/indra/newview/skins/default/xui/de/floater_openobject.xml
index c7f9b74..0b5a365 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_openobject.xml
@@ -4,7 +4,7 @@
                 [DESC]:
         </text>
         <button label="In Inventar kopieren" label_selected="In Inventar kopieren"
-             name="copy_to_inventory_button" />
+             name="copy_to_inventory_button" width="132" />
         <button label="Kopieren und anziehen" label_selected="Kopieren und anziehen"
-             name="copy_and_wear_button" />
+             name="copy_and_wear_button" width="132" left="150" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index b3d8921..eaf95a9 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+        <text type="string" length="1" name="payee_group" width="105">
                 Gruppe bezahlen:
         </text>
-        <text type="string" length="1" name="payee_resident">
+        <text type="string" length="1" name="payee_resident" width="118">
                 Einwohner bezahlen:
         </text>
-        <text type="string" length="1" name="payee_name">
+        <text type="string" length="1" name="payee_name" left="128" width="168">
                 [FIRST] [LAST]
         </text>
-        <text type="string" length="1" name="object_name_label">
+        <text type="string" length="1" name="object_name_label" halign="left">
                 Ãœber Objekt:
         </text>
-        <text type="string" length="1" name="object_name_text">
+        <text type="string" length="1" name="object_name_text" left="105">
                 ...
         </text>
-        <text type="string" length="1" name="fastpay text">
+        <text type="string" length="1" name="fastpay text" width="95" halign="left">
                 Schnellzahlung:
         </text>
         <text type="string" length="1" name="amount text">
                 Betrag:
         </text>
-        <button label="1 L$" label_selected="1 L$" name="fastpay 1" />
-        <button label="5 L$" label_selected="5 L$" name="fastpay 5" />
-        <button label="10 L$" label_selected="10 L$" name="fastpay 10" />
-        <button label="20 L$" label_selected="20 L$" name="fastpay 20" />
+        <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+        <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190" />
+        <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+        <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190" />
         <button label="Zahlen" label_selected="Zahlen" name="pay btn" />
-        <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" />
+        <button label="Abbrechen" label_selected="Abbrechen" name="cancel btn" width="76" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml
index 0d5a6b1..c807556 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_animation.xml
@@ -3,8 +3,9 @@
         <text type="string" length="1" name="desc txt">
                 Beschreibung:
         </text>
+<line_editor left="98" name="desc" width="189" />
         <button label="In Welt abspielen" label_selected="Stopp" name="Anim play btn"
-             tool_tip="Gibt diese Animation so wieder, dass andere sie sehen können." />
+             tool_tip="Gibt diese Animation so wieder, dass andere sie sehen können." width="116" />
         <button label="Lokal wiedergeben" label_selected="Stopp" name="Anim audition btn"
-             tool_tip="Gibt diese Animation so wieder, dass nur Sie sie sehen." />
+             tool_tip="Gibt diese Animation so wieder, dass nur Sie sie sehen." left="171" width="116" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
index 72b8bd8..da385b7 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_preview_gesture.xml
@@ -15,10 +15,10 @@
         <text name="trigger_label">
                 Auslöser:
         </text>
-        <text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser &apos;hallo&apos; durch &apos;wie geht&apos;s&apos; ersetzen, erscheint im Chat anstelle von &apos;Ich wollte nur hallo sagen&apos; der Text &apos;Ich wollte nur wie geht&apos;s sagen&apos; und die zugehörige Geste wird abgespielt.">
+        <text name="replace_text" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt.">
                 Ersetzen mit:
         </text>
-        <line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser &apos;hallo&apos; durch &apos;wie geht&apos;s&apos; ersetzen, erscheint im Chat anstelle von &apos;Ich wollte nur hallo sagen&apos; der Text &apos;Ich wollte nur wie geht&apos;s sagen&apos; und die zugehörige Geste wird abgespielt."/>
+        <line_editor name="replace_editor" tool_tip="Ersetzt den Auslösertext mit diesem Text. Wenn Sie zum Beispiel den Auslöser „hallo“ durch „wie geht&apos;s“ ersetzen, erscheint im Chat anstelle von „Ich wollte nur hallo sagen“ der Text „Ich wollte nur wie geht&apos;s sagen“ und die zugehörige Geste wird abgespielt."/>
         <text name="key_label">
                 Tastenkürzel:
         </text>
@@ -30,12 +30,14 @@
         <text name="steps_label">
                 Schritte:
         </text>
+        <!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
         <scroll_list name="library_list">
                 Animation
 Ton
 Chat
 Warten
         </scroll_list>
+        -->
         <button label="Hinzufügen &gt;&gt;" name="add_btn"/>
         <button label="Nach oben" name="up_btn"/>
         <button label="Nach unten" name="down_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
index da6affb..ddcd2a8 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Missbrauch melden">
+        <texture_picker label="" name="screenshot"/>
+        <check_box label="Screenshot einschließen" name="screen_check" bottom_delta="-20"/>
         <text name="reporter_title">
                 Melder:
         </text>
@@ -15,17 +17,14 @@
         <text name="pos_title">
                 Position:
         </text>
-        <texture_picker name="screenshot" />
-        <check_box label="Screenshot einschließen" name="screen_check" bottom_delta="-20" />
         <text name="pos_field">
                 {128.1, 128.1, 15.4}
         </text>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus" />
         <text bottom_delta="-38" height="32" name="select_object_label">
                 Klicken Sie auf die Schaltfläche,
 dann auf das Objekt:
         </text>
+        <button label="" label_selected="" name="pick_btn" tool_tip="Objektauswahl – Wählen Sie ein Objekt als Thema dieses Berichts aus"/>
         <text name="object_name_label">
                 Name:
         </text>
@@ -38,11 +37,7 @@ dann auf das Objekt:
         <text name="owner_name">
                 Hendrerit Vulputate
         </text>
-        <combo_box name="category_combo"
-             tool_tip="Category -- select the category that best describes this report">
-                <combo_item name="Selectcategory">
-                        Kategorie auswählen
-                </combo_item>
+        <combo_box name="category_combo" tool_tip="Kategorie -- wählen Sie die Kategorie aus, die am besten auf diesen Bericht zutrifft">
                 <combo_item name="Select_category">
                         Kategorie auswählen
                 </combo_item>
@@ -64,14 +59,11 @@ dann auf das Objekt:
                 <combo_item name="Assault__Weapons_testing_sandbox">
                         Angriff &gt; Sandbox für Waffentest
                 </combo_item>
-                <combo_item name="Copyright_or_intellectual_property_violation">
-                        Urheberrechtsverletzung
-                </combo_item>
                 <combo_item name="Commerce__Failure_to_deliver_product_or_service">
-                        Handel &gt; Produkt nicht geliefer oder Dienstleistung nicht erbracht
+                        Handel &gt; Produkt nicht geliefert oder Dienstleistung nicht erbracht
                 </combo_item>
-                <combo_item name="Disclosure__First_Life_information">
-                        Offenlegung &gt; Private Benutzerdaten
+                <combo_item name="Disclosure__Real_world_information">
+                        Offenlegung &gt; Informationen aus realer Welt
                 </combo_item>
                 <combo_item name="Disclosure__Remotely_monitoring chat">
                         Offenlegung &gt; Abhören eines Chats aus der Ferne
@@ -134,28 +126,16 @@ dann auf das Objekt:
                         Unanständigkeit &gt; Anstößiger Avatarname
                 </combo_item>
                 <combo_item name="Indecency__Mature_content_in_PG_region">
-                        Unanständigkeit &gt; Nicht jugendfreier Inhalt in &quot;Jugendfrei&quot;-Region
-                </combo_item>
-                <combo_item name="Intolerance">
-                        Intoleranz
+                        Unanständigkeit &gt; Nicht jugendfreier Inhalt in „Jugendfrei“-Region
                 </combo_item>
-                <combo_item name="Harassment">
-                        Belästigung
+                <combo_item name="Intellectual_property_infringement_Content_Removal">
+                        Urheberrechtsverletzung &gt; Entfernen von Inhalten
                 </combo_item>
-                <combo_item name="Assault">
-                        Angriff
+                <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+                        Urheberrechtsverletzung &gt; CopyBot oder Berechtigungs-Exploit
                 </combo_item>
-                <combo_item name="Disclosure">
-                        Offenlegen
-                </combo_item>
-                <combo_item name="Indecency">
-                        Unanständigkeit
-                </combo_item>
-                <combo_item name="Age">
-                        Alter
-                </combo_item>
-                <combo_item name="Parcel">
-                        Parzelle
+                <combo_item name="Intolerance">
+                        Intoleranz
                 </combo_item>
                 <combo_item name="Land__Abuse_of_sandbox_resources">
                         Land &gt; Missbrauch der Sandbox-Ressourcen
@@ -169,9 +149,6 @@ dann auf das Objekt:
                 <combo_item name="Land__Encroachment__Trees_plants">
                         Land &gt; Unbefugte Nutzung &gt; Bäume/Pflanzen
                 </combo_item>
-                <combo_item name="Trademark_violation">
-                        Markenrechtsverletzung
-                </combo_item>
                 <combo_item name="Wagering_gambling">
                         Wetten/Glücksspiel
                 </combo_item>
@@ -182,10 +159,8 @@ dann auf das Objekt:
         <text name="abuser_name_title">
                 Name des Beschuldigten:
         </text>
-        <button label="Einwohner auswählen" label_selected="" name="select_abuser"
-             tool_tip="Den Namen des Beschuldigten aus einer Liste wählen" />
-        <check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name"
-             tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist" />
+        <button label="Einwohner auswählen" label_selected="" name="select_abuser" tool_tip="Den Namen des Beschuldigten aus einer Liste wählen"/>
+        <check_box label="Name des Täters ist nicht bekannt" name="omit_abuser_name" tool_tip="Wählen Sie diese Option, wenn Ihnen der Name des Täters unbekannt ist"/>
         <text name="abuser_name_title2">
                 Ort des Missbrauchs:
         </text>
@@ -204,6 +179,6 @@ Objekt, wenn möglich.
         <text name="incomplete_title" bottom_delta="-20">
                 Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
         </text>
-        <button label="Missbrauch melden" label_selected="Missbrauch melden" name="send_btn" />
-        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
+        <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn"/>
+        <button label="Missbrauch melden" label_selected="Missbrauch melden" name="send_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
index 1e8cae5..2c8734e 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_report_bug.xml
@@ -103,7 +103,7 @@ Erwartete Ergebnisse:
                 Hinweis: Unvollständige Meldungen werden nicht bearbeitet.
 Sollte Ihnen dieser Fehler unerlaubte Aktionen ermöglichen, 
 die sich eventuell nachteilig auf Leistung oder Sicherheit auswirken, 
-wählen Sie die Kategorie &apos;Exploit&apos;. Vielen Dank!
+wählen Sie die Kategorie „Exploit“. Vielen Dank!
         </text>
         <button label="Fehler melden" label_selected="Fehler melden" name="send_btn" />
         <button label="Abbrechen" label_selected="Abbrechen" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml b/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml
index b2a1b13..63d5ef2 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_script_queue.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="queue" title="Rückgängig">
-        <button label="Schließen" label_selected="Schließen" name="close" />
+        <button label="Schließen" label_selected="Schließen" name="close" left="215" width="72"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index 659207d..d64b9dc 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_settings_debug.xml
@@ -13,5 +13,5 @@
         <spinner label="x" name="val_spinner_2" />
         <spinner label="x" name="val_spinner_3" />
         <spinner label="x" name="val_spinner_4" />
-        <button label="Standard wiederherstellen" name="default_btn" />
+        <button label="Standard wiederherstellen" name="default_btn" width="170" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml
index f2de8103..c7a366a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -112,10 +112,10 @@
         <spinner label="Höhe" name="snapshot_height"/>
         <check_box label="Seitenverhältnis beibehalten" name="keep_aspect_check"/>
         <slider label="Bildqualität" name="image_quality_slider"/>
-        <text name="layer_type_label">
+        <text name="layer_type_label" width="63">
                 Aufnehmen:
         </text>
-        <combo_box label="Bildlayer" name="layer_types">
+        <combo_box label="Bildlayer" name="layer_types" width="132" left="73">
                 <combo_item name="Colors">
                         Farben
                 </combo_item>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_telehub.xml b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
index 091f803..264411c 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Telehub">
+<floater name="telehub" title="Telehub" min_height="310" height="310"  >
         <text name="status_text_connected">
                 Telehub verbunden mit Objekt [OBJECT]
         </text>
@@ -7,22 +7,26 @@
                 Kein Telehub verbunden.
         </text>
         <text name="help_text_connected">
-                Klicken Sie zum Entfernen auf &apos;Trennen&apos;.
+                Klicken Sie zum Entfernen auf „Trennen“.
         </text>
-        <text name="help_text_not_connected">
-                Wählen Sie ein Objekt und klicken Sie auf &apos;Mit Telehub verbinden&apos;.
+        <text name="help_text_not_connected" height="38" bottom_delta="-18" >
+                Wählen Sie ein Objekt und klicken Sie auf
+„Mit Telehub verbinden“.
         </text>
-        <button label="Mit Telehub verbinden" name="connect_btn" />
-        <button label="Trennen" name="disconnect_btn" />
-        <text name="spawn_points_text">
+        <button label="Mit Telehub verbinden" name="connect_btn" width="122" />
+        <button label="Trennen" name="disconnect_btn" left="142" width="98" />
+        <text name="spawn_points_text" width="230">
                 Spawn-Punkte (Positionen, nicht Objekte):
         </text>
         <button label="Spawn hinzufügen" name="add_spawn_point_btn" />
         <button label="Spawn entfernen" name="remove_spawn_point_btn" />
         <text name="spawn_point_help">
-                Wählen Sie ein Objekt und klicken zur Positionsangabe auf &apos;Hinzufügen&apos;.
-Anschließend können sie das Objekt verschieben oder löschen.
-Positionsangaben sind relativ zum Telehub-Mittelpunkt.
-Wählen Sie ein Objekt aus, um seine Position in der Welt anzuzeigen.
+                Wählen Sie ein Objekt und klicken zur
+Positionsangabe auf „Hinzufügen“. Anschließend
+können sie das Objekt verschieben oder löschen.
+Positionsangaben sind relativ zum
+Telehub-Mittelpunkt.
+Wählen Sie ein Objekt aus, um seine Position in
+der Welt anzuzeigen.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_tools.xml b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
index 03401ce..b428585 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -168,9 +168,9 @@
                         <text name="label click action">
                                 Bei Linksklicken:
                         </text>
-                        <combo_box name="clickaction">
+                        <combo_box name="clickaction" width="178">
                                 <combo_item name="Touch/grab(default)">
-                                        Berühren/greifen (Standard)
+                                        Berühren/Greifen (Standard)
                                 </combo_item>
                                 <combo_item name="Sitonobject">
                                         Auf Objekt sitzen
@@ -376,29 +376,30 @@
                         </text>
                         <spinner label="X" left="115" name="Shear X" />
                         <spinner label="Y" left="115" name="Shear Y" />
-                        <text name="advanced_cut">
+                        <text name="advanced_cut" left="115" width="153">
                                 Profilschnitt-Beginn und Ende
                         </text>
-                        <text name="advanced_dimple">
+                        <text name="advanced_dimple" left="115">
                                 Vertiefung-Beginn und Ende
                         </text>
-                        <spinner label="B" name="Path Limit Begin" />
+                        <spinner label="B" name="Path Limit Begin" left="115"/>
                         <spinner label="E" name="Path Limit End" />
-                        <text name="text taper2">
+                        <text name="text taper2" left="115">
                                 Verjüngung
                         </text>
-                        <spinner label="X" name="Taper X" />
+                        <spinner label="X" name="Taper X" left="115"/>
                         <spinner label="Y" name="Taper Y" />
-                        <text name="text radius delta">
+                        <text name="text radius delta" left="115">
                                 Radius
                         </text>
-                        <text name="text revolutions">
+                        <text name="text revolutions" width="74">
                                 Umdrehungen
                         </text>
-                        <texture_picker label="Textur für gestaltetes Primitiv" name="sculpt texture control"
+                        <spinner left="115" name="Radius Offset" />
+                        <texture_picker label="Textur für gestaltetes &#10;Primitiv" name="sculpt texture control"
                              tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
                         <check_box label="Spiegeln" name="sculpt mirror control"
-                             tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." />
+                             tool_tip="Geformtes Primitiv entlang der X-Achse spiegeln." bottom_delta="-34" />
                         <check_box label="Wenden" name="sculpt invert control"
                              tool_tip="Dreht die Normalen des geformten Primitivs von innen nach außen." />
                         <text name="label sculpt type">
@@ -476,7 +477,7 @@
                         </text>
                         <combo_box name="combobox shininess">
                                 <combo_item name="None">
-                                        Keine
+                                        Kein
                                 </combo_item>
                                 <combo_item name="Low">
                                         Niedrig
@@ -561,7 +562,7 @@
                                 Kacheln pro Meter
                         </text>
                         <text name="string repeats per face">
-                                Wiederholungen pro Gesicht
+                                Wiederholungen pro Fläche
                         </text>
                         <text name="rpt">
                                 Kacheln pro Meter
@@ -590,13 +591,13 @@
                 <text name="label_area">
                         Fläche: [AREA] m2
                 </text>
-                <button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land" />
-                <button label="Land aufgeben..." label_selected="Land aufgeben..."
+                <button label="Land kaufen..." label_selected="Land kaufen..." name="button buy land"  width="110" />
+                <button label="Land aufgeben..." label_selected="Land aufgeben..."  width="110"
                      name="button abandon land" />
-                <button label="Unterteilen..." label_selected="Unterteilen..."
+                <button label="Unterteilen..." label_selected="Unterteilen..." width="110"
                      name="button subdivide land" />
-                <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land" />
-                <button label="Info zu Land..." label_selected="Info zu Land..."
+                <button label="Zusammenlegen" label_selected="Zusammenlegen" name="button join land" width="110" />
+                <button label="Info zu Land..." label_selected="Info zu Land..."  width="110"
                      name="button about land" />
         </panel>
         <text name="status_rotate">
@@ -606,7 +607,7 @@
                 Klicken und ziehen, um die ausgewählte Seite zu dehnen
         </text>
         <text name="status_move">
-                Maus verschiebt, Shift-Taste und Maus kopiert
+                Maus verschiebt, Umschalt-Taste und Maus kopiert
         </text>
         <text name="status_modifyland">
                 Klicken und halten, um das Land zu bearbeiten
@@ -615,10 +616,10 @@
                 Klicken und ziehen, um die Ansicht zu ändern
         </text>
         <text name="status_grab">
-                Objekt new positionierern
+                Objekt neu positionieren
         </text>
         <text name="status_place">
-                Mausklick erstellt, Shift-Mausklick wählt aus
+                Mausklick erstellt, Umschalt-Mausklick wählt aus
         </text>
         <text name="status_selectland">
                 Klicken und ziehen, um Land auszuwählen
diff --git a/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
index d7abf5c..f9e7bec 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -1,68 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="wird geladen...">
         <text name="title_text">
                 Wird geladen...
         </text>
         <scroll_list name="objects_list">
-                <column label="Score" name="score" />
-                <column label="Name" name="name" />
-                <column label="Owner" name="owner" />
-                <column label="Location" name="location" />
-                <column label="Uhrzeit" name="time" />
+                <column label="Wertung" name="score" width="65"/>
+                <column label="Name" name="name" width="135"/>
+                <column label="Eigentümer" name="owner"/>
+                <column label="Position" name="location" width="125"/>
+                <column label="Uhrzeit" name="time"/>
+                <column label="Mono-Uhrzeit:" name="mono_time"/>
         </scroll_list>
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
-             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="id_editor" text_readonly_color="white" width="244" />
         <text name="id_text">
                 Objekt-ID:
         </text>
-        <button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen"
-             name="show_beacon_btn" right="-10" width="110" />
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false"
-             follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-             name="object_name_editor" text_readonly_color="white" width="244" />
+        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="id_editor" text_readonly_color="white" width="244"/>
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Beacon anzeigen" name="show_beacon_btn" right="-10" width="110"/>
         <text name="obj_name_text">
                 Objektname:
         </text>
-        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-             name="filter_object_btn" right="-10" width="110" />
-        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true"
-             follows="left|bottom|right" font="SansSerifSmall" height="20" left="106"
-             name="owner_name_editor" text_readonly_color="white" width="218" />
+        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="false" follows="left|bottom|right" font="SansSerifSmall" height="20" left="80" name="object_name_editor" text_readonly_color="white" width="244"/>
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_object_btn" right="-10" width="110"/>
         <text name="owner_name_text">
                 Eigentümername:
         </text>
-        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-             name="filter_owner_btn" right="-10" width="110" />
-        <button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben"
-             left="10" name="return_selected_btn" width="134" />
-        <button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben"
-             left="150" name="return_all_btn" width="134" />
-        <button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren"
-             left="10" name="disable_selected_btn" width="134" />
-        <button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren"
-             left="150" name="disable_all_btn" width="134" />
-        <button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren"
-             name="refresh_btn" right="-10" width="110" />
-        <text name="top_scripts_title">
+        <line_editor bg_readonly_color="clear" bottom_delta="3" enabled="true" follows="left|bottom|right" font="SansSerifSmall" height="20" left="106" name="owner_name_editor" text_readonly_color="white" width="218"/>
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Filter" name="filter_owner_btn" right="-10" width="110"/>
+        <button bottom="35" follows="bottom|left" height="20" label="Auswahl zurückgeben" left="10" name="return_selected_btn" width="134"/>
+        <button bottom="35" follows="bottom|left" height="20" label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/>
+        <button bottom="10" follows="bottom|left" height="20" label="Auswahl deaktivieren" left="10" name="disable_selected_btn" width="134"/>
+        <button bottom="10" follows="bottom|left" height="20" label="Alle deaktivieren" left="150" name="disable_all_btn" width="134"/>
+        <button bottom_delta="0" follows="bottom|right" height="20" label="Aktualisieren" name="refresh_btn" right="-10" width="110"/>
+        <string name="top_scripts_title">
                 Top-Skripts
-        </text>
-        <text name="top_scripts_text">
+        </string>
+        <string name="top_scripts_text">
                 [COUNT] Skripts benötigen insgesamt [TIME] ms
-        </text>
-        <text name="scripts_score_label">
+        </string>
+        <string name="scripts_score_label">
                 Zeit
-        </text>
-        <text name="top_colliders_title">
+        </string>
+        <string name="scripts_mono_time_label">
+                Mono-Uhrzeit:
+        </string>
+        <string name="top_colliders_title">
                 Top-Kollisionsobjekte
-        </text>
-        <text name="top_colliders_text">
+        </string>
+        <string name="top_colliders_text">
                 Top [COUNT] Objekte mit vielen potenziellen Kollisionen
-        </text>
-        <text name="colliders_score_label">
+        </string>
+        <string name="colliders_score_label">
                 Wertung
-        </text>
-        <text name="none_descriptor">
+        </string>
+        <string name="none_descriptor">
                 Nicht gefunden.
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
index 9ad52f7..392d53a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
@@ -4,8 +4,7 @@
                 Medien-URL:
         </text>
         <button label="OK" name="ok_btn" />
-        <button label="Abbrechen" name="cancel_btn" />
-        <button label="Abbrechen" name="cancel_btn2" />
+        <button label="Abbrechen" name="cancel_btn" width="75" />
         <button label="Löschen" name="clear_btn" />
         <text name="loading_label">
                 Wird geladen...
diff --git a/linden/indra/newview/skins/default/xui/de/floater_water.xml b/linden/indra/newview/skins/default/xui/de/floater_water.xml
index d48f2e5..95b4694 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_water.xml
@@ -11,16 +11,17 @@
                         <text name="BHText">
                                 Wassertrübungsfarbe
                         </text>
-                        <button label=" ?" name="WaterFogColorHelp" />
+                        <button label=" ?" name="WaterFogColorHelp" left="175" />
                         <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
                         <text name="WaterFogDensText">
                                 Wassertrübungsdichte
                         </text>
-                        <button label=" ?" name="WaterFogDensityHelp" />
+                        <button label=" ?" name="WaterFogDensityHelp" left="175" />
                         <text name="WaterUnderWaterFogModText">
                                 Wassertrübungs-Modifikator
                         </text>
-                        <button label=" ?" name="WaterUnderWaterFogModHelp" />
+                        <button label=" ?" name="WaterUnderWaterFogModHelp" left="175" />
+                        <slider bottom_delta="-34" name="WaterUnderWaterFogMod" />
                         <text name="BDensText">
                                 Reflexionswellengröße
                         </text>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_world_map.xml b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
index c3d203d..aba6fe5 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="Weltkarte">
         <tab_container name="maptab">
-                <panel label="Objekte" name="objects_mapview" />
-                <panel label="Terrain" name="terrain_mapview" />
+                <panel label="Objekte" name="objects_mapview"/>
+                <panel label="Terrain" name="terrain_mapview"/>
         </tab_container>
         <text font="SansSerifSmall" name="land_for_sale_label">
                 Land erhaeltlich
@@ -16,77 +16,60 @@
         <text name="home_label">
                 Zuhause
         </text>
-        <button label="Nach Hause" label_selected="Nach Hause" name="Go Home"
-             tool_tip="Nach Hause teleportieren" />
-        <text name="classifieds_label">
-                Anzeigen
-        </text>
-        <check_box label=" " name="class_chk" />
+        <button label="Nach Hause" label_selected="Nach Hause" name="Go Home" tool_tip="Nach Hause teleportieren"/>
         <text name="person_label">
                 Person
         </text>
-        <check_box label=" " name="people_chk" />
+        <check_box label=" " name="people_chk"/>
         <text name="infohub_label">
                 Infohub
         </text>
-        <check_box label=" " name="infohub_chk" />
+        <check_box label=" " name="infohub_chk"/>
         <text name="telehub_label">
                 Telehub
         </text>
-        <check_box label=" " name="telehubchk" />
-        <text name="popular_label">
-                Beliebt
-        </text>
-        <check_box label=" " name="popular_chk" />
+        <check_box label=" " name="telehubchk"/>
         <text font="SansSerifSmall" name="land_for_sale_label2">
                 Land erhaeltlich
         </text>
-        <check_box label=" " name="land_for_sale_chk" />
+        <check_box label=" " name="land_for_sale_chk"/>
         <text name="events_label">
                 Events
         </text>
-        <check_box label=" " name="event_chk" />
+        <check_box label=" " name="event_chk"/>
         <text name="events_mature_label">
                 Events (18+)
         </text>
-        <check_box label=" " name="event_mature_chk" />
-        <combo_box label="Online-Freunde" name="friend combo" tool_tip="Friend to Show on Map">
+        <check_box label=" " name="event_mature_chk"/>
+        <combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
                 <combo_item name="none_selected">
                         Online-Freunde
                 </combo_item>
         </combo_box>
-        <combo_box label="Landmarken" name="landmark combo" tool_tip="Landmark to Show on Map">
+        <combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
                 <combo_item name="none_selected">
                         Landmarken
                 </combo_item>
         </combo_box>
-        <line_editor label="Nach Regionsname suchen" name="location"
-             tool_tip="Geben Sie den Namen einer Region ein" />
-        <button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen" />
+        <line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
+        <button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
         <text name="search_label">
                 Suchergebnisse:
         </text>
         <scroll_list name="search_results">
-                <column label="" name="icon" />
-                <column label="" name="sim_name" />
+                <column label="" name="icon"/>
+                <column label="" name="sim_name"/>
         </scroll_list>
         <text name="location_label">
                 Standort:
         </text>
-        <spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte" />
-        <spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte" />
-        <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte" />
-        <button label="Teleportieren" label_selected="Teleportieren" name="Teleport"
-             tool_tip="Zu ausgewählter Position teleportieren" />
-        <button label="Gesuchte Position" label_selected="Ziel anzeigen"
-             name="Show Destination"
-             tool_tip="Karte auf ausgewählte Position zentrieren" />
-        <button label="Löschen" label_selected="Löschen" name="Clear"
-             tool_tip="Verfolgung abschalten" />
-        <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location"
-             tool_tip="Karte auf Position Ihres Avatars zentrieren" />
-        <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren"
-             name="copy_slurl"
-             tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web." />
-        <slider label="Zoom" name="zoom slider" />
+        <spinner name="spin x" tool_tip="X-Koordinate der Position auf der Karte"/>
+        <spinner name="spin y" tool_tip="Y-Koordinate der Position auf der Karte"/>
+        <spinner name="spin z" tool_tip="Z-Koordinate der Position auf der Karte"/>
+        <button label="Teleportieren" label_selected="Teleportieren" name="Teleport" tool_tip="Zu ausgewählter Position teleportieren"/>
+        <button label="Gesuchte Position" label_selected="Ziel anzeigen" name="Show Destination" tool_tip="Karte auf ausgewählte Position zentrieren"/>
+        <button label="Löschen" label_selected="Löschen" name="Clear" tool_tip="Verfolgung abschalten"/>
+        <button label="Meine Position" label_selected="Wo bin ich?" name="Show My Location" tool_tip="Karte auf Position Ihres Avatars zentrieren"/>
+        <button font="SansSerifSmall" label="SLURL in die Zwischenablage kopieren" name="copy_slurl" tool_tip="Kopiert die aktuelle Position als SLURL zur Verwendung im Web."/>
+        <slider label="Zoom" name="zoom slider"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
index 0934a28..9305d07 100644
--- a/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -1,256 +1,210 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
         <menu label="Datei" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Bild hochladen ([COST] L$)..." name="Upload Image" />
-                <menu_item_call label="Sound hochladen ([COST] L$)..." name="Upload Sound" />
-                <menu_item_call label="Animation hochladen ([COST] L$)..." name="Upload Animation" />
-                <menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Fenster schließen" name="Close Window" />
-                <menu_item_call label="Alle Fenster schließen" name="Close All Windows" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Textur speichern unter..." name="Save Texture As..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <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 label="Fenstergröße einstellen" name="Set Window Size">
-                        <menu_item_call label="320x240" name="320x240" />
-                        <menu_item_call label="640x480" name="640x480" />
-                        <menu_item_call label="800x600" name="800x600" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-                        <menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Beenden" name="Quit" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Bild hochladen ([COST] L$)..." name="Upload Image"/>
+                <menu_item_call label="Sound hochladen ([COST] L$)..." name="Upload Sound"/>
+                <menu_item_call label="Animation hochladen ([COST] L$)..." name="Upload Animation"/>
+                <menu_item_call label="Mehrfach-Upload ([COST] L$ pro Datei)..." name="Bulk Upload"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Fenster schließen" name="Close Window"/>
+                <menu_item_call label="Alle Fenster schließen" name="Close All Windows"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Textur speichern unter..." name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <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="Beenden" name="Quit"/>
         </menu>
         <menu label="Bearbeiten" name="Edit">
-                <menu_item_call label="Rückgängig" name="Undo" />
-                <menu_item_call label="Neu" name="Redo" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Ausschneiden" name="Cut" />
-                <menu_item_call label="Kopieren" name="Copy" />
-                <menu_item_call label="Einfügen" name="Paste" />
-                <menu_item_call label="Löschen" name="Delete" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Suchen..." name="Search..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Alle auswählen" name="Select All" />
-                <menu_item_call label="Auswahl aufheben" name="Deselect" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Duplizieren" name="Duplicate" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu label="Objekt anhängen" name="Attach Object" />
-                <menu label="Objekt abnehmen" name="Detach Object" />
+                <menu_item_call label="Rückgängig" name="Undo"/>
+                <menu_item_call label="Neu" name="Redo"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Ausschneiden" name="Cut"/>
+                <menu_item_call label="Kopieren" name="Copy"/>
+                <menu_item_call label="Einfügen" name="Paste"/>
+                <menu_item_call label="Löschen" name="Delete"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Suchen..." name="Search..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Alle auswählen" name="Select All"/>
+                <menu_item_call label="Auswahl aufheben" name="Deselect"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Duplizieren" name="Duplicate"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu label="Objekt anhängen" name="Attach Object"/>
+                <menu label="Objekt abnehmen" name="Detach Object"/>
                 <menu label="Kleider ausziehen" name="Take Off Clothing">
-                        <menu_item_call label="Hemd" name="Shirt" />
-                        <menu_item_call label="Hose" name="Pants" />
-                        <menu_item_call label="Schuhe" name="Shoes" />
-                        <menu_item_call label="Socken" name="Socks" />
-                        <menu_item_call label="Jacke" name="Jacket" />
-                        <menu_item_call label="Handschuhe" name="Gloves" />
-                        <menu_item_call label="Unterhemd" name="Menu Undershirt" />
-                        <menu_item_call label="Unterhose" name="Menu Underpants" />
-                        <menu_item_call label="Rock" name="Skirt" />
-                        <menu_item_call label="Alle Kleider" name="All Clothes" />
+                        <menu_item_call label="Hemd" name="Shirt"/>
+                        <menu_item_call label="Hose" name="Pants"/>
+                        <menu_item_call label="Schuhe" name="Shoes"/>
+                        <menu_item_call label="Socken" name="Socks"/>
+                        <menu_item_call label="Jacke" name="Jacket"/>
+                        <menu_item_call label="Handschuhe" name="Gloves"/>
+                        <menu_item_call label="Unterhemd" name="Menu Undershirt"/>
+                        <menu_item_call label="Unterhose" name="Menu Underpants"/>
+                        <menu_item_call label="Rock" name="Skirt"/>
+                        <menu_item_call label="Alle Kleider" name="All Clothes"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Gesten..." name="Gestures..." />
-                <menu_item_call label="Profil..." name="Profile..." />
-                <menu_item_call label="Aussehen..." name="Appearance..." />
-                <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="Freunde..." name="Friends..." />
-                <menu_item_call label="Gruppen..." name="Groups..." />
-                <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="Einstellungen..." name="Preferences..." />
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Gesten..." name="Gestures..."/>
+                <menu_item_call label="Profil..." name="Profile..."/>
+                <menu_item_call label="Aussehen..." name="Appearance..."/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_check label="Freunde..." name="Friends..."/>
+                <menu_item_call label="Gruppen..." name="Groups..."/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_call label="Einstellungen..." name="Preferences..."/>
         </menu>
         <menu label="Ansicht" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Mouselook" name="Mouselook" />
-                <menu_item_check label="Bauen" name="Build" />
-                <menu_item_check label="Joystick-Flycam" name="Joystick Flycam" />
-                <menu_item_call label="Ansicht zurücksetzen" name="Reset View" />
-                <menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Symbolleiste" name="Toolbar" />
-                <menu_item_check label="Lokaler Chat" name="Chat History" />
-                <menu_item_check label="Unterhalten" name="Instant Message" />
-                <menu_item_call label="Inventar" name="Inventory" />
-                <menu_item_check label="Aktive Sprecher" name="Active Speakers" />
-                <menu_item_check label="Stummschalten-Liste" name="Mute List" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="Kamerasteuerung" name="Camera Controls" />
-                <menu_item_check label="Bewegungssteuerung" name="Movement Controls" />
-                <menu_item_check label="Weltkarte" name="World Map" />
-                <menu_item_check label="Minikarte" name="Mini-Map" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="Statistikleiste" name="Statistics Bar" />
-                <menu_item_check label="Grundstücksgrenzen" name="Property Lines" />
-                <menu_item_check label="Landeigentümer" name="Land Owners" />
-                <menu_item_separator label="-----------" name="separator4" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Mouselook" name="Mouselook"/>
+                <menu_item_check label="Bauen" name="Build"/>
+                <menu_item_check label="Joystick-Flycam" name="Joystick Flycam"/>
+                <menu_item_call label="Ansicht zurücksetzen" name="Reset View"/>
+                <menu_item_call label="Letzten Chatter ansehen" name="Look at Last Chatter"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Symbolleiste" name="Toolbar"/>
+                <menu_item_check label="Lokaler Chat" name="Chat History"/>
+                <menu_item_check label="Unterhalten" name="Instant Message"/>
+                <menu_item_call label="Inventar" name="Inventory"/>
+                <menu_item_check label="Aktive Sprecher" name="Active Speakers"/>
+                <menu_item_check label="Stummschalten-Liste" name="Mute List"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
+                <menu_item_check label="Bewegungssteuerung" name="Movement Controls"/>
+                <menu_item_check label="Weltkarte" name="World Map"/>
+                <menu_item_check label="Minikarte" name="Mini-Map"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Statistikleiste" name="Statistics Bar"/>
+                <menu_item_check label="Grundstücksgrenzen" name="Property Lines"/>
+                <menu_item_check label="Landeigentümer" name="Land Owners"/>
+                <menu_item_separator label="-----------" name="separator4"/>
                 <menu label="Schwebe-Tipps" name="Hover Tips">
-                        <menu_item_check label="Tipps anzeigen" name="Show Tips" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="Landtipps" name="Land Tips" />
-                        <menu_item_check label="Tipps zu allen Objekten" name="Tips On All Objects" />
-                </menu>
-                <menu_item_check label="Alt zeigt physische Objekte an" name="Alt Shows Physical" />
-                <menu_item_check label="Beacons immer an" name="Beacons Always On" />
-                <menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent" />
-                <menu label="Beacons" name="Beacons">
-                        <menu_item_check label="Auf Berührung beschränkte Skriptobjekte"
-                             name="Scripted Objects With Touch Only" />
-                        <menu_item_check label="Scripting-Objekte" name="Scripted Objects" />
-                        <menu_item_check label="Physische Objekte" name="Physical Objects" />
-                        <menu_item_check label="Soundquellen" name="Sound Sources" />
-                        <menu_item_check label="Partikelquellen" name="Particle Sources" />
-                        <menu_item_check label="Glanzlichter anzeigen" name="Render Highlights" />
-                        <menu_item_check label="Beacons anzeigen" name="Render Beacons" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_separator label=" -----------" name="separator2" />
-                        <menu_item_check label="Partikel ausblenden" name="Hide Particles" />
-                        <menu_item_separator label=" -----------" name="separator3" />
-                        <menu label="Beacon-Breite" name="Beacon Width">
-                                <menu_item_call label=" 1" name="Beacon Width 1" />
-                                <menu_item_call label=" 4" name="Beacon Width 4" />
-                                <menu_item_call label=" 16" name="Beacon Width 16" />
-                                <menu_item_call label=" 32" name="Beacon Width 32" />
-                        </menu>
+                        <menu_item_check label="Tipps anzeigen" name="Show Tips"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="Landtipps" name="Land Tips"/>
+                        <menu_item_check label="Tipps zu allen Objekten" name="Tips On All Objects"/>
                 </menu>
-                <menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Hinein zoomen" name="Zoom In" />
-                <menu_item_call label="Zoom-Standard" name="Zoom Default" />
-                <menu_item_call label="Wegzoomen" name="Zoom Out" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Vollbild" name="Toggle Fullscreen" />
-                <menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default" />
+                <menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
+                <menu_item_check label="Beacons" name="beacons"/>
+                <menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
+                <menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Hinein zoomen" name="Zoom In"/>
+                <menu_item_call label="Zoom-Standard" name="Zoom Default"/>
+                <menu_item_call label="Wegzoomen" name="Zoom Out"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Vollbild" name="Toggle Fullscreen"/>
+                <menu_item_call label="UI-Größe auf Standard setzen" name="Set UI Size to Default"/>
         </menu>
         <menu label="Welt" name="World">
-                <menu_item_call label="Chat" name="Chat" />
-                <menu_item_call label="Geste starten" name="Start Gesture" />
-                <menu_item_check label="Immer rennen" name="Always Run" />
-                <menu_item_check label="Fliegen" name="Fly" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Landmarke hier setzen" name="Create Landmark Here" />
-                <menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Teleport nach Hause" name="Teleport Home" />
-                <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_call label="Tasten freigeben" name="Release Keys" />
-                <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..." />
-                <menu_item_call label="L$ kaufen..." name="Buy and Sell L$..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Mein Land..." name="My Land..." />
-                <menu_item_call label="Land-Info..." name="About Land..." />
-                <menu_item_call label="Land kaufen..." name="Buy Land..." />
-                <menu_item_call label="Region/Grundstück..." name="Region/Estate..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Sonne erzwingen" name="Force Sun">
-                        <menu_item_call label="Sonnenaufgang" name="Sunrise" />
-                        <menu_item_call label="Mittags" name="Noon" />
-                        <menu_item_call label="Sonnenuntergang" name="Sunset" />
-                        <menu_item_call label="Mitternacht" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default" />
-                </menu>
+                <menu_item_call label="Chat" name="Chat"/>
+                <menu_item_check label="Immer rennen" name="Always Run"/>
+                <menu_item_check label="Fliegen" name="Fly"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Landmarke hier setzen" name="Create Landmark Here"/>
+                <menu_item_call label="Hier als Zuhause wählen" name="Set Home to Here"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Teleport nach Hause" name="Teleport Home"/>
+                <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_call label="Tasten freigeben" name="Release Keys"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Kontostatistik..." name="Account History...">
+                        <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=de" />
+                </menu_item_call>
+                <menu_item_call label="Mein Konto verwalten..." name="Manage My Account...">
+                        <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=de" />
+                </menu_item_call>
+                <menu_item_call label="L$ kaufen..." name="Buy and Sell L$..."/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Mein Land..." name="My Land..."/>
+                <menu_item_call label="Land-Info..." name="About Land..."/>
+                <menu_item_call label="Land kaufen..." name="Buy Land..."/>
+                <menu_item_call label="Region/Grundstück..." name="Region/Estate..."/>
+                <menu_item_separator label="-----------" name="separator6"/>
                 <menu label="Umwelt-Einstellungen" name="Environment Settings">
-                        <menu_item_call label="Sonnenaufgang" name="Sunrise" />
-                        <menu_item_call label="Mittag" name="Noon" />
-                        <menu_item_call label="Sonnenuntergang" name="Sunset" />
-                        <menu_item_call label="Mitternacht" name="Midnight" />
-                        <menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default" />
-                        <menu_item_separator label=" -----------" name="separator" />
-                        <menu_item_call label="Umwelt-Editor" name="Environment Editor" />
+                        <menu_item_call label="Sonnenaufgang" name="Sunrise"/>
+                        <menu_item_call label="Mittag" name="Noon"/>
+                        <menu_item_call label="Sonnenuntergang" name="Sunset"/>
+                        <menu_item_call label="Mitternacht" name="Midnight"/>
+                        <menu_item_call label="Auf Regionsstandard zurücksetzen" name="Revert to Region Default"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Umwelt-Editor" name="Environment Editor"/>
                 </menu>
         </menu>
         <menu label="Werkzeug" name="Tools">
                 <menu label="Fehlermeldungen" name="Select Tool">
-                        <menu_item_call label="Fokus" name="Focus" />
-                        <menu_item_call label="Verschieben" name="Move" />
-                        <menu_item_call label="Bearbeiten" name="Edit" />
-                        <menu_item_call label="Erstellen" name="Create" />
-                        <menu_item_call label="Land" name="Land" />
+                        <menu_item_call label="Fokus" name="Focus"/>
+                        <menu_item_call label="Verschieben" name="Move"/>
+                        <menu_item_call label="Bearbeiten" name="Edit"/>
+                        <menu_item_call label="Erstellen" name="Create"/>
+                        <menu_item_call label="Land" name="Land"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects" />
-                <menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects" />
-                <menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding" />
-                <menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection" />
-                <menu_item_check label="Lichtradius für Auswahl anzeigen"
-                     name="Show Light Radius for Selection" />
-                <menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="An Raster ausrichten" name="Snap to Grid" />
-                <menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid" />
-                <menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid" />
-                <menu_item_call label="Rasteroptionen..." name="Grid Options..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts" />
-                <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_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" />
-                <menu_item_call label="Objekt kaufen" name="Menu Object Take" />
-                <menu_item_call label="Kopie nehmen/machen" name="Take Copy" />
-                <menu_item_call label="Objekt wieder im Inventar speichern"
-                     name="Save Object Back to My Inventory" />
-                <menu_item_call label="Objekt wieder in Objektinhalt speichern"
-                     name="Save Object Back to Object Contents" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Skriptwarnung/Fehlerfenster anzeigen"
-                     name="Show Script Warning/Error Window" />
-                <menu_item_call label="Skripte in Auswahl neu kompilieren"
-                     name="Recompile Scripts in Selection">
-                        <menu_item_call label="Mono" name="Mono" />
-                        <menu_item_call label="LSL" name="LSL" />
-                </menu_item_call>
-                <menu_item_call label="Skripte in Auswahl zurücksetzen" name="Reset Scripts in Selection" />
-                <menu_item_call label="Skripte in Auswahl so einstellen, dass sie ausgeführt werden"
-                     name="Set Scripts to Running in Selection" />
-                <menu_item_call label="Skripte in Auswahl so einstellen, dass sie nicht ausgeführt werden"
-                     name="Set Scripts to Not Running in Selection" />
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
+                <menu_item_check label="Nur bewegliche Objekte auswählen" name="Select Only Movable Objects"/>
+                <menu_item_check label="Nach Umgebung auswählen" name="Select By Surrounding"/>
+                <menu_item_check label="Ausgeblendete Auswahl anzeigen" name="Show Hidden Selection"/>
+                <menu_item_check label="Lichtradius für Auswahl anzeigen" name="Show Light Radius for Selection"/>
+                <menu_item_check label="Auswahlstrahl anzeigen" name="Show Selection Beam"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="An Raster ausrichten" name="Snap to Grid"/>
+                <menu_item_call label="Objekt-XY an Raster ausrichten" name="Snap Object XY to Grid"/>
+                <menu_item_call label="Auswahl für Raster verwenden" name="Use Selection for Grid"/>
+                <menu_item_call label="Rasteroptionen..." name="Grid Options..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Verknüpfte Teile bearbeiten" name="Edit Linked Parts"/>
+                <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="Fokus auf Auswahl" name="Focus on Selection"/>
+                <menu_item_call label="Auf Auswahl zoomen" name="Zoom to Selection"/>
+                <menu_item_call label="Objekt kaufen" name="Menu Object Take"/>
+                <menu_item_call label="Kopie nehmen/machen" name="Take Copy"/>
+                <menu_item_call label="Objekt wieder im Inventar speichern" name="Save Object Back to My Inventory"/>
+                <menu_item_call label="Objekt wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Skriptwarnung/Fehlerfenster anzeigen" name="Show Script Warning/Error Window"/>
+                <menu label="Skripte in Auswahl neu kompilieren" name="Recompile Scripts in Selection">
+                        <menu_item_call label="Mono" name="Mono"/>
+                        <menu_item_call label="LSL" name="LSL"/>
+                </menu>
+                <menu_item_call label="Skripte in Auswahl zurücksetzen" name="Reset Scripts in Selection"/>
+                <menu_item_call label="Skripte in Auswahl so einstellen, dass sie ausgeführt werden" name="Set Scripts to Running in Selection"/>
+                <menu_item_call label="Skripte in Auswahl so einstellen, dass sie nicht ausgeführt werden" name="Set Scripts to Not Running in Selection"/>
         </menu>
         <menu label="Hilfe" name="Help">
-                <menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />
-                <menu_item_call label="In-Welt-Hilfe" name="In-World Help" />
-                <menu_item_call label="Weitere Hilfe" name="Additional Help" />
-                <menu_item_call label="Tutorial" name="Tutorial" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Offizielles Linden-Blog..." name="Official Linden Blog..." />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Scripting-Anleitung..." name="Scripting Guide..." />
-                <menu_item_call label="Scripting-Portal..." name="Scripting Portal..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Meldung des Tages..." name="Message of the Day..." />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Missbrauch melden..." name="Report Abuse..." />
-                <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="separator7" />
-                <menu_item_separator label="-----------" name="separator5" />
+                <menu_item_call label="Hilfe zu Second Life" name="Second Life Help"/>
+                <menu_item_call label="Tutorial" name="Tutorial"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Offizielles Linden-Blog..." name="Official Linden Blog..."/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Scripting-Portal..." name="Scripting Portal..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Missbrauch melden..." name="Report Abuse..."/>
+                <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="separator7"/>
                 <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_separator label=" -----------" name="separator7" />
-                        <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_separator label=" -----------" name="separator9" />
-                        <menu_item_call label="Fehler melden..." name="Report Bug..." />
+                        <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_separator label="-----------" name="separator7"/>
+                        <menu_item_call label="Fehlermeldungs-1x1..." name="Bug Reporing 101...">
+                                <on_click function="PromptShowURL" name="BugReporting101_url"
+                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                        </menu_item_call>
+                        <menu_item_call label="Sicherheitsfragen..." name="Security Issues...">
+                                <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/de" />
+                        </menu_item_call>
+                        <menu_item_call label="QA-Wiki..." name="QA Wiki..."/>
+                        <menu_item_separator label="-----------" name="separator9"/>
+                        <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..." />
+                <menu_item_call label="Ãœber Second Life..." name="About Second Life..."/>
         </menu>
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/de/mime_types.xml b/linden/indra/newview/skins/default/xui/de/mime_types.xml
index a11dcfa..e01649e 100644
--- a/linden/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/de/mime_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
         <widgetset name="web">
                 <label name="web_label">
@@ -16,7 +16,7 @@
                         Video
                 </label>
                 <tooltip name="movie_tooltip">
-                        Kein Video gefunden
+                        Ein Video wurde gefunden.
                 </tooltip>
                 <playtip name="movie_playtip">
                         Video wiedergeben
diff --git a/linden/indra/newview/skins/default/xui/de/notify.xml b/linden/indra/newview/skins/default/xui/de/notify.xml
index a2f2deb..3d41aee 100644
--- a/linden/indra/newview/skins/default/xui/de/notify.xml
+++ b/linden/indra/newview/skins/default/xui/de/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
         <notify name="SystemMessageTip">
                 <message name="message">
@@ -106,8 +106,7 @@ Bitte versuchen Sie es erneut.
         <notify name="CapsKeyOn">
                 <message name="message">
                         Die Feststelltaste ist aktiv.
-Da dies Auswirkung auf die Kennworteingabe hat,
-sollten Sie die Taste besser ausschalten.
+Da dies Auswirkung auf die Kennworteingabe hat, sollten Sie die Taste besser ausschalten.
                 </message>
         </notify>
         <notify name="NotecardMissing">
@@ -148,9 +147,7 @@ Bitte versuchen Sie es erneut.
         </notify>
         <notify name="IncompleteInventory">
                 <message name="message">
-                        Die von Ihnen angebotenen Inhalte sind noch nicht
-vollständig lokal verfügbar. Warten Sie kurz und wiederholen Sie
-dann das Angebot.
+                        Die von Ihnen angebotenen Inhalte sind noch nicht vollständig lokal verfügbar. Warten Sie kurz und wiederholen Sie dann das Angebot.
                 </message>
         </notify>
         <notify name="CannotModifyProtectedCategories">
@@ -238,14 +235,14 @@ Wählen Sie ein einzelnes Objekt aus.
         </notify>
         <notify name="TeleportToLandmark">
                 <message name="message">
-                        Jetzt, nachdem Sie das Mainland erreicht haben, können Sie sich an Positionen wie &apos;[NAME]&apos; teleportieren, indem Sie unten rechts im Fenster auf &apos;Inventar&apos; klicken und den Ordner &apos;Landmarken&apos; auswählen.
-Klicken Sie eine Landmarke doppelt an und wählen Sie &apos;Teleportieren&apos;, um an diesen Ort zu gelangen.
+                        Jetzt, nachdem Sie das Mainland erreicht haben, können Sie sich an Positionen wie „[NAME]“ teleportieren, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Landmarken“ auswählen.
+Klicken Sie eine Landmarke doppelt an und wählen Sie „Teleportieren“, um an diesen Ort zu gelangen.
                 </message>
         </notify>
         <notify name="TeleportToPerson">
                 <message name="message">
-                        Jetzt, nachdem Sie das Mainland erreicht haben, können Sie mit Einwohnern wie &apos;[NAME]&apos; Kontakt aufnehmen, indem Sie unten rechts im Fenster auf &apos;Inventar&apos; klicken und den Ordner &apos;Visitenkarten&apos; auswählen.
-Klicken Sie die Karte doppelt an, wählen Sie &apos;Instant Message&apos; und geben Sie eine Nachricht ein.
+                        Jetzt, nachdem Sie das Mainland erreicht haben, können Sie mit Einwohnern wie „[NAME]“ Kontakt aufnehmen, indem Sie unten rechts im Fenster auf „Inventar“ klicken und den Ordner „Visitenkarten“ auswählen.
+Klicken Sie die Karte doppelt an, wählen Sie „Instant Message“ und geben Sie eine Nachricht ein.
                 </message>
         </notify>
         <notify name="CantSelectLandFromMultipleRegions">
@@ -307,8 +304,7 @@ Wählen Sie eine kleinere Landfläche.
         </notify>
         <notify name="TransferObjectsHighlighted">
                 <message name="message">
-                        Alle Objekte auf dieser Parzelle, die an den Käufer
-der Parzelle übertragen werden, sind jetzt markiert.
+                        Alle Objekte auf dieser Parzelle, die an den Käufer der Parzelle übertragen werden, sind jetzt markiert.
  
 * Übertragene Bäume und Gräser sind nicht markiert.
                 </message>
@@ -335,22 +331,18 @@ Laden Sie QuickTime von der QuickTime-Webseite (http://www.apple.com/de/quicktim
         </notify>
         <notify name="OwnedObjectsReturned">
                 <message name="message">
-                        Ihre Objekte auf der ausgewählten Parzelle 
-wurden in Ihr Inventar transferiert.
+                        Ihre Objekte auf der ausgewählten Parzelle wurden in Ihr Inventar transferiert.
                 </message>
         </notify>
         <notify name="OtherObjectsReturned">
                 <message name="message">
-                        Die Objekte von [FIRST] [LAST] auf dieser
-Parzelle wurden in das Inventar
-dieser Person transferiert.
+                        Die Objekte von [FIRST] [LAST] auf dieser Parzelle wurden in das Inventar dieser Person transferiert.
                 </message>
         </notify>
         <notify name="OtherObjectsReturned2">
                 <message name="message">
                         Die Objekte von [FIRST] [LAST] auf dieser 
-Parzelle von &apos;[NAME]&apos;
-wurden an ihren Eigentümer zurückgegeben.
+Parzelle von „[NAME]“ wurden an ihren Eigentümer zurückgegeben.
                 </message>
         </notify>
         <notify name="GroupObjectsReturned">
@@ -367,19 +359,19 @@ Nicht transferierbare an die Gruppe übertragene Objekte wurden gelöscht.
         </notify>
         <notify name="NotSafe">
                 <message name="message">
-                        Auf diesem Land ist Schaden aktiviert (&apos;Unsicher&apos;).
+                        Auf diesem Land ist Schaden aktiviert („Unsicher“).
 Verletzungen sind möglich. Wenn Sie sterben, werden Sie zu Ihrem Heimatstandort teleportiert.
                 </message>
         </notify>
         <notify name="NoFly">
                 <message name="message">
-                        Auf diesem Land ist Fliegen deaktiviert (&apos;Fliegen aus&apos;).
+                        Auf diesem Land ist Fliegen deaktiviert („Fliegen aus“).
 Fliegen ist hier nicht möglich.
                 </message>
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        Dieses Land ist &apos;llPushObject-beschränkt&apos;.
+                        Auf diesem Land gilt „Kein Stoßen“.
 Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
                 </message>
         </notify>
@@ -395,7 +387,7 @@ Sie können keine anderen Personen stoßen, außer Ihnen gehört das Land.
         </notify>
         <notify name="NoBuild">
                 <message name="message">
-                        Auf diesem Land ist Bauen deaktiviert (&apos;Bauen aus&apos;).
+                        Auf diesem Land ist Bauen deaktiviert („Bauen aus“).
 Sie können hier keine Objekte erstellen.
                 </message>
         </notify>
@@ -412,7 +404,7 @@ Sie können hier keine Objekte erstellen.
         <notify name="NoOutsideScripts">
                 <message name="message">
                         Auf diesem Land sind externe Skripts deaktiviert
-(&apos;Externe Skripts aus&apos;).
+(„Externe Skripts aus“).
 Nur Skripts, die dem Landeigentümer gehören, funktionieren.
                 </message>
         </notify>
@@ -463,7 +455,7 @@ Nur Skripts, die dem Landeigentümer gehören, funktionieren.
         </notify>
         <notify name="UserGiveItem">
                 <message name="message">
-                        [NAME] hat Ihnen ein [OBJECTTYPE] namens &apos;[OBJECTNAME]&apos; gegeben.
+                        [NAME] hat Ihnen ein [OBJECTTYPE] namens „[OBJECTNAME]“ gegeben.
                 </message>
                 <option name="Keep">
                         Behalten
@@ -497,8 +489,7 @@ Nur Skripts, die dem Landeigentümer gehören, funktionieren.
         </notify>
         <notify name="JoinGroupOfficerNoFee">
                 <message name="message">
-                        [NAME] hat Sie eingeladen
-einer Gruppe als Officer beizutreten.
+                        [NAME] hat Sie eingeladen einer Gruppe als Officer beizutreten.
 Der Beitritt ist kostenlos.
  
 [MESSAGE]
@@ -515,8 +506,7 @@ Der Beitritt ist kostenlos.
         </notify>
         <notify name="JoinGroupMember">
                 <message name="message">
-                        [NAME] hat Sie eingeladen
-einer Gruppe beizutreten.
+                        [NAME] hat Sie eingeladen einer Gruppe beizutreten.
 Die Beitrittsgebühr beträgt [COST] L$
  
 [MESSAGE]
@@ -593,8 +583,7 @@ Der Beitritt ist kostenlos.
                 <message name="message">
                         [NAME] bietet Ihnen die Freundschaft an.
 
-(Sie werden dadurch den gegenseitigen 
-Online-Status sehen können.)
+(Sie werden dadurch den gegenseitigen Online-Status sehen können.)
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -616,8 +605,7 @@ Online-Status sehen können.)
         <notify name="OfferCallingCard">
                 <message name="message">
                         [FIRST] [LAST] bietet Ihnen eine Visitenkarte an.
-Dies erstellt ein Lesezeichen in Ihrem Inventar,
-damit Sie diesen Einwohner jederzeit über IM erreichen.
+Dies erstellt ein Lesezeichen in Ihrem Inventar, damit Sie diesen Einwohner jederzeit über IM erreichen.
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -738,7 +726,7 @@ Versuchen Sie es in einer Minute erneut, dann wird es schon klappen.
         </notify>
         <notify name="ScriptQuestion">
                 <message name="message">
-                        Das Objekt &apos;[OBJECTNAME]&apos;, Eigentum von &apos;[NAME]&apos;, möchte:
+                        Das Objekt „[OBJECTNAME]“, Eigentum von „[NAME]“, möchte:
  
 [QUESTIONS]
 Ist das OK?
@@ -755,12 +743,12 @@ Ist das OK?
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
                 <message name="message">
-                        Dem Objekt &apos;[OBJECTNAME]&apos;, Eigentum von &apos;[OWNERNAME]&apos;, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis gewährt: [PERMISSIONS].
+                        Dem Objekt „[OBJECTNAME]“, Eigentum von „[OWNERNAME]“, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis gewährt: [PERMISSIONS].
                 </message>
         </notify>
         <notify name="ScriptQuestionCautionChatDenied">
                 <message name="message">
-                        Dem Objekt &apos;[OBJECTNAME]&apos;, Eigentum von &apos;[OWNERNAME]&apos;, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis verweigert: [PERMISSIONS].
+                        Dem Objekt „[OBJECTNAME]“, Eigentum von „[OWNERNAME]“, in [REGIONNAME] auf [REGIONPOS], wurde folgende Erlaubnis verweigert: [PERMISSIONS].
                 </message>
         </notify>
         <notify name="ScriptQuestionCautionWarn">
@@ -770,10 +758,10 @@ Ist das OK?
         </notify>
         <notify name="ScriptQuestionCaution">
                 <message name="message">
-                        Das Objekt &apos;[OBJECTNAME]&apos;, Eigentum von &apos;[NAME]&apos;, möchte:
+                        Das Objekt „[OBJECTNAME]“, Eigentum von „[NAME]“, möchte:
  
 [QUESTIONS]
-Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen. Klicken Sie für weitere Informationen auf &apos;Details&apos;.
+Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen. Klicken Sie für weitere Informationen auf „Details“.
 
 Anfrage gestatten?
                 </message>
@@ -789,7 +777,7 @@ Anfrage gestatten?
         </notify>
         <notify name="ScriptDialog">
                 <message name="message">
-                        [FIRST] [LAST]s &apos;[TITLE]&apos;
+                        [FIRST] [LAST]s „[TITLE]“
 [MESSAGE]
                 </message>
                 <option name="Ignore">
@@ -798,7 +786,7 @@ Anfrage gestatten?
         </notify>
         <notify name="ScriptDialogGroup">
                 <message name="message">
-                        [GROUPNAME]s &apos;[TITLE]&apos;
+                        [GROUPNAME]s „[TITLE]“
 [MESSAGE]
                 </message>
                 <option name="Ignore">
@@ -809,30 +797,27 @@ Anfrage gestatten?
                 <message name="message">
                         Sie haben gerade [AMOUNT] L$ erhalten.
 Objekte und andere Benutzer können Ihnen L$ geben.
-Ihren Kontostand sehen Sie in der
-oberen rechten Ecke des Bildschirms.
+Ihren Kontostand sehen Sie in der oberen rechten Ecke des Bildschirms.
                 </message>
         </notify>
         <notify name="FirstBalanceDecrease">
                 <message name="message">
                         Sie haben gerade [AMOUNT] L$ bezahlt.
-Ihren Kontostand sehen Sie in der oberen 
-rechten Ecke des Bildschirms.
+Ihren Kontostand sehen Sie in der oberen rechten Ecke des Bildschirms.
                 </message>
         </notify>
         <notify name="FirstSit">
                 <message name="message">
                         Sie sitzen.
-Benutzen Sie die Pfeiltasten (oder AWSD), um die Ansicht zu ändern.
-Klicken Sie auf &apos;Aufstehen&apos;, um aufzustehen.
+Benutzen Sie die Pfeil- oder WASD-Tasten, um die Ansicht zu ändern.
+Klicken Sie auf „Aufstehen“, um aufzustehen.
                 </message>
         </notify>
         <notify name="FirstMap">
                 <message name="message">
                         Zum Verschieben der Karte klicken und ziehen.
 Zum Teleportieren doppelklicken.
-Nutzen Sie die Optionen links, um Dinge zu finden
-und um verschiedene Hintergründe anzuzeigen.
+Nutzen Sie die Optionen links, um Dinge zu finden und um verschiedene Hintergründe anzuzeigen.
                 </message>
         </notify>
         <notify name="FirstBuild">
@@ -854,24 +839,22 @@ Die rechte Maustaste zeigt immer ein Aktionsmenü an.
         <notify name="FirstTeleport">
                 <message name="message">
                         Diese Region unterstützt keine direkten Teleports. Sie wurden zum nächstgelegenen Telehub transportiert. 
-Ihr Ziel ist mit einem großen roten Strahl markiert. 
-Folgen Sie dem roten Pfeil zum Strahl oder klicken Sie auf den Pfeil, um den Strahl zu entfernen.
+Ihr Ziel ist mit einem großen roten Strahl markiert. Folgen Sie dem roten Pfeil zum Strahl oder klicken Sie auf den Pfeil, um den Strahl zu entfernen.
                 </message>
         </notify>
         <notify name="FirstOverrideKeys">
                 <message name="message">
                         Ihre Bewegungstasten werden jetzt von einem Objekt gesteuert.  
-Probieren Sie die Pfeiltasten oder AWSD aus.  
+Probieren Sie die Pfeil- oder WASD-Tasten aus.
 Manche Objekte (wie Waffen) müssen per Mouselook gesteuert werden. 
-Drücken Sie dazu &apos;M&apos;.
+Drücken Sie dazu „M“.
                 </message>
         </notify>
         <notify name="FirstAppearance">
                 <message name="message">
                         Sie bearbeiten gerade Ihr Aussehen.  
 Benutzen Sie die Pfeiltasten zum Drehen und Zoomen. 
-Klicken Sie auf &apos;Alles speichern&apos;, wenn Sie fertig sind, 
-um Ihr Aussehen zu speichern.  
+Klicken Sie auf „Alles speichern“, wenn Sie fertig sind, um Ihr Aussehen zu speichern.  
 Sie können Ihr Aussehen jederzeit verändern.
                 </message>
         </notify>
@@ -886,8 +869,7 @@ Sie können Ihr Aussehen jederzeit verändern.
         <notify name="FirstSandbox">
                 <message name="message">
                         Dies ist eine Sandkastenregion.
-Objekte, die Sie hier bauen, können gelöscht werden,
-wenn Sie das Gebiet verlassen. Sandkästen werden regelmäßig gereinigt. Weitere Informationen hierzu finden Sie oben im Bild neben dem Regionsnamen.
+Objekte, die Sie hier bauen, können gelöscht werden, wenn Sie das Gebiet verlassen. Sandkästen werden regelmäßig gereinigt. Weitere Informationen hierzu finden Sie oben im Bild neben dem Regionsnamen.
  
 Sandkastenregionen kommen selten vor und sind entsprechend gekennzeichnet.
                 </message>
@@ -895,13 +877,12 @@ Sandkastenregionen kommen selten vor und sind entsprechend gekennzeichnet.
         <notify name="FirstFlexible">
                 <message name="message">
                         Dieses Objekt ist flexibel. 
-Ein flexibles Objekt ist ein Phantom und nicht physisch, 
-bis die Option &apos;Flexibel&apos; deaktiviert wurde.
+Ein flexibles Objekt ist ein Phantom und nicht physisch, bis die Option „Flexibel“ deaktiviert wurde.
                 </message>
         </notify>
         <notify name="FirstDebugMenus">
                 <message name="message">
-                        Sie haben das Erweitert-Menü aktiviert. 
+                        Sie haben das Advanced-Menü aktiviert. 
 Dieses Menü enthält nützliche Funktionen zum Debuggen von Second Life.
 Drücken Sie in Windows Strg-Alt-D (Mac: Befehl-Opt-Umschalt-D) zum Ein- und Ausschalten dieses Menüs.
                 </message>
@@ -915,7 +896,7 @@ Beispiele für Formtexturen finden Sie in der Inventarbibliothek.
         </notify>
         <notify name="FirstMedia">
                 <message name="message">
-                        Sie haben die Medienwiedergabe gestartet.  Unter &apos;Audio und Video&apos; im Fenster &apos;Einstellungen&apos; können Sie festlegen, dass Medien automatisch wiedergegeben werden. Beachten Sie, dass dies bei nicht vertrauenswürdigen Medienseiten ein Sicherheitsrisiko darstellen kann.
+                        Sie haben die Medienwiedergabe gestartet.  Unter „Audio und Video“ im Fenster „Einstellungen“ können Sie festlegen, dass Medien automatisch wiedergegeben werden. Beachten Sie, dass dies bei nicht vertrauenswürdigen Medienseiten ein Sicherheitsrisiko darstellen kann.
                 </message>
         </notify>
         <notify name="MaxListSelectMessage">
@@ -927,7 +908,7 @@ von der Liste auswählen.
         <notify name="VoiceInviteP2P">
                 <message name="message">
                         [NAME] lädt Sie zu einem Voice-Chat ein. 
-Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Anrufer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -957,7 +938,7 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
         <notify name="VoiceInviteGroup">
                 <message name="message">
                         [NAME] ist einem Voice-Chat mit der Gruppe [GROUP] beigetreten. 
-Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Anrufer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Anrufer stumm zu schalten.
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -972,7 +953,7 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
         <notify name="VoiceInviteAdHoc">
                 <message name="message">
                         [NAME] ist einem Voice-Konferenz-Chat beigetreten. 
-Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Benutzer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Gespräch beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
                 </message>
                 <option name="Accept">
                         Akzeptieren
@@ -987,7 +968,7 @@ Klicken Sie auf &apos;Akzeptieren&apos;, um dem Gespräch beizutreten, oder auf
         <notify name="InviteAdHoc">
                 <message name="message">
                         [NAME] lädt Sie zu einem Konferenz-Chat ein. 
-Klicken Sie auf &apos;Akzeptieren&apos;, um dem Chat beizutreten, oder auf &apos;Ablehnen&apos;, um die Einladung auszuschlagen. Klicken Sie auf &apos;Stummschalten&apos;, um diesen Benutzer stumm zu schalten.
+Klicken Sie auf „Akzeptieren“, um dem Chat beizutreten, oder auf „Ablehnen“, um die Einladung auszuschlagen. Klicken Sie auf „Stummschalten“, um diesen Benutzer stumm zu schalten.
                 </message>
                 <option name="Accept">
                         Akzeptieren
diff --git a/linden/indra/newview/skins/default/xui/de/panel_avatar.xml b/linden/indra/newview/skins/default/xui/de/panel_avatar.xml
index 08f57a4..f7f58ea 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_avatar.xml
@@ -164,10 +164,10 @@ Die betreffende Person oder andere können sie nicht sehen.
         </tab_container>
         <button label="OK" label_selected="OK" name="OK"/>
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-        <button label="Hinauswerfen" label_selected="Hinauswerfen" name="Kick"/>
-        <button label="Einfrieren" label_selected="Einfrieren" name="Freeze" tool_tip="Bewegungen und Chat dieses Einwohners abschalten."/>
-        <button label="Auftauen" label_selected="Auftauen" name="Unfreeze" tool_tip="Einwohner auftauen"/>
-        <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Öffnet das Kundendiensttool für diesen Einwohner"/>
+        <button label="Hinauswerfen" label_selected="Hinauswerfen" name="Kick" font="SansSerifSmall" width="82" />
+        <button label="Einfrieren" label_selected="Einfrieren" name="Freeze" tool_tip="Bewegungen und Chat dieses Einwohners abschalten." width="82"/>
+        <button label="Auftauen" label_selected="Auftauen" name="Unfreeze" tool_tip="Einwohner auftauen" width="82" />
+        <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Öffnet das Kundendiensttool für diesen Einwohner" width="82"/>
         <string name="ShowOnMapNonFriend">
                 Position auf Karte zeigen.
 Deaktiviert, weil zwischen Ihnen
diff --git a/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml
index 237fe27..b8bd700 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_avatar_classified.xml
@@ -10,7 +10,7 @@
         <combo_box label="" name="classified_category_combo" />
         <check_box label="Ab 18" name="classified_mature_check">
                 <combo_item name="select_mature">
-                        - Jugendfreigabe wählen -
+                        - Jugendfreigabe -
                 </combo_item>
                 <combo_item name="mature">
                         Ab-18-Inhalt
diff --git a/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml
index 67a5c6e..f4aa8a2 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_chat_bar.xml
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
         <panel/>
         <button label="Lokaler Chat" name="History" tool_tip="Klicken Sie hier zur Anzeige des Gesprächs"/>
         <line_editor label="Zum Chatten hier klicken." name="Chat Editor" tool_tip="Eingabe für Sprechen, Strg-Eingabe für Rufen."/>
         <flyout_button label="Reden" name="Say" tool_tip="(Eingabe)">
+                <flyout_button_item name="shout_item">
+                        Rufen
+                </flyout_button_item>
                 <flyout_button_item name="say_item">
                         Reden
                 </flyout_button_item>
-                <flyout_button_item name="shout_item">
-                        Rufen
+                <flyout_button_item name="whisper_item">
+                        Flüstern
                 </flyout_button_item>
         </flyout_button>
         <combo_box label="Gesten" name="Gesture"/>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_friends.xml b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
index 5bf6a7d..bb2adb3 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -4,7 +4,7 @@
                 Mehrere Freunde...
         </string>
         <scroll_list name="friend_list"
-             tool_tip="Halten Sie die Tasten &apos;Umschalt&apos; oder &apos;Strg&apos; gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
+             tool_tip="Halten Sie die Tasten „Umschalt“ oder „Strg“ gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
                 <column name="icon_online_status" tool_tip="Online-Status" />
                 <column label="Name" name="friend_name" tool_tip="Name" />
                 <column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind" />
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_general.xml b/linden/indra/newview/skins/default/xui/de/panel_group_general.xml
index 0a32de2..1ecb304 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_tab">
-        <text name="help_text">
-                Die Registerkarte &apos;Allgemein&apos; enthält Informationen über
+        <string name="help_text">
+                Die Registerkarte „Allgemein“ enthält Informationen über
 diese Gruppe, eine Liste der Eigentümer und sichtbaren Mitglieder, 
 allgemeine Gruppeneinstellungen und Mitgliederoptionen.
 
 Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
-        </text>
+        </string>
         <string name="group_info_unchanged">
                 Die allgemeine Gruppeninfo wurde geändert.
         </string>
-        <button label="?" label_selected="?" name="help_button" />
-        <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor" />
+        <button label="?" label_selected="?" name="help_button"/>
+        <line_editor label="Neuen Gruppennamen hier eingeben" name="group_name_editor"/>
         <text name="group_name">
                 Neuen Gruppennamen hier eingeben
         </text>
         <text name="prepend_founded_by">
                 Gegründet von
         </text>
-        <text left_delta="80" name="founder_name">
+        <text name="founder_name" left_delta="79">
                 (wartet)
         </text>
         <text name="group_charter_label">
                 Gruppencharta
         </text>
-        <texture_picker label="Gruppeninsignien" name="insignia"
-             tool_tip="Klicken Sie hier, um ein Bild auszuwählen" />
+        <texture_picker label="Gruppeninsignien" name="insignia" tool_tip="Klicken Sie hier, um ein Bild auszuwählen"/>
         <text_editor name="charter">
                 Gruppencharta
         </text_editor>
-        <button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button" />
-        <button label="Detailansicht" label_selected="Detailansicht" name="info_button" />
+        <button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
+        <button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
         <text name="text_owners_and_visible_members">
                 Eigentümer und sichtbare Mitglieder
         </text>
@@ -38,37 +37,19 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.
                 (Eigentümer werden fettgedruckt angezeigt)
         </text>
         <name_list name="visible_members">
-                <column label="Member Name" name="name" />
-                <column label="Title" name="title" />
-                <column label="Last Login" name="online" />
+                <column label="Mitgliedsname" name="name" relwidth="0.40"/>
+                <column label="Titel" name="title" relwidth="0.25"/>
+                <column label="Letzte Anmeldung" name="online" relwidth="0.35"/>
         </name_list>
-        <text name="incomplete_member_data_str">
-                Mitgliedsdaten werden abgerufen
-        </text>
-        <text name="confirm_group_create_str">
-                Die Gründung dieser Gruppe kostet 100 L$. 
-Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
-Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
-        </text>
         <text name="text_group_preferences">
                 Gruppeneinstellungen
         </text>
         <panel name="preferences_container">
-                <check_box label="In Suche anzeigen" name="show_in_group_list"
-                     tool_tip="Diese Gruppe in Suchergebnissen anzeigen." />
-                <check_box label="Im Web veröffentlichen" name="publish_on_web"
-                     tool_tip="Festlegen, ob die Gruppeninformationen im Web veröffentlicht werden dürfen." />
-                <check_box label="Registrierung offen" name="open_enrollement"
-                     tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist." />
-                <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee"
-                     tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen."
-                     width="125" />
-                <spinner name="spin_enrollment_fee"
-                     tool_tip="Wenn &apos;Beitrittsgebühr&apos; aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen." />
-                <check_box label="Ab-18-Gruppe" name="mature"
-                     tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind." />
-                <combo_box name="group_mature_check"
-                     tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind.">
+                <check_box label="In Suche anzeigen" name="show_in_group_list" tool_tip="Diese Gruppe in Suchergebnissen anzeigen."/>
+                <check_box label="Registrierung offen" name="open_enrollement" tool_tip="Festlegen, ob der Gruppenbeitritt ohne Einladung zulässig ist."/>
+                <check_box label="Beitrittsgebühr: L$" name="check_enrollment_fee" tool_tip="Festlegen, ob Neumitglieder eine Beitrittsgebühr zahlen müssen." width="125"/>
+                <spinner name="spin_enrollment_fee" tool_tip="Wenn „Beitrittsgebühr“ aktiviert ist, müssen neue Mitglieder diesen Betrag zahlen."/>
+                <combo_box name="group_mature_check" tool_tip="Festlegen, ob die Informationen Ihrer Gruppe nicht jugendfrei sind.">
                         <combo_item name="select_mature">
                                 - Jugendfreigabe wählen -
                         </combo_item>
@@ -83,13 +64,17 @@ Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie
                         <text name="active_title_label">
                                 Mein aktiver Titel
                         </text>
-                        <combo_box name="active_title"
-                             tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
+                        <combo_box name="active_title" tool_tip="Legt fest, was im Namensschild Ihres Avatars angezeigt wird, wenn diese Gruppe aktiviert ist."/>
                 </panel>
-                <check_box label="Gruppenmitteilungen erhalten" name="receive_notices"
-                     tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten."
-                     width="173" />
-                <check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile"
-                     tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird" />
+                <check_box label="Gruppenmitteilungen erhalten" name="receive_notices" tool_tip="Festlegen, ob Sie von dieser Gruppe Mitteilungen erhalten können.  Deaktivieren Sie diese Option, wenn Sie von der Gruppe Spam erhalten." width="173"/>
+                <check_box label="Gruppe im Profil anzeigen" name="list_groups_in_profile" tool_tip="Steuert, ob diese Gruppe in Ihrem Profil angezeigt wird"/>
         </panel>
+        <string name="incomplete_member_data_str">
+                Mitgliedsdaten werden abgerufen
+        </string>
+        <string name="confirm_group_create_str">
+                Die Gründung dieser Gruppe kostet 100 L$. 
+Sind Sie wirklich, WIRKLICH sicher, dass Sie 100 L$ für die Gründung dieser Gruppe ausgeben möchten?
+Falls in den nächsten 48 Stunden niemand sonst dieser Gruppe beitritt, wird sie aufgelöst und der Name der Gruppe wird nicht mehr verfügbar sein.
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 0ad1aeb..96af8e3 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -3,7 +3,7 @@
         <text name="help_text">
                 Sie können mehrere Einwohner zu Ihrer
 Gruppe einladen. Klicken Sie auf
-&apos;Personenauswahl öffnen&apos;.
+„Personenauswahl öffnen“.
         </text>
         <button label="Personenauswahl öffnen" name="add_button" tool_tip="" />
         <name_list name="invitee_list"
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml
index cf11e3c..eee6c5c 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_land_money.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Land und L$" name="land_money_tab">
         <text name="help_text">
-                Es werden Parzellen in Gruppenbesitz und 
-Beitragsdetails angezeigt. Solange der Wert für &apos;Insgesamt
-verwendet Land&apos; unter oder gleich dem Wert für
-&apos;Gesamtbeitrag&apos; ist, wird eine Warnung angezeigt. Die Registerkarten &apos;Planung&apos;, &apos;Details&apos; und &apos;Verkäufe&apos;
-enthalten Informationen über die Gruppenfinanzen.
+                Es werden Parzellen in Gruppenbesitz und Beitragsdetails angezeigt. Ein Warnhinweis wird angezeigt, solange der Wert für das Insgesamt verwendete Land gleich oder weniger ist als der Gesamtbeitrag. Die Reiter „Details“ und „Verkäufe“ enthalten Informationen über die Gruppenfinanzen.
         </text>
         <button label="?" name="help_button" />
         <text name="cant_view_group_land_text">
@@ -21,9 +17,9 @@ enthalten Informationen über die Gruppenfinanzen.
                 Land in Gruppenbesitz
         </text>
         <scroll_list name="group_parcel_list">
-                <column label="Parcel Name" name="name" />
+                <column label="Parzellenname" name="name" />
                 <column label="Region" name="location" />
-                <column label="Area" name="area" />
+                <column label="Gebiet" name="area" />
                 <column label="" name="hidden" />
         </scroll_list>
         <button label="Auf Karte" label_selected="Auf Karte" name="map_button" />
@@ -55,10 +51,11 @@ enthalten Informationen über die Gruppenfinanzen.
                 Ihr Landbeitrag kann nicht festgelegt werden.
         </string>
         <text name="your_contribution_max_value">
-                Quadratmeter (max. [AMOUNT])
+                qm (max. [AMOUNT])
         </text>
         <text name="group_over_limit_text">
-                Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit das verwendete Land gehalten werden kann.
+                Die Gruppenmitglieder müssen mehr Landnutzungsrechte spenden, damit
+das verwendete Land gehalten werden kann.
         </text>
         <text name="group_money_heading">
                 Gruppen-L$
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml
index 56a384b..5189eea 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_notices.xml
@@ -6,7 +6,7 @@ Mitglieder auf dem Laufenden zu halten und
 Objekte im Anhang zu versenden. Mitteilungen werden
 nur an Mitglieder mit einer entsprechenden Rolle 
 gesendet. Mitteilungen können unter 
-&apos;Allgemein&apos; ausgeschaltet werden.
+„Allgemein“ ausgeschaltet werden.
         </text>
         <text name="no_notices_text">
                 Keine älteren Mitteilungen.
@@ -17,14 +17,14 @@ gesendet. Mitteilungen können unter
         </text>
         <text name="lbl2">
                 Mitteilungen werden 14 Tage lang aufbewahrt. Klicken Sie auf eine Mitteilung,
-um sie anzuzeigen. Klicken Sie auf &apos;Aktualisieren&apos;, um neue Mitteilungen zu suchen.
+um sie anzuzeigen. Klicken Sie auf „Aktualisieren“, um neue Mitteilungen zu suchen.
 Eine Mitteilungsliste speichert maximal 200 Mitteilungen pro Gruppe täglich.
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
-                <column label="Subject" name="subject" />
-                <column label="From" name="from" />
-                <column label="Date" name="date" />
+                <column label="Thema" name="subject" />
+                <column label="Von" name="from" />
+                <column label="Datum" name="date" />
         </scroll_list>
         <text name="notice_list_none_found">
                 Nicht gefunden.
@@ -63,7 +63,7 @@ und transferierbar sein. Ordner können nicht gesendet werden.
                         Archivierte Mitteilung
                 </text>
                 <text name="lbl2">
-                        Klicken Sie zum Senden einer Mitteilung auf &apos;Neue Mitteilung&apos;.
+                        Klicken Sie zum Senden einer Mitteilung auf „Neue Mitteilung“.
                 </text>
                 <text name="lbl3">
                         Betreff:
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml
index 9a478f1..f5671fc 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Mitglieder und Rollen" name="roles_tab">
-        <text name="default_needs_apply_text">
+        <string name="default_needs_apply_text">
                 Das Unterregister enthält nicht übernommene Änderungen.
-        </text>
-        <text name="want_apply_text">
+        </string>
+        <string name="want_apply_text">
                 Diese Änderungen übernehmen?
-        </text>
-        <text name="cant_delete_role">
-                Die Rollen &apos;Jeder&apos; und &apos;Eigentümer&apos; können nicht gelöscht werden.
-        </text>
-        <button label="?" name="help_button" />
+        </string>
+        <button label="?" name="help_button"/>
         <panel name="members_header">
                 <text name="static">
                         Mitglieder und Rollen
@@ -46,53 +43,53 @@ Mitglieder diese Fähigkeit haben.
                 </text>
         </panel>
         <tab_container name="roles_tab_container">
-                <panel label="Mitglieder" name="members_sub_tab" tool_tip="Members">
-                        <button label="Suchen" name="search_button" />
-                        <button label="Alle anzeigen" name="show_all_button" />
+                <panel label="Mitglieder" name="members_sub_tab" tool_tip="Mitglieder">
+                        <button label="Suchen" name="search_button"/>
+                        <button label="Alle anzeigen" name="show_all_button"/>
                         <name_list name="member_list">
-                                <column label="Member Name" name="name" />
-                                <column label="Donated Tier" name="donated" />
-                                <column label="Last Login" name="online" />
+                                <column label="Mitgliedsname" name="name" width="116"/>
+                                <column label="Ãœbertragene Landanteile" name="donated" width="156"/>
+                                <column label="Letzte Anmeldung" name="online"/>
                         </name_list>
-                        <button label="Neue Person einladen..." name="member_invite" />
-                        <button label="Aus Gruppe werfen" name="member_eject" />
-                        <text name="help_text">
+                        <button label="Neue Person einladen..." name="member_invite"/>
+                        <button label="Aus Gruppe werfen" name="member_eject"/>
+                        <string name="help_text">
                                 Sie können Mitgliedern Rollen zuweisen und entziehen.
 Drücken Sie die Strg-Taste und klicken Sie auf Namen,
 um mehrere Mitglieder auszuwählen.
-                        </text>
+                        </string>
                 </panel>
                 <panel label="Rollen" name="roles_sub_tab">
-                        <button label="Suchen" name="search_button" />
-                        <button label="Alle anzeigen" name="show_all_button" />
+                        <button label="Suchen" name="search_button"/>
+                        <button label="Alle anzeigen" name="show_all_button"/>
                         <scroll_list name="role_list">
-                                <column label="Role Name" name="name" />
-                                <column label="Title" name="title" />
-                                <column label="Members" name="members" />
+                                <column label="Rolle" name="name" width="126"/>
+                                <column label="Titel" name="title" width="180"/>
+                                <column label="Mitglieder" name="members" width="82"/>
                         </scroll_list>
-                        <button label="Neue Rolle erstellen..." name="role_create" />
-                        <button label="Rolle löschen" name="role_delete" />
-                        <text name="help_text">
+                        <button label="Neue Rolle erstellen..." name="role_create"/>
+                        <button label="Rolle löschen" name="role_delete"/>
+                        <string name="help_text">
                                 Rollen haben einen Titel und umfassen bestimmte
 Fähigkeiten. Mitglieder können mehrere 
 Rollen innehaben. Eine Gruppe kann bis zu 10 Rollen
-definieren, darunter &apos;Jeder&apos; und &apos;Eigentümer&apos;.
-                        </text>
+definieren, darunter „Jeder“ und „Eigentümer“.
+                        </string>
                         <string name="cant_delete_role">
-                                Die Rollen &apos;Jeder&apos; und &apos;Eigentümer&apos; können nicht gelöscht werden.
+                                Die Rollen „Jeder“ und „Eigentümer“ können nicht gelöscht werden.
                         </string>
                 </panel>
                 <panel label="Fähigkeiten" name="actions_sub_tab">
-                        <button label="Suchen" name="search_button" />
-                        <button label="Alle anzeigen" name="show_all_button" />
+                        <button label="Suchen" name="search_button"/>
+                        <button label="Alle anzeigen" name="show_all_button"/>
                         <scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
-                                <column label="" name="icon" />
-                                <column label="" name="action" />
+                                <column label="" name="icon"/>
+                                <column label="" name="action"/>
                         </scroll_list>
-                        <text name="help_text">
+                        <string name="help_text">
                                 Fähigkeiten verleihen Mitgliedern in Rollen bestimmte
 Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
-                        </text>
+                        </string>
                 </panel>
         </tab_container>
         <panel name="members_footer">
@@ -103,13 +100,12 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
                         Zulässige Fähigkeiten
                 </text>
                 <scroll_list name="member_assigned_roles">
-                        <column label="" name="checkbox" />
-                        <column label="" name="role" />
+                        <column label="" name="checkbox"/>
+                        <column label="" name="role"/>
                 </scroll_list>
-                <scroll_list name="member_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-                        <column label="" name="icon" />
-                        <column label="" name="action" />
+                <scroll_list name="member_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+                        <column label="" name="icon"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="roles_footer">
@@ -134,17 +130,14 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
                 <text name="static4">
                         Mitglieder in Rolle
                 </text>
-                <text name="static5"
-                     tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
+                <text name="static5" tool_tip="Eine Liste der Fähigkeiten der aktuell ausgewählten Rolle.">
                         Zulässige Fähigkeiten
                 </text>
-                <check_box label="Mitglieder sind sichtbar" name="role_visible_in_list"
-                     tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte &apos;Allgemein&apos; für Personen außerhalb der Gruppe sichtbar sind." />
-                <scroll_list name="role_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
-                        <column label="" name="icon" />
-                        <column label="" name="checkbox" />
-                        <column label="" name="action" />
+                <check_box label="Mitglieder sind sichtbar" name="role_visible_in_list" tool_tip="Festlegen, ob Mitglieder in dieser Rolle auf der Registerkarte „Allgemein“ für Personen außerhalb der Gruppe sichtbar sind."/>
+                <scroll_list name="role_allowed_actions" tool_tip="Um detaillierte Informationen zu erlaubten Fähigkeiten anzuzeigen, siehe Reiter Fähigkeiten.">
+                        <column label="" name="icon"/>
+                        <column label="" name="checkbox"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="actions_footer">
@@ -152,7 +145,7 @@ Rechte in einer Gruppe. Es gibt viele verschiedene Fähigkeiten.
                         Beschreibung
                 </text>
                 <text_editor name="action_description">
-                        Diese Fähigkeit heißt &apos;Mitglieder aus dieser Gruppe werfen&apos;. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
+                        Diese Fähigkeit heißt „Mitglieder aus dieser Gruppe werfen“. Eigentümer können nur von anderen Eigentümern hinausgeworfen werden.
                 </text_editor>
                 <text name="static2">
                         Rollen mit Fähigkeit
diff --git a/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml
index 1f4480d..e49e7ed 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_group_voting.xml
@@ -19,7 +19,7 @@ erstellen, darüber abstimmen und alte Anfragen anzeigen.
         </text>
         <text name="proposals_header_view_inst">
                 Doppelklicken Sie auf die Anfrage, für die Sie abstimmen möchten,
-oder klicken Sie auf &apos;Neue Anfrage&apos;, um eine neue zu erstellen.
+oder klicken Sie auf „Neue Anfrage“, um eine neue zu erstellen.
         </text>
         <text name="proposals_header_create_txt">
                 Neue Anfrage
@@ -32,7 +32,7 @@ Quorum, die Dauer und die erforderliche Mehrheit angeben.
                 Abstimmung
         </text>
         <text name="proposals_header_vote_inst">
-                Klicken Sie zum Abstimmen auf &apos;Ja&apos; oder &apos;Nein&apos; oder
+                Klicken Sie zum Abstimmen auf „Ja“ oder „Nein“ oder
 enthalten Sie sich der Stimme.
         </text>
         <text name="proposals_header_voted_inst">
@@ -42,7 +42,7 @@ enthalten Sie sich der Stimme.
                 Das Angebot, das Sie erstellen möchten, enthält keine Angaben.  Füllen Sie das Angebot aus, bevor Sie es erstellen.
         </text>
         <text name="proposal_instructions">
-                Doppelklicken Sie zum Abstimmen auf eine Anfrage oder klicken Sie auf &apos;Neue Anfrage&apos;, um eine neue zu erstellen.
+                Doppelklicken Sie zum Abstimmen auf eine Anfrage oder klicken Sie auf „Neue Anfrage“, um eine neue zu erstellen.
         </text>
         <text name="proposal_lbl">
                 Beschreibung der Anfrage
@@ -89,7 +89,7 @@ enthalten Sie sich der Stimme.
         </text>
         <text name="instructions">
                 Doppelklicken Sie auf eine alte Abstimmung oder wählen Sie eine aus und
-klicken Sie für das Ergebnis auf &apos;Objekt anzeigen&apos;.
+klicken Sie für das Ergebnis auf „Objekt anzeigen“.
         </text>
         <text name="history_list_lbl">
                 Alte Abstimmung                                            Ende der Abstimmung
@@ -102,10 +102,10 @@ klicken Sie für das Ergebnis auf &apos;Objekt anzeigen&apos;.
         <button label="Liste anzeigen" label_selected="Liste anzeigen"
              name="btn_view_history_list" />
         <text name="proposals_submit_yes_txt">
-                Mit &apos;Ja&apos; abgestimmt...
+                Mit „Ja“ abgestimmt...
         </text>
         <text name="proposals_submit_no_txt">
-                Mit &apos;Nein&apos; abgestimmt...
+                Mit „Nein“ abgestimmt...
         </text>
         <text name="proposals_submit_abstain_txt">
                 Enthaltung...
diff --git a/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
index 3ef7102..0ff66f7 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
@@ -17,10 +17,10 @@
                 (URL von Parzelleneigentümer versteckt)
         </string>
         <string name="media_icon_tooltip_web">
-                An diesem Ort werden Inhalte aus dem World Wide Web wiedergegeben. Klicken Sie auf &apos;Wiedergeben&apos;, um Webinhalte wiederzugeben.
+                An diesem Ort werden Inhalte aus dem World Wide Web wiedergegeben. Klicken Sie auf „Wiedergeben“, um Webinhalte wiederzugeben.
         </string>
         <string name="media_icon_tooltip_movie">
-                An diesem Ort werden Videoinhalte wiedergegeben. Klicken Sie auf &apos;Wiedergeben&apos;, um das Video abzuspielen.
+                An diesem Ort werden Videoinhalte wiedergegeben. Klicken Sie auf „Wiedergeben“, um das Video abzuspielen.
         </string>
         <string name="media_play_tooltip">
                 Webinhalt an diesem Ort anzeigen.
diff --git a/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml
index 41f6ea0..eff19eb 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_overlaybar.xml
@@ -6,8 +6,8 @@
                                 <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." />
-                                        <button label="Als nicht beschäftigt anzeigen" 
-                                             label_selected="Als nicht beschäftigt anzeigen" name="Set Not Busy" font="SansSerifSmall"
+                                        <button label="Beschäftigt aus" 
+                                             label_selected="Beschäftigt aus" name="Set Not Busy" font="SansSerifSmall"
                                              tool_tip="Chat und IM sind ausgeblendet. Klicken Sie hier, um den Beschäftigt-Modus zu verlassen." />
                                         <button label="Tasten freigeben" label_selected="Tasten freigeben" name="Release Keys" font="SansSerifSmall"
                                              tool_tip="Ein Skript hat die Steuerung übernommen. Klicken Sie hier, um die Steuerung wieder freizugeben." />
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 88fbfd4..feeb528 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -3,7 +3,7 @@
         <text length="1" name="text_box" type="string">
                 Chat-Schriftgröße:
         </text>
-        <radio_group name="chat font size">
+        <radio_group name="chat_font_size">
                 <radio_item length="1" name="radio" type="string">
                         Klein
                 </radio_item>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index fbf5742..3365c5c 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Allgemein" name="general_panel">
-        <combo_box name="location_combobox">
-                <combo_item name="MyHome">
+        <radio_group name="default_start_location">
+                <radio_item name="MyHome" tool_tip="Als Standardeinstellung in Zuhauseposition anmelden.">
                         Mein Heimatort
-                </combo_item>
-                <combo_item name="MyLastLocation">
-                        Mein letzter Standort
-                </combo_item>
-        </combo_box>
-        <check_box label="Startposition auf Anmeldebildschirm anzeigen"
-             name="show_location_checkbox" />
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        Nie
                 </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        Temporär anzeigen
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        Immer
+                <radio_item name="MyLastLocation" tool_tip="Als Standardeinstellung in letztem Standort anmelden.">
+                        Mein letzter Standort
                 </radio_item>
         </radio_group>
+        <check_box label="Startposition auf Anmeldebildschirm anzeigen" name="show_location_checkbox"/>
         <combo_box name="fade_out_combobox">
                 <combo_item name="Never">
                         Nie
@@ -32,93 +20,95 @@
                         Immer
                 </combo_item>
         </combo_box>
-        <check_box label="Meinen Namen auf meinem Bildschirm ausblenden"
-             name="show_my_name_checkbox" />
+        <check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>
+        <check_box label="Meinen Namen auf meinem Bildschirm ausblenden" name="show_my_name_checkbox"/>
         <text name="group_titles_textbox">
                 Gruppentitel:
         </text>
-        <check_box label="Alle Gruppentitel ausblenden" name="show_all_title_checkbox" />
-        <check_box label="Meinen Gruppentitel ausblenden" name="show_my_title_checkbox" />
-        <check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox" />
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+        <check_box label="Alle Gruppentitel ausblenden" name="show_all_title_checkbox"/>
+        <check_box label="Meinen Gruppentitel ausblenden" name="show_my_title_checkbox"/>
+        <color_swatch label="" name="effect_color_swatch" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen"/>
         <text name="UI Size:">
                 UI-Größe:
         </text>
-        <check_box label="Auflösungsunabhängigen Maßstab verwenden" name="ui_auto_scale" />
-        <spinner label="Timeout für Abwesenheit:" name="afk_timeout_spinner" />
-        <check_box label="Online-Freundbenachrichtigungen anzeigen"
-             name="friends_online_notify_checkbox" />
-        <check_box label="Minikarte drehen" name="rotate_mini_map_checkbox" />
-        <check_box label="L$ Eingänge und Ausgaben melden" name="notify_money_change_checkbox" />
-        <check_box label="Standard-Farbauswahl verwenden" name="use_system_color_picker_checkbox"
-             tool_tip="Standard-Farbauswahl des Systems anstelle des Second Life-eigenen verwenden." />
-        <check_box label="Suchleiste in Menüleiste anzeigen" name="show_search_panel"
-             tool_tip="Die eingebettete Suchleiste anzeigen." />
-        <text type="string" length="1" name="start_location_textbox">
+        <check_box label="Auflösungsunabhängigen Maßstab verwenden" name="ui_auto_scale"/>
+        <spinner label="Timeout für Abwesenheit:" name="afk_timeout_spinner"/>
+        <check_box label="Minikarte drehen" name="rotate_mini_map_checkbox"/>
+        <check_box label="L$ Eingänge und Ausgaben melden" name="notify_money_change_checkbox"/>
+        <check_box label="Standard-Farbauswahl verwenden" name="use_system_color_picker_checkbox" tool_tip="Standard-Farbauswahl des Systems anstelle des Second Life-eigenen verwenden."/>
+        <check_box label="Suchleiste in Menüleiste anzeigen" name="show_search_panel" tool_tip="Die eingebettete Suchleiste anzeigen."/>
+        <text name="start_location_textbox">
                 Startposition:
         </text>
-        <text type="string" length="1" name="show_names_textbox">
+        <text name="show_names_textbox">
                 Namen anzeigen:
         </text>
-        <text type="string" length="1" name="effects_color_textbox">
+        <text name="effects_color_textbox">
                 Farbe für meine Effekte:
         </text>
-        <text type="string" length="1" name="seconds_textbox">
+        <text name="seconds_textbox">
                 Sekunden
         </text>
-        <text type="string" length="1" name="crash_report_textbox">
+        <text name="crash_report_textbox">
                 Crash-Berichte:
         </text>
-        <text type="string" length="1" name="language_textbox">
+        <text name="language_textbox">
                 Sprache:
         </text>
-        <text type="string" length="1" name="language_textbox2">
+        <text name="language_textbox2">
                 (Erfordert Neustart)
         </text>
-        <text name="region_name_prompt">
+        <string name="region_name_prompt">
                 &lt;Region eingeben&gt;
-        </text>
+        </string>
         <combo_box name="crash_behavior_combobox">
-                <combo_item type="string" length="1" name="Askbeforesending">
+                <combo_item name="Askbeforesending">
                         Vor dem Senden fragen
                 </combo_item>
-                <combo_item type="string" length="1" name="Alwayssend">
+                <combo_item name="Alwayssend">
                         Immer senden
                 </combo_item>
-                <combo_item type="string" length="1" name="Neversend">
+                <combo_item name="Neversend">
                         Nie senden
                 </combo_item>
         </combo_box>
         <combo_box name="language_combobox">
-                <combo_item type="string" length="1" name="System Default Language">
+                <combo_item name="System Default Language">
                         Betriebssystem-Einstellung
                 </combo_item>
-                <combo_item type="string" length="1" name="English">
+                <combo_item name="English">
                         English (Englisch)
                 </combo_item>
-                <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (Chinesisch) - Beta
+                <combo_item name="Danish">
+                        Danks (Dänisch) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="Deutsch(German)">
+                <combo_item name="Deutsch(German)">
                         Deutsch - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="French">
+                <combo_item name="Spanish">
+                        Español (Spanisch) - Beta
+                </combo_item>
+                <combo_item name="French">
                         Français (Französisch) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanisch) - Beta
+                <combo_item name="Hungarian">
+                        Magyar (Ungarisch) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Koreanisch) - Beta
+                <combo_item name="Polish">
+                        Polski (Polnisch) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="Portugese">
+                <combo_item name="Portugese">
                         Português (Portugiesisch) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" name="Spanish">
-                        Español (Spanisch) - Beta
+                <combo_item name="Chinese">
+                        中文 (简体) (Chinesisch) - Beta
+                </combo_item>
+                <combo_item name="(Japanese)">
+                        日本語 (Japanisch) - Beta
+                </combo_item>
+                <combo_item name="(Korean)">
+                        한국어 (Koreanisch) - Beta
                 </combo_item>
         </combo_box>
-        <check_box label="Objekten Sprache mitteilen" name="language_is_public"
-             tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt." />
+        <check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml
index 0744495..0e760e6 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_im.xml
@@ -15,10 +15,8 @@
         <check_box label="Zeitstempel in IM anzeigen" name="show_timestamps_check"/>
         <check_box label="Online-Freundbenachrichtigungen anzeigen" name="friends_online_notify_checkbox"/>
         <text length="1" name="text_box3" type="string">
-                Protokolloptionen:
-        </text>
-        <text length="1" name="text_box3" type="string">
-                Protokolloptionen:
+                Antwort für 
+Beschäftigt-Modus:
         </text>
         <text name="text_box4">
                 Protokolloptionen:
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml
index 5d57975..5bb83ad 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_input.xml
@@ -6,11 +6,11 @@
         <text length="1" name=" Mouse Sensitivity:" type="string">
                 Mausempfindlichkeit:
         </text>
-        <check_box label="Maus umkehren" name="invert mouse"/>
+        <check_box label="Maus umkehren" name="invert_mouse"/>
         <text length="1" name=" Auto Fly Options:" type="string">
                 Auto-Flug-Optionen:
         </text>
-        <check_box label="Zum Fliegen/Landen nach oben/unten halten" name="automatic fly"/>
+        <check_box label="Zum Fliegen/Landen nach oben/unten halten" name="automatic_fly"/>
         <text length="1" name=" Camera Options:" type="string">
                 Kameraoptionen:
         </text>
@@ -26,14 +26,14 @@
         <text name="Camera Smoothing:">
                 Bewegungsglättung:
         </text>
-        <check_box label="Automatischer Kameraschwenk im Bearbeiten-Modus" name="edit camera movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
-        <check_box label="Automatischer Kameraschwenk im Aussehen-Modus" name="appearance camera movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
+        <check_box label="Automatischer Kameraschwenk im Bearbeiten-Modus" name="edit_camera_movement" tool_tip="Automatische Kamerapositionierung bei Wechsel in und aus dem Bearbeitungsmodus verwenden"/>
+        <check_box label="Automatischer Kameraschwenk im Aussehen-Modus" name="appearance_camera_movement" tool_tip="Automatische Kamerapositionierung im Bearbeitenmodus verwenden"/>
         <text name="text2">
                 Avatar-Anzeigeoptionen:
         </text>
-        <check_box label="Avatar in Mouselook anzeigen" name="avfp"/>
+        <check_box label="Avatar in Mouselook anzeigen" name="first_person_avatar_visible"/>
         <text name="text5">
                 Joystick-Optionen:
         </text>
-        <button label="Joystick-Einrichtung" name="joystic_setup_button"/>
+        <button label="Joystick-Einrichtung" name="joystick_setup_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml
index efd797b..4878ab1 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_network.xml
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Netzwerk" name="network">
-        <text type="string" length="1" name="text_box">
+        <text name="text_box">
                 Maximale Bandbreite:
         </text>
-        <text type="string" length="1" name="text_box2">
+        <text name="text_box2">
                 kbit/s (Kilobit pro Sekunde)
         </text>
-        <text type="string" length="1" name="cache_size_label_l">
+        <text name="cache_size_label_l">
                 Größe Festplatten-Cache:
         </text>
-        <button label="Cache leeren" name="clear_cache" />
-        <text type="string" length="1" name="cache_location_label">
+        <text name="text_box5">
+                MB
+        </text>
+        <button label="Cache leeren" name="clear_cache"/>
+        <text name="cache_location_label">
                 Festplatten-Cache-Verzeichnis:
         </text>
-        <button label="Festlegen" label_selected="Festlegen" name="set_cache" />
-        <button label="Zurücksetzen" label_selected="Festlegen" name="reset_cache" />
-        <check_box label="Benutzerdefinierter Port" name="connection_port_enabled" />
-        <spinner label="Port-Nummer:" name="connection_port" />
+        <button label="Festlegen" label_selected="Festlegen" name="set_cache"/>
+        <button label="Zurücksetzen" label_selected="Festlegen" name="reset_cache"/>
+        <check_box label="Benutzerdefinierter Port" name="connection_port_enabled"/>
+        <spinner label="Port-Nummer:" name="connection_port"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
index a9c7edb..eca6fe9 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_popups.xml
@@ -18,7 +18,7 @@
         </text>
         <check_box label="Automatisch annehmen" name="accept_new_inventory"/>
         <check_box label="Nach Annahme automatisch anzeigen" name="show_new_inventory"/>
-        <button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und &apos;Das erste Mal&apos;-Meldungen aktivieren."/>
-        <button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und &apos;Das erste Mal&apos;-Meldungen deaktivieren."/>
+        <button width="200" label="Alle Popups aktivieren..." name="reset_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen aktivieren."/>
+        <button width="200" label="Alle diese Popups deaktivieren..." name="skip_dialogs_btn" tool_tip="Alle optionalen Popups und „Das erste Mal“-Meldungen deaktivieren."/>
         <check_box label="Neue Objekte im Inventar automatisch anzeigen" name="show_in_inventory"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
index dfe080d..d87b93c 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Voice-Chat" name="chat">
         <text_editor name="voice_unavailable">
                 Voice-Chat ist nicht verfügbar
         </text_editor>
-        <check_box label="Voice-Chat aktivieren" name="enable_voice_check" />
+        <check_box label="Voice-Chat aktivieren" name="enable_voice_check"/>
         <radio_group name="ear_location">
                 <radio_item name="0">
                         Voice-Chat von Kameraposition aus hören.
@@ -15,26 +15,23 @@
         <text name="push_to_talk_heading">
                 Zum Sprechen drücken
         </text>
-        <text_editor name="voice_chat_description">
-                HINWEIS: Beim Öffnen der Geräte-Einstellungen oder der Voice-Chat-Einrichtung werden Sie vorübergehend vom Voice-Chat getrennt.
+        <text_editor name="voice_chat_description" width="465" height="81" bottom_delta="-76">
+                Der Modus „Zum Sprechen drücken“ ermöglicht es Ihnen, zu kontrollieren, wann Ihre Stimme übertragen wird. Wenn Sie im Umschaltmodus sind, drücken Sie die Auslöse-Taste und lassen Sie sie wieder los, um Ihr Mikrofon an und aus zu stellen. Wenn Sie sich nicht im Umschaltmodus befinden, ist das Mikro nur aktiv, während Sie die Auslösetaste gedrückt halten.
         </text_editor>
-        <check_box label="Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten"
-             name="push_to_talk_check" />
-        <check_box label="&apos;Zum-Sprechen-drücken&apos; im Umschaltmodus verwenden"
-             name="push_to_talk_toggle_check" />
+        <check_box label="Viewer im „Zum-Sprechen-drücken“-Modus starten" name="push_to_talk_check"/>
+        <check_box label="„Zum-Sprechen-drücken“ im Umschaltmodus verwenden" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label">
-                Auslöser für &apos;Zum-Sprechen-drücken&apos;:
+                Auslöser für „Zum-Sprechen-drücken“:
         </text>
-        <button label="Taste festlegen" name="set_voice_hotkey_button" />
-        <button label="Mittlere Maustaste" name="set_voice_middlemouse_button" />
+        <button label="Taste festlegen" name="set_voice_hotkey_button"/>
+        <button label="Mittlere Maustaste" name="set_voice_middlemouse_button"/>
         <text name="privacy_heading">
                 Privatsphäre
         </text>
-        <check_box label="Anrufe nur von Personen auf meiner Freundesliste annehmen"
-             name="voice_call_friends_only_check" />
+        <check_box label="Anrufe nur von Personen auf meiner Freundesliste annehmen" name="voice_call_friends_only_check"/>
         <text_editor name="device_settings_text">
-                HINWEIS: Beim Öffnen der Geräte-Einstellungen werden Sie vorübergehend vom Voice-Chat getrennt.
+                HINWEIS: Beim Öffnen der Geräte-Einstellungen werden Sie vorübergehend vom Voice-Chat getrennt. Vorgenommene Änderungen werden sofort gültig.
         </text_editor>
-        <button label="Geräte-Einstellungen" name="device_settings_btn" />
-        <button label="Voice-Chat-Einrichtung" name="launch_voice_wizard_button" />
+        <button label="Geräte-Einstellungen" name="device_settings_btn"/>
+        <button label="Voice-Chat-Einrichtung" name="launch_voice_wizard_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml
index 7d6b1ff..9e03ebe 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Debug" name="Debug">
         <text name="region_text_lbl">
                 Region:
@@ -6,42 +6,35 @@
         <text name="region_text">
                 unbekannt
         </text>
-        <check_box label="Skripts deaktivieren" name="disable_scripts_check"
-             tool_tip="Skripts in dieser Region deaktivieren" />
-        <button label="?" name="disable_scripts_help" />
-        <check_box label="Kollisionen deaktivieren" name="disable_collisions_check"
-             tool_tip="Nicht-Avatar-Kollisionen in dieser Region deaktivieren" />
-        <button label="?" name="disable_collisions_help" />
-        <check_box label="Physik deaktivieren" name="disable_physics_check"
-             tool_tip="Physik in dieser Region deaktivieren" />
-        <button label="?" name="disable_physics_help" />
-        <button label="Ãœbernehmen" name="apply_btn" />
+        <check_box label="Skripts deaktivieren" name="disable_scripts_check" tool_tip="Skripts in dieser Region deaktivieren"/>
+        <button label="?" name="disable_scripts_help"/>
+        <check_box label="Kollisionen deaktivieren" name="disable_collisions_check" tool_tip="Nicht-Avatar-Kollisionen in dieser Region deaktivieren"/>
+        <button label="?" name="disable_collisions_help"/>
+        <check_box label="Physik deaktivieren" name="disable_physics_check" tool_tip="Physik in dieser Region deaktivieren"/>
+        <button label="?" name="disable_physics_help"/>
+        <button label="Ãœbernehmen" name="apply_btn"/>
+        <text name="objret_text_lbl" width="105">
+                Objekt zurückgeben
+        </text>
+        <text name="resident_text_lbl">
+                Einwohner:
+        </text>
         <line_editor name="target_avatar_name">
                 (keiner)
         </line_editor>
-        <button label="Auswählen..." name="choose_avatar_btn" />
-        <button label="Skriptobjekte des Avatars auf fremdem Land zurückgeben"
-             name="return_scripted_other_land_btn" />
-        <button label="ALLE Skriptobjekte des Avatars zurückgeben"
-             name="return_scripted_all_btn" />
-        <check_box label="Nur Objekte mit Skripten zurückgeben" name="return_scripts"
-             tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen." />
-        <check_box label="Nur Objekte auf dem Land eines anderen Einwohners zurückgeben"
-             name="return_other_land"
-             tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden" />
-        <check_box label="Objekte in jeder Region dieses Grundstücks zurückgeben"
-             name="return_estate_wide"
-             tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben" />
-        <button label="Zurückgeben" name="return_btn" width="90" />
-        <button label="Top-Kollisionsobjekte..." name="top_colliders_btn"
-             tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen" />
-        <button label="?" name="top_colliders_help" />
-        <button label="Top-Skripts..." name="top_scripts_btn"
-             tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen um Skripts auszuführen." />
-        <button label="?" name="top_scripts_help" />
-        <button label="Region neu starten" name="restart_btn"
-             tool_tip="2-Minuten-Countdown und Region neu starten" />
-        <button label="?" name="restart_help" />
-        <button label="Neustart verzögern" name="cancel_restart_btn"
-             tool_tip="Regionsneustart um eine Stunde verschieben" />
+        <button label="Auswählen..." name="choose_avatar_btn"/>
+        <text name="options_text_lbl">
+                Optionen:
+        </text>
+        <check_box label="Nur Objekte mit Skripten zurückgeben" name="return_scripts" tool_tip="Es werden nur die Objekte zurückgegeben, die über Skripte verfügen."/>
+        <check_box label="Nur Objekte auf dem Land eines anderen Einwohners zurückgeben" name="return_other_land" tool_tip="Es werden nur die Objekte zurückgegeben, die sich auf dem Land eines anderen Einwohners befinden"/>
+        <check_box label="Objekte in jeder Region dieses Grundstücks zurückgeben" name="return_estate_wide" tool_tip="Es werden die Objekte in allen Regionen dieses Grundstücks zurückgegeben"/>
+        <button label="Zurückgeben" name="return_btn" width="90"/>
+        <button label="Top-Kollisionsobjekte..." name="top_colliders_btn" tool_tip="Liste der Objekte mit den meisten potenziellen Kollisionen"/>
+        <button label="?" name="top_colliders_help"/>
+        <button label="Top-Skripts..." name="top_scripts_btn" tool_tip="Zeigt eine Liste der Objekte an, die die meiste Zeit benötigen, um Skripts auszuführen."/>
+        <button label="?" name="top_scripts_help"/>
+        <button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/>
+        <button label="?" name="restart_help"/>
+        <button label="Neustart verzögern" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
index 625f6ab..ddc5941 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Grundstück" name="Estate">
         <text name="estate_help_text">
-                Änderungen auf dieser Registerkarte wirken sich auf alle Regionen auf dem Grundstück aus.
+                Änderungen auf dieser Registerkarte wirken sich
+auf alle Regionen auf dem Grundstück aus.
         </text>
         <text name="estate_text">
                 Grundstück:
diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index d0c3460..adfe387 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-        <text type="string" length="1" name="ParcelNameText"
-             tool_tip="Der Name der Parzelle, auf der Sie sich befinden. Klicken Sie für Land-Informationen.">
+        <text length="1" name="ParcelNameText" tool_tip="Der Name der Parzelle, auf der Sie sich befinden. Klicken Sie für Land-Informationen." type="string">
                 Parzellenname hier
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="Kontostand">
+        <text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
                 Wird geladen...
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen" />
-        <text type="string" length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)">
+        <button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+        <text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
                 12:00
         </text>
         <text name="StatBarDaysOfWeek">
@@ -17,29 +16,27 @@
         <text name="StatBarMonthsOfYear">
                 Januar:Februar:März:April:Mai:Juni:Juli:August:September:Oktober:November:Dezember
         </text>
-        <button label="" label_selected="" name="scriptout"
-             tool_tip="Skriptwarnungen und -fehler" />
-        <button label="" label_selected="" name="health" tool_tip="Gesundheit" />
-        <text type="string" length="1" name="HealthText" tool_tip="Gesundheit">
+        <button label="" label_selected="" name="scriptout" tool_tip="Skriptwarnungen und -fehler"/>
+        <button label="" label_selected="" name="health" tool_tip="Gesundheit"/>
+        <text length="1" name="HealthText" tool_tip="Gesundheit" type="string">
                 100%
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="Fliegen aus" />
-        <button label="" label_selected="" name="build" tool_tip="Bauen aus" />
-        <button label="" label_selected="" name="scripts" tool_tip="Skripts aus" />
-        <button name="no_fly" tool_tip="Fliegen ist unzulässig" />
-        <button name="no_build" tool_tip="Bauen/Rezzen ist unzulässig" />
-        <button name="no_scripts" tool_tip="Skripte sind unzulässig" />
-        <button label="" label_selected="" name="restrictpush"
-             tool_tip="llPushObject beschränkt" />
-        <button name="status_voice" tool_tip="Voice aktiviert" />
-        <button name="status_no_voice" tool_tip="Voice hier nicht möglich" />
-        <button label="" label_selected="" name="buyland" tool_tip="Diese Parzelle kaufen" />
+        <button label="" label_selected="" name="fly" tool_tip="Fliegen aus"/>
+        <button label="" label_selected="" name="build" tool_tip="Bauen aus"/>
+        <button label="" label_selected="" name="scripts" tool_tip="Skripts aus"/>
+        <button name="no_fly" tool_tip="Fliegen ist unzulässig"/>
+        <button name="no_build" tool_tip="Bauen/Rezzen ist unzulässig"/>
+        <button name="no_scripts" tool_tip="Skripte sind unzulässig"/>
+        <button label="" label_selected="" name="restrictpush" tool_tip="Kein Stoßen"/>
+        <button name="status_voice" tool_tip="Voice aktiviert"/>
+        <button name="status_no_voice" tool_tip="Voice hier nicht möglich"/>
+        <button label="" label_selected="" name="buyland" tool_tip="Diese Parzelle kaufen"/>
         <text name="packet_loss_tooltip">
                 Paketverlust
         </text>
         <text name="bandwidth_tooltip">
                 Bandbreite
         </text>
-        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen" />
-        <button name="search_btn" tool_tip="Second Life durchsuchen" />
+        <line_editor label="Suchen" name="search_editor" tool_tip="Second Life durchsuchen"/>
+        <button name="search_btn" tool_tip="Second Life durchsuchen"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
index eb3b499..9952f34 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="voice_controls">
+        <!-- WARNING: separate formatting and translations of these same strings (for using the Silver skin) is controlled by a different file in \skins\silver\xui\de\panel_voice_controls.xml You must make changes to translations in both files.-->
         <button name="speakers_btn"
              tool_tip="Liste der Einwohner in der Umgebung anzeigen, die Voice-Chat verwenden" />
         <button label="Reden" name="push_to_talk" 
              tool_tip="Zum Sprechen Taste gedrückt halten" width="70" left_delta="37"/>
         <button name="ptt_lock"
              tool_tip="Klicken Sie auf das Schloss, um in den Gesprächsmodus zu wechseln" left_delta="2"/>
-        <icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="49"
-             name="voice_volume" width="16" />
+        <icon left_delta="49" name="voice_volume" width="16" />
         <button name="show_channel" tool_tip="Klicken, um den aktuellen Voice-Kanal anzuzeigen" left_delta="16"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
index 1c65712..7390f54 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
@@ -15,9 +15,9 @@
                 </radio_item>
         </radio_group>
         <text_editor name="voice_intro_text3">
-                Sie können den Voice-Chat jederzeit in den Einstellungen auf der Registerkarte &apos;Voice-Chat&apos; aktivieren.
+                Sie können den Voice-Chat jederzeit in den Einstellungen auf der Registerkarte „Voice-Chat“ aktivieren.
         </text_editor>
         <text_editor name="voice_intro_text4">
-                Klicken Sie auf &apos;Weiter&apos;, um den Voice-Chat jetzt zu konfigurieren oder klicken Sie auf &apos;Fertig stellen&apos;, um zu Second Life zu wechseln.
+                Klicken Sie auf „Weiter“, um den Voice-Chat jetzt zu konfigurieren oder klicken Sie auf „Fertig stellen“, um zu Second Life zu wechseln.
         </text_editor>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
index d64927e..d2040d3 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
@@ -12,12 +12,12 @@
                 </radio_item>
         </radio_group>
         <check_box label="Voice-Anrufe nur meinen Freunden erlauben" name="friends_only_check" />
-        <check_box label="Viewer im &apos;Zum-Sprechen-drücken&apos;-Modus starten"
+        <check_box label="Viewer im „Zum-Sprechen-drücken“-Modus starten"
              name="push_to_talk_check" />
-        <check_box label="&apos;Zum-Sprechen-drücken&apos; im Umschaltmodus verwenden"
+        <check_box label="„Zum-Sprechen-drücken“ im Umschaltmodus verwenden"
              name="push_to_talk_toggle_check" />
         <text name="push_to_talk_label">
-                Auslöser für &apos;Zum-Sprechen-drücken&apos;:
+                Auslöser für „Zum-Sprechen-drücken“:
         </text>
         <button label="Taste festlegen" name="set_voice_hotkey_button" />
         <button label="Mittlere Maustaste" name="set_voice_middlemouse_button" />
diff --git a/linden/indra/newview/skins/default/xui/de/role_actions.xml b/linden/indra/newview/skins/default/xui/de/role_actions.xml
index 26042bd..95eb6c5 100644
--- a/linden/indra/newview/skins/default/xui/de/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/de/role_actions.xml
@@ -4,157 +4,157 @@
              description="Diese Fähigkeiten ermöglichen das Hinzufügen und Entfernen von Mitgliedern sowie den Beitritt ohne Einladung."
              name="Membership">
                 <action description="Personen in diese Gruppe einladen"
-                     longdescription="Personen zu dieser Gruppe einladen können Sie mit &apos;Neue Person einladen...&apos; unter &apos;Mitglieder und Rollen&apos; &gt; &apos;Mitglieder&apos;."
+                     longdescription="Personen zu dieser Gruppe einladen können Sie mit „Neue Person einladen...“ unter „Mitglieder und Rollen“ &gt; „Mitglieder“."
                      name="member invite" />
                 <action description="Mitglieder aus dieser Gruppe werfen"
-                     longdescription="Mitglieder von der Gruppe ausschließen können Sie mit &apos;Aus Gruppe werfen&apos; unter &apos;Mitglieder und Rollen&apos; &gt; &apos;Mitglieder&apos;. Ein Eigentümer kann jeden, außer einen anderen Eigentümer, ausschließen. Wenn Sie kein Eigentümer sind, können Sie ein Mitglied nur dann von der Gruppe ausschließen, wenn es die Rolle &apos;Jeder&apos; innehat, aber KEINE ANDERE Rolle. Um Mitgliedern Rollen entziehen zu können, müssen Sie über die Fähigkeit &apos;Mitgliedern Rollen entziehen&apos; verfügen."
+                     longdescription="Mitglieder von der Gruppe ausschließen können Sie mit „Aus Gruppe werfen“ unter „Mitglieder und Rollen“ &gt; „Mitglieder“. Ein Eigentümer kann jeden, außer einen anderen Eigentümer, ausschließen. Wenn Sie kein Eigentümer sind, können Sie ein Mitglied nur dann von der Gruppe ausschließen, wenn es die Rolle „Jeder“ innehat, aber KEINE ANDERE Rolle. Um Mitgliedern Rollen entziehen zu können, müssen Sie über die Fähigkeit „Mitgliedern Rollen entziehen“ verfügen."
                      name="member eject" />
                 <action
-                     description="&apos;Registrierung offen&apos; einstellen und &apos;Beitrittsgebühr&apos; ändern"
-                     longdescription="&apos;Beitritt möglich&apos; erlaubt den Beitritt zur Gruppe ohne vorhergehende Einladung. Die &apos;Beitrittsgebühr&apos; wird in den Gruppeneinstellungen auf der Registerkarte &apos;Allgemein&apos; festgelegt."
+                     description="„Registrierung offen“ einstellen und „Beitrittsgebühr“ ändern"
+                     longdescription="„Beitritt möglich“ erlaubt den Beitritt zur Gruppe ohne vorhergehende Einladung. Die „Beitrittsgebühr“ wird in den Gruppeneinstellungen auf der Registerkarte „Allgemein“ festgelegt."
                      name="member options" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen das Hinzufügen, Entfernen und Ändern von Gruppenrollen, das Zuweisen und Entfernen von Rollen und das Zuweisen von Fähigkeiten zu Rollen."
              name="Roles">
                 <action description="Neue Rollen erstellen"
-                     longdescription="Neue Rollen erstellen Sie unter &apos;Mitglieder und Rollen&apos; &gt; &apos;Rollen&apos;."
+                     longdescription="Neue Rollen erstellen Sie unter „Mitglieder und Rollen“ &gt; „Rollen“."
                      name="role create" />
                 <action description="Rollen löschen"
-                     longdescription="Rollen löschen können Sie unter &apos;Mitglieder und Rollen&apos; &gt; &apos;Rollen&apos;."
+                     longdescription="Rollen löschen können Sie unter „Mitglieder und Rollen“ &gt; „Rollen“."
                      name="role delete" />
                 <action description="Rollennamen, Titel und Beschreibung ändern"
-                     longdescription="Namen, Titel und Beschreibungen von Rollen können Sie nach Auswahl einer Rolle unten auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; &apos;Rollen&apos; ändern."
+                     longdescription="Namen, Titel und Beschreibungen von Rollen können Sie nach Auswahl einer Rolle unten auf der Registerkarte „Mitglieder und Rollen“ &gt; „Rollen“ ändern."
                      name="role properties" />
                 <action description="Mitgliedern nur eigene Rollen zuweisen"
-                     longdescription="Mitgliedern nur eigene Rollen zuweisen können Sie im Bereich &apos;Zugewiesene Rollen&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; &apos;Mitglieder&apos;. Ein Mitglied mit dieser Fähigkeit kann anderen Mitgliedern nur die eigenen Rollen zuweisen."
+                     longdescription="Mitgliedern nur eigene Rollen zuweisen können Sie im Bereich „Zugewiesene Rollen“ auf der Registerkarte „Mitglieder und Rollen“ &gt; „Mitglieder“. Ein Mitglied mit dieser Fähigkeit kann anderen Mitgliedern nur die eigenen Rollen zuweisen."
                      name="role assign member limited" />
                 <action description="Mitgliedern beliebige Rolle zuweisen"
-                     longdescription="Mitgliedern beliebige Rolle zuweisen können Sie im Bereich &apos;Zugewiesene Rollen&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; &apos;Mitglieder&apos;. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und jedem anderen Mitglied (außer dem Eigentümer) Rollen mit weitreichenden Fähigkeiten zuweisen und damit fast Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
+                     longdescription="Mitgliedern beliebige Rolle zuweisen können Sie im Bereich „Zugewiesene Rollen“ auf der Registerkarte „Mitglieder und Rollen“ &gt; „Mitglieder“. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und jedem anderen Mitglied (außer dem Eigentümer) Rollen mit weitreichenden Fähigkeiten zuweisen und damit fast Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
                      name="role assign member" />
                 <action description="Mitgliedern Rollen entziehen"
-                     longdescription="Mitgliedern Rollen entziehen können Sie im Bereich &apos;Rollen&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; &apos;Mitglieder&apos;. Eigentümer können nicht entfernt werden."
+                     longdescription="Mitgliedern Rollen entziehen können Sie im Bereich „Rollen“ auf der Registerkarte „Mitglieder und Rollen“ &gt; „Mitglieder“. Eigentümer können nicht entfernt werden."
                      name="role remove member" />
                 <action description="Rollenfähigkeiten zuweisen und entfernen"
-                     longdescription="Rollenfähigkeiten zuweisen und entfernen können Sie im Bereich &apos;Zulässige Fähigkeiten&apos; auf der Registerkarte &apos;Mitglieder und Rollen&apos; &gt; &apos;Rollen&apos;. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und jedem anderen Mitglied (außer dem Eigentümer) alle Fähigkeiten zuweisen und damit fast Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
+                     longdescription="Rollenfähigkeiten zuweisen und entfernen können Sie im Bereich „Zulässige Fähigkeiten“ auf der Registerkarte „Mitglieder und Rollen“ &gt; „Rollen“. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann sich selbst und jedem anderen Mitglied (außer dem Eigentümer) alle Fähigkeiten zuweisen und damit fast Eigentümerrechte erreichen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
                      name="role change actions" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, die Gruppenidentität zu ändern, z. B. öffentliche Sichtbarkeit, Charta und Insignien."
              name="Group Identity">
                 <action
-                     description="Charta, Insignien und &apos;Im Web veröffentlichen&apos; ändern und festlegen, welche Mitglieder in der Gruppeninfo öffentlich sichtbar sind."
-                     longdescription="Charta, Insignien und &apos;Im Web veröffentlichen&apos; ändern und festlegen, welche Mitglieder in der Gruppeninfo öffentlich sichtbar sind. Diese Einstellungen finden Sie auf der Registerkarte &apos;Allgemein&apos;."
+                     description="Charta, Insignien und „Im Web veröffentlichen“ ändern und festlegen, welche Mitglieder in der Gruppeninfo öffentlich sichtbar sind."
+                     longdescription="Charta, Insignien und „Im Web veröffentlichen“ ändern und festlegen, welche Mitglieder in der Gruppeninfo öffentlich sichtbar sind. Diese Einstellungen finden Sie auf der Registerkarte „Allgemein“."
                      name="group change identity" />
         </action_set>
         <action_set
-             description="Diese Fähigkeiten ermöglichen es, gruppeneigenes Land zu übertragen, zu bearbeiten und zu verkaufen. Klicken Sie mit rechts auf den Boden und wählen Sie &apos;Land-Info...&apos; oder klicken Sie in der Menüleiste auf den Parzellennamen."
+             description="Diese Fähigkeiten ermöglichen es, gruppeneigenes Land zu übertragen, zu bearbeiten und zu verkaufen. Klicken Sie mit rechts auf den Boden und wählen Sie „Land-Info...“ oder klicken Sie in der Menüleiste auf den Parzellennamen."
              name="Parcel Management">
                 <action description="Land übertragen und für Gruppe kaufen"
-                     longdescription="Land übertragen und für Gruppe kaufen. Diese Einstellung finden Sie unter &apos;Land-Info&apos; &gt; &apos;Allgemein&apos;."
+                     longdescription="Land übertragen und für Gruppe kaufen. Diese Einstellung finden Sie unter „Land-Info“ &gt; „Allgemein“."
                      name="land deed" />
                 <action description="Land Governor Linden überlassen"
-                     longdescription="Land Governor Linden überlassen. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann gruppeneigenes Land unter &apos;Land-Info&apos; &gt; &apos;Allgemein&apos; aufgeben und es ohne Verkauf in das Eigentum von Linden zurückführen! Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
+                     longdescription="Land Governor Linden überlassen. *WARNUNG* Jedes Mitglied in einer Rolle mit dieser Fähigkeit kann gruppeneigenes Land unter „Land-Info“ &gt; „Allgemein“ aufgeben und es ohne Verkauf in das Eigentum von Linden zurückführen! Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
                      name="land release" />
                 <action description="Land.zu.verkaufen-Info einstellen"
-                     longdescription="Land zu verkaufen-Info einstellen. *WARNUNG* Mitglieder in einer Rolle mit dieser Fähigkeit können gruppeneigenes Land jederzeit unter &apos;Land-Info&apos; &gt; &apos;Allgemein&apos; verkaufen! Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
+                     longdescription="Land zu verkaufen-Info einstellen. *WARNUNG* Mitglieder in einer Rolle mit dieser Fähigkeit können gruppeneigenes Land jederzeit unter „Land-Info“ &gt; „Allgemein“ verkaufen! Überlegen Sie sich, wem Sie diese Fähigkeit verleihen."
                      name="land set sale info" />
                 <action description="Parzellen teilen und zusammenlegen"
-                     longdescription="Parzellen teilen und zusammenlegen. Klicken Sie dazu mit rechts auf den Boden, wählen sie &apos;Terrain bearbeiten&apos; und ziehen Sie die Maus auf das Land, um eine Auswahl zu treffen. Zum Teilen treffen Sie eine Auswahl und klicken auf &apos;Unterteilen...&apos;. Zum Zusammenlegen von zwei oder mehr angrenzenden Parzellen klicken Sie auf &apos;Zusammenlegen...&apos;."
+                     longdescription="Parzellen teilen und zusammenlegen. Klicken Sie dazu mit rechts auf den Boden, wählen sie „Terrain bearbeiten“ und ziehen Sie die Maus auf das Land, um eine Auswahl zu treffen. Zum Teilen treffen Sie eine Auswahl und klicken auf „Unterteilen...“. Zum Zusammenlegen von zwei oder mehr angrenzenden Parzellen klicken Sie auf „Zusammenlegen...“."
                      name="land divide join" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, den Parzellennamen und die Veröffentlichungseinstellungen sowie die Anzeige des Suchverzeichnisses, den Landepunkt und die TP-Routenoptionen festzulegen."
              name="Parcel Identity">
                 <action
-                     description="&apos;In &quot;Orte suchen&quot; anzeigen&apos; ein-/ausschalten und Kategorie festlegen"
-                     longdescription="Auf der Registerkarte &apos;Optionen&apos; unter &apos;Land-Info&apos; können Sie &apos;In &quot;Orte suchen&quot; anzeigen&apos; ein- und ausschalten und die Parzellenkategorie festlegen."
+                     description="„In Orte suchen anzeigen“ ein-/ausschalten und Kategorie festlegen"
+                     longdescription="Auf der Registerkarte „Optionen“ unter „Land-Info“ können Sie „In Orte suchen anzeigen“ ein- und ausschalten und die Parzellenkategorie festlegen."
                      name="land find places" />
                 <action
-                     description="Name und Beschreibung der Parzelle und Einstellungen für &apos;Im Web veröffentlichen&apos; ändern"
-                     longdescription="Name und Beschreibung der Parzelle und Einstellungen für &apos;Im Web veröffentlichen&apos; ändern. Diese Einstellungen finden Sie unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos;."
+                     description="Name und Beschreibung der Parzelle und Einstellungen für „Im Web veröffentlichen“ ändern"
+                     longdescription="Name und Beschreibung der Parzelle und Einstellungen für „Im Web veröffentlichen“ ändern. Diese Einstellungen finden Sie unter „Land-Info“ &gt; „Optionen“."
                      name="land change identity" />
                 <action description="Landepunkt und Teleport-Route festlegen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle einen Landepunkt für ankommende Teleports und Teleport-Routen festlegen. Diese Einstellungen finden Sie unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos;."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle einen Landepunkt für ankommende Teleports und Teleport-Routen festlegen. Diese Einstellungen finden Sie unter „Land-Info“ &gt; „Optionen“."
                      name="land set landing point" />
         </action_set>
         <action_set
-             description="Diese Fähigkeiten ermöglichen es, Parzellenoptionen wie &apos;Objekte erstellen&apos;, &apos;Terrain bearbeiten&apos; sowie Musik- und Medieneinstellungen zu ändern."
+             description="Diese Fähigkeiten ermöglichen es, Parzellenoptionen wie „Objekte erstellen“, „Terrain bearbeiten“ sowie Musik- und Medieneinstellungen zu ändern."
              name="Parcel Settings">
                 <action description="Musik- und Medieneinstellungen ändern"
-                     longdescription="Die Einstellungen für Streaming-Musik und Filme finden Sie unter &apos;Land-Info&apos; &gt; &apos;Medien&apos;."
+                     longdescription="Die Einstellungen für Streaming-Musik und Filme finden Sie unter „Land-Info“ &gt; „Medien“."
                      name="land change media" />
-                <action description="&apos;Terrain bearbeiten&apos; ein/aus"
-                     longdescription="&apos;Terrain bearbeiten&apos; ein/aus. *WARNUNG* &apos;Land-Info&apos; &gt; &apos;Optionen&apos; &gt; &apos;Terrain bearbeiten&apos; ermöglicht jedem das Terraformen Ihres Grundstücks und das Setzen und Verschieben von Linden-Pflanzen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen. Diese Einstellung finden Sie unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos;."
+                <action description="„Terrain bearbeiten“ ein/aus"
+                     longdescription="„Terrain bearbeiten“ ein/aus. *WARNUNG* „Land-Info“ &gt; „Optionen“ &gt; „Terrain bearbeiten“ ermöglicht jedem das Terraformen Ihres Grundstücks und das Setzen und Verschieben von Linden-Pflanzen. Überlegen Sie sich, wem Sie diese Fähigkeit verleihen. Diese Einstellung finden Sie unter „Land-Info“ &gt; „Optionen“."
                      name="land edit" />
-                <action description="&apos;Land-Info&apos;-Optionen einstellen"
-                     longdescription="Auf der Registerkarte &apos;Optionen&apos; unter &apos;Land-Info&apos; können Sie &apos;Sicher (kein Schaden)&apos; und &apos;Fliegen&apos; ein- und ausschalten und Einwohnern folgende Aktionen auf gruppeneigenem Land erlauben: &apos;Objekte erstellen&apos;, &apos;Terrain bearbeiten&apos;, &apos;Landmarken erstellen&apos; und &apos;Skripts ausführen&apos;."
+                <action description="„Land-Info“-Optionen einstellen"
+                     longdescription="Auf der Registerkarte „Optionen“ unter „Land-Info“ können Sie „Sicher (kein Schaden)“ und „Fliegen“ ein- und ausschalten und Einwohnern folgende Aktionen auf gruppeneigenem Land erlauben: „Objekte erstellen“, „Terrain bearbeiten“, „Landmarken erstellen“ und „Skripts ausführen“."
                      name="land options" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, Mitgliedern das Umgehen von Restriktionen auf gruppeneigenen Parzellen zu erlauben."
              name="Parcel Powers">
-                <action description="&apos;Terrain bearbeiten&apos; zulassen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle das Terrain bearbeiten, selbst wenn diese Option unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos; deaktiviert ist."
+                <action description="„Terrain bearbeiten“ zulassen"
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle das Terrain bearbeiten, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist."
                      name="land allow edit land" />
-                <action description="&apos;Fliegen&apos; zulassen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle fliegen, selbst wenn diese Option unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos; deaktiviert ist."
+                <action description="„Fliegen“ zulassen"
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle fliegen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist."
                      name="land allow fly" />
-                <action description="&apos;Objekte erstellen&apos; zulassen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle Objekte erstellen, selbst wenn diese Option unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos; deaktiviert ist."
+                <action description="„Objekte erstellen“ zulassen"
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer gruppeneigenen Parzelle Objekte erstellen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist."
                      name="land allow create" />
-                <action description="&apos;Landmarke erstellen&apos; zulassen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können für eine gruppeneigene Parzelle eine Landmarke erstellen, selbst wenn diese Option unter &apos;Land-Info&apos; &gt; &apos;Optionen&apos; deaktiviert ist."
+                <action description="„Landmarke erstellen“ zulassen"
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können für eine gruppeneigene Parzelle eine Landmarke erstellen, selbst wenn diese Option unter „Land-Info“ &gt; „Optionen“ deaktiviert ist."
                      name="land allow landmark" />
-                <action description="&apos;Hier als Zuhause wählen&apos; auf Gruppenland zulassen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer an diese Gruppe übertragenen Parzelle die Funktion &apos;Welt&apos; &gt; &apos;Hier als Zuhause wählen&apos; verwenden."
+                <action description="„Hier als Zuhause wählen“ auf Gruppenland zulassen"
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können auf einer an diese Gruppe übertragenen Parzelle die Funktion „Welt“ &gt; „Hier als Zuhause wählen“ verwenden."
                      name="land allow set home" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, den Zugang auf gruppeneigenen Parzellen zu steuern. Dazu gehört das Einfrieren und Ausschließen von Einwohnern."
              name="Parcel Access">
                 <action description="Parzellen-Zugangslisten verwalten"
-                     longdescription="Parzellen-Zugangslisten bearbeiten Sie unter &apos;Land-Info&apos; &gt; &apos;Zugang&apos;."
+                     longdescription="Parzellen-Zugangslisten bearbeiten Sie unter „Land-Info“ &gt; „Zugang“."
                      name="land manage allowed" />
                 <action description="Parzellen-Bannlisten verwalten"
-                     longdescription="Parzellen-Bannlisten bearbeiten Sie unter &apos;Land-Info&apos; &gt; &apos;Verbannen&apos;."
+                     longdescription="Parzellen-Bannlisten bearbeiten Sie unter „Land-Info“ &gt; „Verbannen“."
                      name="land manage banned" />
                 <action
-                     description="Parzelleneinstellungen für &apos;Pässe verkaufen...&apos; ändern"
-                     longdescription="Die Parzellen-Einstellungen für &apos;Pässe verkaufen...&apos; ändern Sie unter &apos;Land-Info&apos; &gt; &apos;Zugang&apos;."
+                     description="Parzelleneinstellungen für „Pässe verkaufen...“ ändern"
+                     longdescription="Die Parzellen-Einstellungen für „Pässe verkaufen...“ ändern Sie unter „Land-Info“ &gt; „Zugang“."
                      name="land manage passes" />
                 <action description="Einwohner aus Parzellen werfen und einfrieren"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können gegen unerwünschte Personen auf einer gruppeneigenen Parzelle Maßnahmen ergreifen. Klicken Sie die Person mit rechts an und wählen Sie &apos;Mehr&apos; &gt;, dann &apos;Ausschließen...&apos; oder &apos;Einfrieren...&apos;."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können gegen unerwünschte Personen auf einer gruppeneigenen Parzelle Maßnahmen ergreifen. Klicken Sie die Person mit rechts an und wählen Sie „Mehr“ &gt;, dann „Ausschließen...“ oder „Einfrieren...“."
                      name="land admin" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, Mitgliedern das Zurückgeben von Objekten sowie das Platzieren und Verschieben von Linden-Pflanzen zu erlauben. Mitglieder können das Grundstück aufräumen und an der Landschaftsgestaltung mitwirken. Aber Vorsicht: Zurückgegebene Objekte können nicht mehr zurückgeholt werden."
              name="Parcel Content">
                 <action description="Gruppeneigene Objekte zurückgeben"
-                     longdescription="Gruppeneigene Objekte auf gruppeneigenen Parzellen können Sie unter &apos;Land-Info&apos; &gt; &apos;Objekte&apos; zurückgeben."
+                     longdescription="Gruppeneigene Objekte auf gruppeneigenen Parzellen können Sie unter „Land-Info“ &gt; „Objekte“ zurückgeben."
                      name="land return group owned" />
                 <action description="Gruppenobjekte zurückgeben"
-                     longdescription="Gruppenobjekte auf gruppeneigenen Parzellen können Sie unter &apos;Land-Info&apos; &gt; &apos;Objekte&apos; zurückgeben."
+                     longdescription="Gruppenobjekte auf gruppeneigenen Parzellen können Sie unter „Land-Info“ &gt; „Objekte“ zurückgeben."
                      name="land return group set" />
                 <action description="Gruppenfremde Objekte zurückgeben"
-                     longdescription="Objekte von gruppenfremden Personen auf gruppeneigenen Parzellen können Sie unter &apos;Land-Info&apos; &gt; &apos;Objekte&apos; zurückgeben."
+                     longdescription="Objekte von gruppenfremden Personen auf gruppeneigenen Parzellen können Sie unter „Land-Info“ &gt; „Objekte“ zurückgeben."
                      name="land return non group" />
                 <action description="Landschaftsgestaltung mit Linden-Pflanzen"
-                     longdescription="Die Fähigkeit zur Landschaftsgestaltung ermöglicht das Platzieren und Verschieben von Linden-Bäumen, -Pflanzen und -Gräsern. Diese Objekte finden Sie im Bibliotheksordner des Inventars unter &apos;Objekte&apos;. Sie lassen sich auch mit der Schaltfläche &apos;Erstellen&apos; erzeugen."
+                     longdescription="Die Fähigkeit zur Landschaftsgestaltung ermöglicht das Platzieren und Verschieben von Linden-Bäumen, -Pflanzen und -Gräsern. Diese Objekte finden Sie im Bibliotheksordner des Inventars unter „Objekte“. Sie lassen sich auch mit der Schaltfläche „Erstellen“ erzeugen."
                      name="land gardening" />
         </action_set>
         <action_set
-             description="Diese Fähigkeiten ermöglichen es, gruppeneigene Objekte zu übertragen, zu bearbeiten und zu verkaufen. Änderungen werden unter &apos;Auswahl-Tool&apos; &gt; &apos;Bearbeiten&apos; auf der Registerkarte &apos;Allgemein&apos; vorgenommen. Klicken Sie mit rechts auf ein Objekt und wählen Sie &apos;Bearbeiten&apos;, um seine Einstellungen anzuzeigen."
+             description="Diese Fähigkeiten ermöglichen es, gruppeneigene Objekte zu übertragen, zu bearbeiten und zu verkaufen. Änderungen werden unter „Auswahl-Tool“ &gt; „Bearbeiten“ auf der Registerkarte „Allgemein“ vorgenommen. Klicken Sie mit rechts auf ein Objekt und wählen Sie „Bearbeiten“, um seine Einstellungen anzuzeigen."
              name="Object Management">
                 <action description="Objekte an Gruppe übertragen"
-                     longdescription="Objekte an eine Gruppe übertragen können Sie unter &apos;Auswahl-Tool&apos; &gt; &apos;Bearbeiten&apos; auf der Registerkarte &apos;Allgemein&apos;."
+                     longdescription="Objekte an eine Gruppe übertragen können Sie unter „Auswahl-Tool“ &gt; „Bearbeiten“ auf der Registerkarte „Allgemein“."
                      name="object deed" />
                 <action
                      description="Gruppeneigene Objekte manipulieren (verschieben, kopieren, bearbeiten)"
-                     longdescription="Gruppeneigene Objekte lassen sich unter &apos;Auswahl-Tool&apos; &gt; &apos;Bearbeiten&apos; auf der Registerkarte &apos;Allgemein&apos; manipulieren (verschieben, kopieren, bearbeiten)."
+                     longdescription="Gruppeneigene Objekte lassen sich unter „Auswahl-Tool“ &gt; „Bearbeiten“ auf der Registerkarte „Allgemein“ manipulieren (verschieben, kopieren, bearbeiten)."
                      name="object manipulate" />
                 <action description="Gruppeneigene Objekte zum Verkauf freigeben"
-                     longdescription="Gruppeneigene Objekte zum Verkauf freigeben können Sie unter &apos;Auswahl-Tool&apos; &gt; &apos;Bearbeiten&apos; auf der Registerkarte &apos;Allgemein&apos;."
+                     longdescription="Gruppeneigene Objekte zum Verkauf freigeben können Sie unter „Auswahl-Tool“ &gt; „Bearbeiten“ auf der Registerkarte „Allgemein“."
                      name="object set sale" />
         </action_set>
         <action_set
@@ -168,20 +168,20 @@
              description="Diese Fähigkeiten ermöglichen es, Mitgliedern das Senden, Empfangen und Anzeigen von Gruppennachrichten zu erlauben."
              name="Notices">
                 <action description="Mitteilungen senden"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können in der Gruppeninfo unter &apos;Mitteilungen&apos; Mitteilungen senden."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können in der Gruppeninfo unter „Mitteilungen“ Mitteilungen senden."
                      name="notices send" />
                 <action description="Mitteilungen erhalten und ältere Mitteilungen anzeigen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Mitteilungen erhalten und in der Gruppeninfo unter &apos;Mitteilungen&apos; ältere Mitteilungen einsehen."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Mitteilungen erhalten und in der Gruppeninfo unter „Mitteilungen“ ältere Mitteilungen einsehen."
                      name="notices receive" />
         </action_set>
         <action_set
              description="Diese Fähigkeiten ermöglichen es, Mitgliedern das Erstellen von Anfragen, das Abstimmen über Anfragen und das Anzeigen des Abstimmprotokolls zu erlauben."
              name="Proposals">
                 <action description="Neue Anfragen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Anfragen stellen, über die auf der Registerkarte &apos;Anfragen&apos; in der Gruppeninfo abgestimmt werden kann."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Anfragen stellen, über die auf der Registerkarte „Anfragen“ in der Gruppeninfo abgestimmt werden kann."
                      name="proposal start" />
                 <action description="Ãœber Anfragen abstimmen"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können in der Gruppeninfo unter &apos;Anfragen&apos; über Anfragen abstimmen."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können in der Gruppeninfo unter „Anfragen“ über Anfragen abstimmen."
                      name="proposal vote" />
         </action_set>
         <action_set
@@ -191,7 +191,7 @@
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Gruppen-Chat und Gruppen-Voice-Chat beitreten."
                      name="join group chat" />
                 <action description="Gruppen-Voice-Chat beitreten"
-                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Gruppen-Voice-Chat beitreten.HINWEIS:Sie benötigen die Fähigkeit &apos;Gruppen-Chat beitreten&apos;, um Zugang zu dieser Voice-Chat-Sitzung zu erhalten."
+                     longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können Gruppen-Voice-Chat beitreten. HINWEIS: Sie benötigen die Fähigkeit „Gruppen-Chat beitreten“, um Zugang zu dieser Voice-Chat-Sitzung zu erhalten."
                      name="join voice chat" />
                 <action description="Gruppen-Chat moderieren"
                      longdescription="Mitglieder in einer Rolle mit dieser Fähigkeit können den Zugang zu und die Teilnahme an Gruppen-Chat- und Voice-Chat-Sitzungen steuern."
diff --git a/linden/indra/newview/skins/default/xui/de/strings.xml b/linden/indra/newview/skins/default/xui/de/strings.xml
index c0687f3..07f3269 100644
--- a/linden/indra/newview/skins/default/xui/de/strings.xml
+++ b/linden/indra/newview/skins/default/xui/de/strings.xml
@@ -435,9 +435,9 @@
         </string>
         <!-- Chat -->
         <string name="whisper">
-                Flüstert:
+                flüstert:
         </string>
         <string name="shout">
-                Ruft:
+                ruft:
         </string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 92e2014..23c8e1c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -541,7 +541,7 @@ Do you wish to proceed?
         <alert modal="true" name="JoinGroupCannotAfford">
                 <message name="message">
                         Joining this group costs L$[COST].
-You do not have a sufficient balance to join this group.
+You do not have enough L$ to join this group.
                 </message>
         </alert>
         <alert modal="true" name="LandBuyPass">
@@ -733,7 +733,7 @@ to set its Landing Point.
         </alert>
         <alert modal="true" name="PromptRecipientEmail">
                 <message name="message">
-                        Please enter the recipient&apos;s email address.
+                        Please enter a valid email address for the recipient(s).
                 </message>
         </alert>
         <alert modal="true" name="PromptSelfEmail">
@@ -793,21 +793,13 @@ The outfit folder contains no clothing, body parts, or attachments.
                         You can not wear that item because it has not yet loaded. Please try again in a minute.
                 </message>
         </alert>
-        <alert modal="true" name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        You must have an account to connect to [SECOND_LIFE].
-                </message>
-                <option name="OK">
-                        Close
-                </option>
-        </alert>
         <alert modal="true" name="MustHaveAccountToLogIn">
                 <message name="message">
 Oops! Something was left blank.
 You need to enter both the First and Last name of your avatar.
 
 You need an account to enter [SECOND_LIFE]. Would you like to create one now?
-</message>
+                </message>
                 <option name="OK">
                         Create a new account
                 </option>
@@ -1478,7 +1470,29 @@ chat, or interact with the world.
                         Cancel
                 </option>
         </alert>
-        <alert modal="true" name="InvalidUUID">
+    <alert modal="true" name="EjectAvatarNoBan">
+        <message name="message">
+            Eject this avatar from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="EjectAvatarFullnameNoBan">
+        <message name="message">
+            Eject [AVATAR_NAME] from your land?
+        </message>
+        <option name="Eject">
+            Eject
+        </option>
+        <option name="Cancel">
+            Cancel
+        </option>
+    </alert>
+    <alert modal="true" name="InvalidUUID">
                 <message name="message">
                         Not a valid UUID.
                 </message>
@@ -1660,12 +1674,12 @@ Expected [VALIDS]
         </alert>
         <alert modal="true" name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        Insufficient L$ to upload file: the price is L$[COST], your balance is L$[BALANCE]
+                        Not enough L$ to upload file: the price is L$[COST], your balance is L$[BALANCE]
                 </message>
         </alert>
         <alert modal="true" name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        Insufficient L$ to finish uploading [FILE]: the price is L$[COST], your balance is L$[BALANCE]
+                        Not enough L$ to finish uploading [FILE]: the price is L$[COST], your balance is L$[BALANCE]
                 </message>
         </alert>
         <alert modal="true" name="CannotUploadReason">
@@ -2652,7 +2666,7 @@ You can change your mind later.
         </alert>
         <alert modal="true" name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] You don&apos;t have enough currency to do that.
+                        [NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
                 </message>
         </alert>
         <alert modal="true" name="GrantedModifyRights">
@@ -4369,9 +4383,9 @@ http://secondlife.com/corporate/cs.php
 
 All reported abuses of the Terms of Service and Community Standards 
 are investigated and resolved. You can view the incident 
-resolution on the Police Blotter at:
+resolution on the Incident Report at:
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseEmailEO">
@@ -4466,7 +4480,7 @@ Entering an accurate description helps us file and process bug reports.
         <alert modal="true" name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         Dear Resident,
-
+ 
 You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
 
 (1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
@@ -4476,8 +4490,9 @@ You appear to be reporting intellectual property infringement. Please make sure
 If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category 'CopyBot or Permissions Exploit'.
 
 Thank you,
-
-Linden Lab</message>
+ 
+Linden Lab
+                </message>
         </alert>
         <alert modal="true" name="FailedRequirementsCheck">
                 <message name="message">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 91e0f00..f4422b2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -7,13 +7,14 @@
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
   word_wrap="true">
-  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ and many others.
+  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
 
-  Thank you to the following residents for helping to ensure that this is the best version yet: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+  Thank you to the following residents for helping to ensure that this is the best version yet: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
   cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
   expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
   FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
   GL Copyright (C) 1999-2004 Brian Paul.
@@ -32,7 +33,7 @@
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing</text_editor>
+  I get by with a little help from my friends. --Richard Starkey</text_editor>
 
         <text_editor bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index fc1b747..87aea05 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -467,7 +467,7 @@ Go to World menu > About Land or select another parcel to show its details.
                                 <column name="online_status" width="-1" />
                                 <column name="name" dynamicwidth="true" label="Name" />
                                 <column name="count" label="Count" width="70" />
-                                <column label="Most Recent" width="160" />
+                                <column name="mostrecent" label="Most Recent" width="160" />
                         </name_list>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
@@ -481,13 +481,17 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Edit Terrain" left="14"
-                             mouse_opaque="true" name="edit land check" radio_style="false" width="268" />
+                             mouse_opaque="true" name="edit land check" radio_style="false"
+                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
+                             width="268" />
                         <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Create Landmarks" left="14"
                              mouse_opaque="true" name="check landmark" radio_style="false" width="268" />
                         <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
-                             name="check fly" radio_style="false" width="268" />
+                             name="check fly" radio_style="false"
+                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
+                             width="268" />
                         <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="178"
@@ -538,11 +542,13 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Safe (no damage)" left="14"
-                             mouse_opaque="true" name="check safe" radio_style="false" width="268" />
+                             mouse_opaque="true" name="check safe" radio_style="false"
+                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
+                             width="268" />
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Restrict Pushing" left="178"
+                             height="16" initial_value="false" label="No Pushing" left="178"
                              mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
-                             tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."
+                             tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
                              width="119" />
                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false"
@@ -622,7 +628,7 @@ Go to World menu > About Land or select another parcel to show its details.
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Set" label_selected="Set" left="236"
                              mouse_opaque="true" name="Set" scale_image="true"
-                             tool_tip="Set the landing point to your avatar&apos;s location. It must be inside this land parcel."
+                             tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
                              width="50" />
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Clear" label_selected="Clear" left="291"
@@ -650,10 +656,10 @@ Go to World menu > About Land or select another parcel to show its details.
                                 </combo_item>
                         </combo_box>
                         <string name="push_restrict_text">
-                                Restrict Pushing
+                                No Pushing
                         </string>
                         <string name="push_restrict_region_text">
-                                Restrict Pushing (Region Override)
+                                No Pushing (Region Override)
                         </string>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index f925abd..4038f4f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -182,8 +182,8 @@
              name="playback_slider" right="290" show_text="false" />
         <text bottom="250" follows="top|left" left="10" name="bad_animation_text">
                 Unable to read animation file.
-        
-        We recommend BVH files exported from Poser 4.
+
+We recommend BVH files exported from Poser 4.
         </text>
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
              right="290" width="123" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
new file mode 100644
index 0000000..0fb1aaf
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"

+     width="250" height="225"

+     name="beacons" title="Beacons"

+     rect_control="FloaterBeaconsRect" control_name="BeaconAlwaysOn">

+        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">

+        <check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />

+    <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />

+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

+             bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"

+             font="SansSerifSmall" h_pad="0" halign="left" height="12" left="5"

+             mouse_opaque="true" name="beacon_width_label" v_pad="0" width="128">

+                Beacon Width:

+        </text>

+        <slider bottom_delta="-20" can_edit_text="false" enabled="true" width="185" height="16" mouse_opaque="true"

+             decimal_digits="0" increment="1" initial_val="1" left="30" min_val="1.0" max_val="16.0"

+             name="beacon_width" show_text="true" value="1" control_name="DebugBeaconLineWidth"/>    

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index a12cb2b..d32832c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -74,6 +74,9 @@
                                         <flyout_button_item value="say" name="say_item">
                                                 Say
                                         </flyout_button_item>
+                                        <flyout_button_item value="whisper" name="whisper_item">
+                                                Whisper
+                                        </flyout_button_item>
                                 </flyout_button>
                         </panel>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index f59017e..af60c11 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -49,7 +49,7 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
                              label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-                             width="92" />
+                             width="80" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
index 08c6b53..71c0e60 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
@@ -57,7 +57,7 @@
         </text>
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-120" drop_shadow_visible="true" follows="left|top"
-             font="SansSerif" h_pad="0" halign="left" height="16" left="85"
+             font="SansSerif" h_pad="0" halign="left" height="16" left="110"
              mouse_opaque="true" name="server_text" right="-10" v_pad="0">
                 Normal
         </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 4758116..7826f13 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -292,12 +292,13 @@
     </menu_item_check>
     <menu_item_check name="Instant Message" label="Communicate"
                      shortcut="control|T">
-      <on_click function="ShowFloater" userdata="im" />
-      <on_check function="FloaterVisible" userdata="im" />
+      <on_click function="View.Communicate"/>
+      <on_check function="FloaterVisible" userdata="communicate" />
     </menu_item_check>
     <menu_item_call name="Inventory" label="Inventory"
                     shortcut="control|I">
       <on_click function="ShowFloater" userdata="inventory" />
+      <on_check function="FloaterVisible" userdata="inventory" />
     </menu_item_call>
     <menu_item_check name="Active Speakers" label="Active Speakers">
       <on_click function="ShowFloater" userdata="active speakers" />
@@ -370,80 +371,16 @@
       <on_click function="View.HighlightTransparent" userdata="" />
       <on_check function="View.CheckHighlightTransparent" />
     </menu_item_check>
-    <menu_item_check name="Beacons Always On" label="Show Beacons">
-      <on_click function="ToggleControl" userdata="BeaconsEnabled" />
-      <on_check control="BeaconsEnabled" />
+    <menu_item_check name="beacons" label="Beacons"
+                     shortcut="control|alt|shift|N">
+      <on_click function="ShowFloater" userdata="beacons" />
+      <on_check function="FloaterVisible" userdata="beacons" />
+    </menu_item_check>
+    <menu_item_check name="Hide Particles" label="Hide Particles"
+                     shortcut="control|alt|shift|=">
+      <on_click function="View.ToggleRenderType" userdata="hideparticles" />
+      <on_check function="View.CheckRenderType" userdata="hideparticles" />
     </menu_item_check>
-    <menu name="Beacons" create_jump_keys="true" label="Beacons"
-          opaque="true" tear_off="true">
-      <menu_item_check name="Scripted Objects With Touch Only"
-                       label="Scripted Objects with Touch Only">
-        <on_click function="View.ToggleBeacon"
-                  userdata="scripttouchbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="scripttouchbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Scripted Objects" label="Scripted Objects">
-        <on_click function="View.ToggleBeacon"
-                  userdata="scriptsbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="scriptsbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Physical Objects" label="Physical Objects">
-        <on_click function="View.ToggleBeacon"
-                  userdata="physicalbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="physicalbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Sound Sources" label="Sound Sources">
-        <on_click function="View.ToggleBeacon"
-                  userdata="soundsbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="soundsbeacon" />
-      </menu_item_check>
-      <menu_item_check name="Particle Sources" label="Particle Sources">
-        <on_click function="View.ToggleBeacon"
-                  userdata="particlesbeacon" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="particlesbeacon" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu_item_check name="Render Highlights" label="Render Highlights">
-        <on_click function="View.ToggleBeacon"
-                  userdata="renderhighlights" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="renderhighlights" />
-      </menu_item_check>
-      <menu_item_check name="Render Beacons" label="Render Beacons">
-        <on_click function="View.ToggleBeacon"
-                  userdata="renderbeacons" />
-        <on_check function="View.CheckBeaconEnabled"
-                  userdata="renderbeacons" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu_item_check name="Hide Particles" label="Hide Particles">
-        <on_click function="View.ToggleRenderType"
-                  userdata="hideparticles" />
-        <on_check function="View.CheckRenderType"
-                  userdata="hideparticles" />
-      </menu_item_check>
-      <menu_item_separator />
-      <menu name="Beacon Width" create_jump_keys="true"
-            label="Beacon Width" opaque="true" tear_off="true">
-        <menu_item_call name="Beacon Width 1" label="1">
-          <on_click function="View.BeaconWidth" userdata="1" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 4" label="4">
-          <on_click function="View.BeaconWidth" userdata="4" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 16" label="16">
-          <on_click function="View.BeaconWidth" userdata="16" />
-        </menu_item_call>
-        <menu_item_call name="Beacon Width 32" label="32">
-          <on_click function="View.BeaconWidth" userdata="32" />
-        </menu_item_call>
-      </menu>
-    </menu>
     <menu_item_separator />
     <menu name="Zoom Level" create_jump_keys="true"
             label="Zoom Level" opaque="true" tear_off="true">
@@ -520,12 +457,12 @@
     <menu_item_separator />
     <menu_item_call name="Account History..."
                     label="Account History...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="AccountHistory_url"
                 userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
     </menu_item_call>
     <menu_item_call name="Manage My Account..."
                     label="Manage My Account...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="ManageMyAccount_url"
                 userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
     </menu_item_call>
     <menu_item_call name="Buy and Sell L$..." label="Buy L$...">
@@ -799,7 +736,7 @@
     </menu_item_call>
     <menu_item_call name="Scripting Portal..."
                     label="Scripting Portal...">
-      <on_click function="PromptShowURL"
+      <on_click function="PromptShowURL" name="ScriptingPortal_url"
                 userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
     </menu_item_call>
     <menu_item_separator />
@@ -1105,14 +1042,6 @@
           <on_check function="Advanced.CheckFeature"
                     userdata="fog" />
         </menu_item_check>
-        <menu_item_check name="Palletized Textures"
-                         label="Palletized Textures"
-                         shortcut="alt|shift|F7">
-          <on_click function="Advanced.ToggleFeature"
-                    userdata="palette" />
-          <on_check function="Advanced.CheckFeature"
-                    userdata="palette" />
-        </menu_item_check>
         <menu_item_check name="Test FRInfo" label="Test FRInfo"
                          shortcut="alt|shift|F8">
           <on_click function="Advanced.ToggleFeature"
@@ -1244,19 +1173,6 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="glow" />
         </menu_item_check>
-        <menu_item_check name="Show Depth Buffer"
-                         label="Show Depth Buffer">
-          <on_click function="ToggleControl"
-                    userdata="ShowDepthBuffer" />
-          <on_check control="ShowDepthBuffer" />
-        </menu_item_check>
-        <menu_item_check name="Show Select Buffer"
-                         label="Show Select Buffer">
-          <on_click function="Advanced.ToggleSelectBuffer"
-                    userdata="" />
-          <on_check function="Advanced.CheckSelectBuffer"
-                    userdata="" />
-        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index d207a74..99fe75a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -374,7 +374,7 @@ You cannot fly here.
         </notify>
         <notify name="PushRestricted" tip="false" unique="true">
                 <message name="message">
-                        This land is &apos;llPushObject Restricted&apos;.
+                        This land is &apos;No Pushing&apos;.
 You cannot push others here unless you own the land.
                 </message>
         </notify>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
index 13f0e16..4f20e9d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
@@ -42,7 +42,7 @@
                 Adjust the slider to control how loud you sound to other Residents. To test the input level, simply speak into your microphone.
         </text_editor>
         <volume_slider bottom_delta="-18" enabled="true" follows="left|top" height="17"
-             increment="0.05" initial_val="0.5" left_delta="5" max_val="1" min_val="0"
+             increment="0.05" initial_val="1.0" left_delta="5" max_val="2" min_val="0"
              mouse_opaque="true" name="mic_volume_slider"
              tool_tip="Change the volume using this slider" width="90" />
         <text bottom_delta="-4" follows="left|top" height="20" left_delta="95"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 95604ff..67bfd0c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -17,15 +17,18 @@
         <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="shout" name="shout_item">
+                        Shout
+                </flyout_button_item>
                 <flyout_button_item value="say" name="say_item">
                         Say
                 </flyout_button_item>
-                <flyout_button_item value="shout" name="shout_item">
-                        Shout
+                <flyout_button_item value="whisper" name="whisper_item">
+                        Whisper
                 </flyout_button_item>
         </flyout_button>
         <combo_box allow_text_entry="false" bottom="-23" follows="right|bottom" height="20"
              label="Gestures" left_delta="85" max_chars="20" name="Gesture" width="90">
-        </combo_box>
+  </combo_box>
   <string name="gesture_label">Gestures</string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index f6b8838..f4c074f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -3,11 +3,7 @@
      left="1" mouse_opaque="true" name="land_money_tab" select="false"
      width="418">
         <string name="help_text">
-                Parcels owned by the group are listed along with 
-contribution details. A warning appears until the
-Total Land in Use is less than or equal to the Total
-Contribution. The Plannning, Details and Sales tabs
-provide information about the group&apos;s finances.
+                Parcels owned by the group are listed along with contribution details. A warning appears until the Total Land in Use is less than or equal to the Total Contribution. The &apos;Details&apos; and &apos;Sales&apos; tabs provide information about the group&apos;s finances.
         </string>
         <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
              name="help_button" width="20" />
@@ -114,6 +110,7 @@ provide information about the group&apos;s finances.
         </text>
         <tab_container border="false" bottom_delta="-189" height="180" left="6" mouse_opaque="false"
              name="group_money_tab_container" tab_position="top" width="406">
+                <!-- Comment out for [DEV-11287]
                 <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">
@@ -125,6 +122,7 @@ provide information about the group&apos;s finances.
                                 Computing...
                         </text_editor>
                 </panel>
+                -->
                 <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">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index b2bb65f..24753d1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -8,9 +8,9 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="128">
                 Chat Font Size:
         </text>
-        <radio_group bottom="-40" control_name="ChatFontSize" draw_border="true" enabled="true"
+        <radio_group bottom="-40" draw_border="true" enabled="true"
              follows="left|top" height="30" left="148" mouse_opaque="true"
-             name="chat font size" width="331">
+             name="chat_font_size" width="331">
                 <radio_item type="string" length="1" bottom="-24" enabled="true" height="16" left="0" mouse_opaque="true"
                      name="radio" width="98">
                         Small
@@ -39,12 +39,12 @@
              enabled="true" follows="left|top" height="56" label="Others" left_delta="48"
              mouse_opaque="true" name="agent" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
-             can_apply_immediately="true" color="0.6 0.6 1 1" control_name="IMChatColor"
+             can_apply_immediately="true" color="0.6 0.6 1 1"
              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="-108"
              can_apply_immediately="true" color="0.8 1 1 1"
-             control_name="SystemChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              height="56" label="System" left_delta="48" mouse_opaque="true"
              name="system" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
@@ -59,17 +59,17 @@
              name="objects" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
-             control_name="llOwnerSayChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              height="56" label="Owner" left_delta="48" mouse_opaque="true" name="owner"
              width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0 0 0 1"
-             control_name="BackgroundChatColor" enabled="true" follows="left|top"
+             enabled="true" follows="left|top"
              height="56" label="Bubble" left_delta="48" mouse_opaque="true"
              name="background" width="44" />
         <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             control_name="HTMLLinkColor" enabled="true" follows="left|top" height="56"
+             enabled="true" follows="left|top" height="56"
              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="-185" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -100,7 +100,7 @@
              width="80">
                 (seconds)
         </text>
-        <spinner bottom_delta="-6" control_name="ConsoleMaxLines" decimal_digits="0"
+        <spinner bottom_delta="-6" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
              initial_val="10" left="340" max_val="50" min_val="1" mouse_opaque="true"
              name="max_chat_count" width="60" />
@@ -127,20 +127,20 @@
              mouse_opaque="false" name="text_box6" v_pad="0" width="135">
                 Chat Options:
         </text>
-        <check_box bottom_delta="-10" control_name="CloseChatOnReturn" enabled="true"
+        <check_box bottom_delta="-10" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Close chat bar after hitting return" left="148" mouse_opaque="true"
              name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" control_name="ArrowKeysMoveAvatar" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Arrow keys always move avatar when chatting" left="148"
              mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
              width="237" />
-        <check_box bottom_delta="-20" control_name="ChatShowTimestamps" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" control_name="PlayTypingAnim" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 7bd966a..6c8ffdb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -2,20 +2,21 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="General" left="102" mouse_opaque="true"
      name="general_panel" width="517">
-        <combo_box allow_text_entry="true" bottom="-24" enabled="true" follows="left|bottom"
-             height="16" left="155" max_chars="128" mouse_opaque="true"
-             name="location_combobox" width="146">
-                <combo_item name="MyHome" value="My Home">
-                        My Home
-                </combo_item>
-                <combo_item name="MyLastLocation" value="My Last Location">
-                        My Last Location
-                </combo_item>
-        </combo_box>
-        <check_box bottom="-44" control_name="ShowStartLocation" enabled="true" follows="left|top"
-             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="-45" draw_border="false" follows="left|bottom" height="40" left="151"
+             name="default_start_location" width="220">
+    <radio_item bottom="-20" height="20" left="0" name="MyHome" width="50"
+                  tool_tip="Log into my home location by default.">
+      My Home
+    </radio_item>
+    <radio_item bottom="-20" height="20" left="100" name="MyLastLocation" width="50"
+                  tool_tip="Log into my last location by default.">
+      My Last Location
+    </radio_item>
+  </radio_group>
+  <check_box bottom="-44" enabled="true" follows="left|top"
+       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" />
         <combo_box bottom_delta="-25" follows="left|top" height="18" left="155"
              mouse_opaque="true" name="fade_out_combobox" width="146">
                 <combo_item name="Never" value="Never">
@@ -28,11 +29,11 @@
                         Always
                 </combo_item>
         </combo_box>
-        <check_box bottom_delta="-25" control_name="SmallAvatarNames" follows="left|top"
+        <check_box bottom_delta="-25" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="true"
              label="Small Avatar Names" left="151" name="small_avatar_names_checkbox"
              width="200" />
-        <check_box bottom_delta="-18" control_name="RenderNameHideSelf" follows="left|top"
+        <check_box bottom_delta="-18" 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" />
@@ -41,16 +42,16 @@
              width="394">
                 Group Titles:
         </text>
-        <check_box bottom_delta="0" control_name="RenderHideGroupTitleAll" follows="left|top"
+        <check_box bottom_delta="0" 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"
+        <check_box bottom_delta="-18" 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"
+             can_apply_immediately="false" color="1 1 1 1"
              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="32" />
@@ -60,23 +61,19 @@
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
                 UI Size:
         </text>
-        <slider bottom="-217" can_edit_text="true" control_name="UIScaleFactor"
+        <slider bottom="-217" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.025"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="UI Scale" show_text="true" value="1" width="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
-             font="SansSerif" halign="center" height="22" label="Reset"
-             label_selected="Reset" left_delta="226" mouse_opaque="true"
-             name="reset_ui_size" scale_image="true" width="80" />
-        <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
+             name="ui_scale_slider" show_text="true" value="1" width="256" />
+        <check_box bottom="-236" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              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" decimal_digits="0" enabled="true"
+        <spinner bottom="-260" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-        <check_box bottom="-286" control_name="MiniMapRotate" enabled="true" follows="left|top"
+        <check_box bottom="-286" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Rotate Mini-Map" left="151" mouse_opaque="true"
              name="rotate_mini_map_checkbox" radio_style="false" width="256" />
@@ -84,18 +81,18 @@
                    font="SansSerifSmall" height="16" initial_value="false"
                    label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
                    name="teleport_mini_map_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-304" control_name="NotifyMoneyChange" enabled="true"
+        <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
-        <check_box bottom="-322" control_name="UseDefaultColorPicker" enabled="true"
+        <check_box bottom="-322" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Use default system color picker" left="151" mouse_opaque="true"
              name="use_system_color_picker_checkbox" radio_style="false"
              tool_tip="Use the default system color picker instead of the one built into Second Life."
              width="256" />
-        <check_box bottom="-340" control_name="ShowSearchBar" enabled="true" follows="left|top"
+        <check_box bottom="-340" enabled="true" follows="left|top"
              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"
@@ -159,7 +156,7 @@
                         Never send
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" control_name="Language" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-382" 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">
@@ -168,29 +165,41 @@
                 <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
                         English
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
-                        汉语/漢語 (Chinese) - Beta
+                
+                <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string. -->
+                
+                <combo_item type="string" length="1" enabled="true" name="Danish" value="da">
+                        Dansk (Danish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
                         Deutsch (German) - Beta
                 </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (Spanish) - Beta
+                </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="French" value="fr">
                         Français (French) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
-                        日本語 (Japanese) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Hungarian" value="hu">
+                        Magyar (Hungarian) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
-                        한국어 (Korean) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Polish" value="pl">
+                        Polski (Polish) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
                         Portugués (Portuguese) - Beta
                 </combo_item>
-                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
-                        Español (Spanish) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        中文 (简体) (Chinese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (Japanese) - Beta
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (Korean) - Beta
                 </combo_item>
         </combo_box>
-        <check_box bottom="-400" control_name="LanguageIsPublic" enabled="true"
+        <check_box bottom="-400" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
              initial_value="false" label="Share language with objects" left="151"
              mouse_opaque="true" name="language_is_public"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index 8020e9a..f0f79e4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -26,15 +26,15 @@
              height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
              left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
              width="350" />
-        <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
+        <check_box bottom="-65" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show IMs with Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
-        <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
+        <check_box bottom="-85" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-    <check_box bottom="-105" control_name="ChatOnlineNotification" enabled="true"
+    <check_box bottom="-105" enabled="true"
          follows="left|top" font="SansSerifSmall" height="16"
          initial_value="false" label="Show online Friend notifications" left="148"
          mouse_opaque="true" name="friends_online_notify_checkbox"
@@ -54,33 +54,33 @@
              mouse_opaque="false" name="text_box4" v_pad="0" width="128">
                 Logging Options:
         </text>
-        <check_box bottom="-225" control_name="LogInstantMessages" enabled="true"
+        <check_box bottom="-225" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Save a log of IM on my computer" left="148"
              mouse_opaque="true" name="log_instant_messages" radio_style="false"
              width="237" />
-        <check_box bottom="-245" control_name="IMLogTimestamp" enabled="true"
+        <check_box bottom="-245" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Show timestamps in IM log" left="168"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
-        <check_box bottom="-265" control_name="LogShowHistory" enabled="true" follows="left|top"
+        <check_box bottom="-265" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show the end of last IM conversation" left="168" mouse_opaque="true"
              name="log_show_history" radio_style="false" width="217" />
-        <check_box bottom="-285" control_name="LogChat" enabled="true" follows="left|top"
+        <check_box bottom="-285" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
              left="148" mouse_opaque="true" name="log_chat" radio_style="false"
              width="237" />
-        <check_box bottom="-305" control_name="LogChatTimestamp" enabled="true" follows="left|top"
+        <check_box bottom="-305" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
-        <check_box bottom="-325" control_name="LogChatIM" enabled="true" follows="left|top"
+        <check_box bottom="-325" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
-        <check_box bottom="-345" control_name="LogTimestampDate" enabled="true" follows="left|top"
+        <check_box bottom="-345" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Include date with timestamps" left="148" mouse_opaque="true"
              name="log_date_timestamp" radio_style="false" width="237" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 1867323..65fe6c9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -14,21 +14,21 @@
              mouse_opaque="true" name=" Mouse Sensitivity:" v_pad="0" width="128">
                 Mouse Sensitivity:
         </text>
-        <slider_bar bottom="-26" control_name="MouseSensitivity" enabled="true" follows="left|top"
+        <slider_bar bottom="-26" enabled="true" follows="left|top"
              height="16" increment="0.25" initial_val="2" left="276" max_val="15"
-             min_val="0" mouse_opaque="true" name="Mouse Sensitivity" width="128" />
-        <check_box bottom="-44" control_name="InvertMouse" enabled="true" follows="left|top"
+             min_val="0" mouse_opaque="true" name="mouse_sensitivity" width="128" />
+        <check_box bottom="-44" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" label="Invert Mouse" left="148"
-             mouse_opaque="true" name="invert mouse" radio_style="false" width="128" />
+             mouse_opaque="true" name="invert_mouse" radio_style="false" width="128" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-74" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name=" Auto Fly Options:" v_pad="0" width="266">
                 Auto Fly Options:
         </text>
-        <check_box bottom="-80" control_name="AutomaticFly" enabled="true" follows="left|top"
+        <check_box bottom="-80" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" label="Fly/land on holding up/down"
-             left="148" mouse_opaque="true" name="automatic fly" radio_style="false"
+             left="148" mouse_opaque="true" name="automatic_fly" radio_style="false"
              width="178" />
         <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"
@@ -42,10 +42,10 @@
              mouse_opaque="true" name="Camera Follow Distance:" v_pad="0" width="128">
                 Camera Follow Distance:
         </text>
-        <slider bottom="-116" can_edit_text="true" control_name="DynamicCameraStrength"
+        <slider bottom="-116" can_edit_text="true"
              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="DynamicCameraStrength" show_text="true" value="2"
+             mouse_opaque="true" name="dynamic_camera_strength" show_text="true" value="2"
              width="128" />
         <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"
@@ -53,31 +53,31 @@
              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"
+        <slider bottom="-140" can_edit_text="true" 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" />
+             name="zoom_time" 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"
+        <slider bottom="-164" can_edit_text="true"
              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"
+             mouse_opaque="true" name="camera_position_smoothing" show_text="true" value="2"
              width="128" />
-        <check_box bottom="-188" control_name="EditCameraMovement" enabled="true"
+        <check_box bottom="-188" 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"
+             name="edit_camera_movement" radio_style="false"
              tool_tip="Use automatic camera positioning when entering and exiting edit mode"
              width="201" />
-        <check_box bottom="-206" control_name="AppearanceCameraMovement" enabled="true"
+        <check_box bottom="-206" 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"
+             name="appearance_camera_movement" radio_style="false"
              tool_tip="Use automatic camera positioning while in edit mode" width="242" />
         <check_box bottom_delta="-18" control_name="DisableCameraConstraints" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -90,9 +90,9 @@
              mouse_opaque="true" name="text2" v_pad="0" width="128">
                 Avatar Display Options:
         </text>
-        <check_box bottom_delta="-4" control_name="FirstPersonAvatarVisible" enabled="true"
+        <check_box bottom="-232" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="avfp"
+             label="Show Avatar in Mouselook" left="148" mouse_opaque="true" name="first_person_avatar_visible"
              radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-32" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -102,5 +102,5 @@
         </text>
         <button bottom_delta="-4" follows="left|top" font="SansSerif" height="20"
              label="Joystick Setup" left="148" mouse_opaque="true"
-             name="joystic_setup_button" width="155" />
+             name="joystick_setup_button" width="155" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index a0f0936..48da432 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -8,7 +8,7 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="200">
                 Maximum Bandwidth:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
+        <slider bottom_delta="-25" can_edit_text="true"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50"
              mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
@@ -27,7 +27,7 @@
              v_pad="0" width="200">
                 Disk Cache Size:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
+        <slider bottom_delta="-25" can_edit_text="true"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
              mouse_opaque="true" name="cache_size" show_text="true" width="180" />
@@ -61,12 +61,12 @@
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Set" left_delta="103" mouse_opaque="true"
              name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-35" control_name="ConnectionPortEnabled"
+        <check_box bottom="-173" bottom_delta="-35"
              enabled="true" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Custom Port Connection" left="12"
              mouse_opaque="true" name="connection_port_enabled" radio_style="false"
              width="256" />
-        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
+        <spinner bottom="-193" bottom_delta="-20"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port Number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index 11d15f4..65734d6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -27,11 +27,11 @@
              width="270">
                 Offers of notecards, textures and landmarks:
         </text>
-        <check_box bottom_delta="-25" control_name="AutoAcceptNewInventory" enabled="true"
+        <check_box bottom_delta="-25" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Automatically accept" left="40" mouse_opaque="true"
              name="accept_new_inventory" radio_style="false" width="270" />
-        <check_box bottom_delta="-20" control_name="ShowNewInventory" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Automatically view after accepting" left="40" mouse_opaque="true"
              name="show_new_inventory" radio_style="false" width="270" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 89b07dd..d3c0003 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -9,7 +9,7 @@
              name="voice_unavailable" tab_stop="false" width="450" word_wrap="true">
                 Voice Chat Is Not Available
         </text_editor>
-        <check_box bottom_delta="0" control_name="EnableVoiceChat" enabled="true"
+        <check_box bottom_delta="0" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Enable voice chat" left="8" mouse_opaque="true"
              name="enable_voice_check" radio_style="false" width="200" />
@@ -36,7 +36,7 @@
              name="voice_chat_description" tab_stop="false" width="450" word_wrap="true">
                 Push-to-Talk mode lets you control when your voice is transmitted. When in toggle mode, press and release the push-to-talk trigger to switch your microphone on and off. When not in toggle mode, the microphone is active only when the trigger is held down.
         </text_editor>
-        <check_box bottom_delta="-20" control_name="PushToTalkToggle" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Use Push-to-Talk in toggle mode" left_delta="0" mouse_opaque="true"
              name="push_to_talk_toggle_check" radio_style="false" width="200" />
@@ -48,7 +48,7 @@
                 Push-to-Talk trigger:
         </text>
         <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-             control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
+             drop_shadow_visible="true" enabled="false"
              follows="top|left" font="SansSerifSmall" halign="right" height="19"
              left_delta="0" max_length="254" mouse_opaque="false" name="modifier_combo"
              width="280" />
@@ -63,7 +63,7 @@
              left="28" name="privacy_heading" width="445">
                 Privacy Options
         </text>
-        <check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" enabled="true"
+        <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Only accept voice calls from people on My Friends list"
              left_delta="20" mouse_opaque="true" name="voice_call_friends_only_check"
@@ -76,6 +76,6 @@
              font="SansSerifSmall" height="35" hide_border="true" hide_scrollbar="true"
              left="28" max_length="65535" mouse_opaque="true"
              name="device_settings_text" tab_stop="false" width="450" word_wrap="true">
-                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat.
+                NOTE: Running the Device Settings will temporarily disconnect you from Voice Chat, and changes you make will be immediately applied.
         </text_editor>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index b708bf3..ed13e8f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -30,8 +30,8 @@
              width="128">
                 Cookies:
         </text>
-        <check_box bottom_delta="-7" control_name="CookiesEnabled" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        <check_box bottom_delta="-7" enabled="true" follows="left|top" 
+                 font="SansSerifSmall" height="16" initial_value="false"
              label="Accept cookies from sites" left="140" mouse_opaque="true"
              name="cookies_enabled" radio_style="false" width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -41,7 +41,7 @@
              width="128">
                 Web Proxy:
         </text>
-        <check_box bottom_delta="-7" control_name="BrowserProxyEnabled" enabled="true"
+        <check_box bottom_delta="-7" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Enable Web Proxy" left="140" mouse_opaque="true"
              name="web_proxy_enabled" radio_style="false" width="256" />
@@ -56,7 +56,7 @@
              height="20" left="217" name="web_proxy_editor"
              tool_tip="The name or IP address of the proxy you would like to use"
              width="200" />
-        <spinner bottom_delta="-25" control_name="BrowserProxyPort" decimal_digits="0"
+        <spinner bottom_delta="-25" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="1"
              initial_val="80" label="Port Number:" label_width="75" left="140"
              max_val="12000" min_val="10" mouse_opaque="true" name="web_proxy_port"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
index 462728a..91a81df 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_region_debug.xml
@@ -58,9 +58,9 @@
              left="10" name="top_colliders_btn"
              tool_tip="List of objects experiencing the most potential collisions"
              width="150" />
-        <button bottom_delta="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" 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..."
+        <button bottom_delta="-23" follows="left|top" height="20" label="Get Top Scripts..."
              left="10" name="top_scripts_btn"
              tool_tip="List of objects spending the most time running scripts"
              width="150" />
@@ -69,9 +69,9 @@
         <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="-3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+        <button bottom_delta="0" 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"
+        <button bottom_delta="-23" follows="left|top" height="20" label="Delay Restart"
              left="10" name="cancel_restart_btn"
              tool_tip="Delay region restart by one hour" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 614f1f9..63d2ca3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -75,7 +75,7 @@
              halign="center" height="18" image_selected="status_no_push.tga"
              image_unselected="status_no_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="llPushObject restricted" visible="false" width="24" />
+             tool_tip="No Pushing" visible="false" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="18" image_selected="status_no_voice.tga"
              image_unselected="status_no_voice.tga" label="" label_selected=""
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
index a0dc47b..c98b86b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
@@ -3,6 +3,6 @@
      enabled="true" follows="right|bottom" height="20" left="0"
      mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
      width="130">
-        <panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="130" />
-        <panel bottom="3" filename="panel_voice_controls.xml" height="20" left="1" width="130" />
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="130" />
+        <panel bottom="3" filename="panel_voice_controls.xml" name="panel_voice_controls" height="20" left="1" width="130" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
index 88cc305..08d7a28 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
@@ -2,7 +2,7 @@
 <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="130">
-        <panel bottom="1" filename="panel_bg_tab.xml" height="47" left="0" width="130" />
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="130" />
         <button bottom="-20" height="20" image_overlay="icn_voice-call-end.tga" label=""
              left="4" name="end_call_btn" tool_tip="Click to hang up" width="20" />
         <button bottom="-21" height="22" image_disabled="icn_rounded-text-field.tga"
diff --git a/linden/indra/newview/skins/default/xui/es/alerts.xml b/linden/indra/newview/skins/default/xui/es/alerts.xml
index 06be1be..eae0202 100644
--- a/linden/indra/newview/skins/default/xui/es/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/es/alerts.xml
@@ -1643,7 +1643,7 @@ Intente seleccionar una área menor.
                         Este local puede reproducir música en streaming. 
  
 Música requiere una conexión con internet
-de 768 Kbps o más rápida.
+de 768 kbps o más rápida.
  
 ¿Reproducir música cuando disponible?
                 </message>
@@ -1658,7 +1658,7 @@ de 768 Kbps o más rápida.
                 <message name="message">
                         Este local puede reproducir vídeo en streaming. 
 Vídeo en streaming requiere una conexión con internet
-de 768 Kbps o más rápida.
+de 768 kbps o más rápida.
  
 ¿Reproducir vídeo en streaming cuando disponible?
  
@@ -3978,31 +3978,6 @@ para ver los detalles de la transacción?
                         Cancelar
                 </option>
         </alert>
-        <alert name="HelpReportAbuse">
-                <message name="message">
-                        Use this tool to report violations of the Terms of Service and Community Standards. See: 
-http://secondlife.com/corporate/tos.php 
-http://secondlife.com/corporate/cs.php 
- 
-All reported abuses of the Terms of Service and Community Standards 
-are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. 
-You can also view the incident resolution on the Police Blotter at: 
- 
-http://secondlife.com/community/blotter.php
-                </message>
-        </alert>
-        <alert name="HelpReportBug">
-                <message name="message">
-                        Use this tool to report technical features that do not perform 
-as described or expected. All bug reports are investigated and 
-resolved. No email response will be sent, you may reply to the 
-auto-response email to add more details to your report. 
-If you are having a technical difficulty, please contact Support at: 
- 
-http://secondlife.com/community/support.php
-                </message>
-        </alert>
         <alert name="HelpReportAbuseSelectCategory">
                 <message name="message">
                         Por favor, seleccione una categoría para este relato de abuso.
diff --git a/linden/indra/newview/skins/default/xui/es/floater_about_land.xml b/linden/indra/newview/skins/default/xui/es/floater_about_land.xml
index f81a291..990e636 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -132,54 +132,33 @@
                         <text type="string" length="1" name="Simulator primitive usage:">
                                 Simulador de primitiva usado:
                         </text>
-                        <text type="string" length="1" name="0 out of 0 available">
-                                0 de 14055 (14055 disponible)
-                        </text>
                         <text type="string" length="1" name="Primitives parcel supports:">
                                 Primitivas en la parcela soportan:
                         </text>
-                        <text type="string" length="1" name="object_contrib_text">
-                                926
-                        </text>
                         <text type="string" length="1" name="Primitives on parcel:">
                                 Primitivas en la parcela:
                         </text>
-                        <text type="string" length="1" name="total_objects_text">
-                                0
-                        </text>
                         <text type="string" length="1" name="Owned by parcel owner:">
                                 Pertenecientes al propietario de la parcela:
                         </text>
-                        <text type="string" length="1" name="owner_objects_text">
-                                0
-                        </text>
                         <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
                         <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
                              tool_tip="Devolver objetos para sus propietarios." />
                         <text type="string" length="1" name="Set to group:">
                                 Definido para el grupo:
                         </text>
-                        <text type="string" length="1" name="group_objects_text">
-                                0
-                        </text>
                         <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
                         <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
                              tool_tip="Devolver objetos para sus propietarios." />
                         <text type="string" length="1" name="Owned by others:">
                                 Pertenecientes a otros:
                         </text>
-                        <text type="string" length="1" name="other_objects_text">
-                                0
-                        </text>
                         <button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
                         <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
                              tool_tip="Devolver objetos para sus propietarios." />
                         <text type="string" length="1" name="Selected / sat upon:">
                                 Seleccionado / puesto en:
                         </text>
-                        <text type="string" length="1" name="selected_objects_text">
-                                0
-                        </text>
                         <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
                                 Autoretornar objetos de otros residentes (minutos, 0 para desligar):
                         </text>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_mute.xml b/linden/indra/newview/skins/default/xui/es/floater_mute.xml
index 31e7f3b..5921a19 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_mute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Residentes sin sonido &amp; Objetos">
-        <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+<floater name="mute floater" title="Residentes &amp; Objetos sin sonido" short_title="Residentes &amp; Objetos sin sonido">
+        <scroll_list name="mutes" />
         <button label="Desactivar sonido de residente..."
              label_selected="Desactivar sonido de residente..." name="Mute resident..."
              tool_tip="Dejar un residente sin sonido" />
diff --git a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
index 62f0f1b..23f457a 100644
--- a/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -76,7 +76,7 @@
                 <menu_item_check label="Historial del chat" name="Chat History" />
                 <menu_item_check label="Mensaje instantáneo" name="Instant Message" />
                 <menu_item_call label="Inventario" name="Inventory" />
-                <menu_item_check label="Dejar sin sonido por la lista" name="Mute List" />
+                <menu_item_check label="Residentes &amp; Objetos sin sonido" name="Mute List" />
                 <menu_item_separator label="-----------" name="separator2" />
                 <menu_item_check label="Controles de cámara" name="Camera Controls" />
                 <menu_item_check label="Controles de movimiento" name="Movement Controls" />
diff --git a/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 3c9732f..e2ce326 100644
--- a/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -4,8 +4,8 @@
                 Parcelas pertenecientes al grupo son listadas 
 con detalles de contribución. Un aviso aparece hasta que 
 el terreno total en uso sea menor o igual al total
-de contribución. Las pestañas Planeamiento, Detalles y Ventas
-conceden informaciones sobre las finanzas&apos; del grupo.
+de contribución. Las pestañas Detalles y Ventas
+conceden informaciones sobre las finanzas del grupo.
         </text>
         <button label="?" name="help_button" />
         <text name="cant_view_group_land_text">
diff --git a/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index e78ada3..9ca3e32 100644
--- a/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -81,7 +81,7 @@
                         한국어 (Coreano) - Beta
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (Chino) - Beta
+                        中文 (简体) (Chino) - Beta
                 </combo_item>
                 <combo_item type="string" name="Spanish">
                         Español - Beta
diff --git a/linden/indra/newview/skins/default/xui/fr/alerts.xml b/linden/indra/newview/skins/default/xui/fr/alerts.xml
index a9d6ddd..0eeb551 100644
--- a/linden/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/fr/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <alerts>
         <global name="skipnexttime">
                 Ne plus afficher
@@ -8,7 +8,7 @@
         </global>
         <alert name="MissingAlert">
                 <message name="message">
-                        [ALERT_NAME] est absent de alerts.xml!
+                        [ALERT_NAME] n&apos;est pas dans le fichier alerts.xml.
                 </message>
                 <option name="OK">
                         OK
@@ -16,7 +16,7 @@
         </alert>
         <alert name="FloaterNotFound">
                 <message name="message">
-                        Erreur de floater : Impossible de trouver les contrôles suivants :
+                        Erreur floater : impossible de trouver les contrôles suivants :
  
 [CONTROLS]
                 </message>
@@ -55,10 +55,10 @@
         </alert>
         <alert name="ConnectTimeout">
                 <message name="message">
-                        Connexion impossible à [SECOND_LIFE]
-Le service est peut-être interrompu.
-Veuillez réessayer d&apos;ici quelques minutes, ou cliquez sur Aide
-pour des conseils et un lien vers la page web d&apos;état du service.
+                        Connexion à [SECOND_LIFE] impossible.
+le service est peut-être interrompu.
+
+Veuillez réessayer dans quelques minutes, ou cliquez sur Aide pour obtenir des conseils et un lien vers la page web d&apos;état du service.
                 </message>
                 <option name="OK">
                         OK
@@ -83,28 +83,28 @@ pour des conseils et un lien vers la page web d&apos;état du service.
         </alert>
         <alert name="CompileQueueSaveText">
                 <message name="message">
-                        Problème lors de l&apos;upload du texte pour un script : [REASON]. Veuillez réessayer ultérieurement.
+                        Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
                 </message>
         </alert>
         <alert name="CompileQueueSaveBytecode">
                 <message name="message">
-                        Problème lors de l&apos;upload du script compilé : [REASON]. Veuillez réessayer ultérieurement.
+                        Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
                 </message>
         </alert>
         <alert name="WriteAnimationFail">
                 <message name="message">
-                        Echec d&apos;écriture des données d&apos;animation.
+                        Une erreur est survenue lors de l&apos;écriture des données d&apos;animation. Veuillez réessayer ultérieurement.
                 </message>
         </alert>
         <alert name="UploadAuctionSnapshotFail">
                 <message name="message">
-                        Problème lors de l&apos;upload d&apos;un instantané d&apos;enchères : [REASON]
+                        Un problème est survenu lors du chargement du script compilé, suite au problème suivant : [REASON]
                 </message>
         </alert>
         <alert name="UnableToViewContentsMoreThanOne">
                 <message name="message">
-                        Impossible d&apos;afficher le contenu de plus d&apos;un objet à la fois.
-Veuillez sélectionner un seul objet et réessayez.
+                        Impossible d&apos;afficher les contenus de plus d&apos;un objet à la fois.
+Veuillez ne sélectionner qu&apos;un seul objet.
                 </message>
         </alert>
         <alert name="MustSupplyVoteProposal">
@@ -120,14 +120,14 @@ Entrez une brève description des objectifs du groupe.
         </alert>
         <alert name="CharacterSnapshotSaved">
                 <message name="message">
-                        Un instantané de votre personnage a été sauvegardé.
+                        Une photo de votre personnage a été sauvegardée.
  
-Visitez l&apos;exposition Webpage Studio pour le visualiser.
+Visitez l&apos;exposition Webpage Studio pour la voir.
                 </message>
         </alert>
         <alert name="SaveClothingBodyChanges">
                 <message name="message">
-                        Enregistrer toutes les modifications des vêtements/parties du corps ?
+                        Enregistrer tous les changements dans les habits/parties du corps ?
                 </message>
                 <option name="SaveAll">
                         Tout enregistrer
@@ -216,10 +216,10 @@ Souhaitez-vous accorder des droits d&apos;édition aux résidents selectionnésÂ
 [WANT_APPLY_MESSAGE]
                 </message>
                 <option name="ApplyChanges">
-                        Appliquer modifications
+                        Enregistrer les modifications
                 </option>
                 <option name="IgnoreChanges">
-                        Ignorer modifications
+                        Ignorer les modifications
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -249,7 +249,7 @@ Vous n&apos;avez pas assez d&apos;argent pour créer ce groupe.
         </alert>
         <alert name="GroupNameTooShort">
                 <message name="message">
-                        Les noms de groupes doivent comporter quatre lettres minimum.
+                        Les noms de groupes doivent comporter 4 lettres minimum.
                 </message>
         </alert>
         <alert name="GroupNameUsesReservedWord">
@@ -260,7 +260,7 @@ choisir un autre nom.
         </alert>
         <alert name="MustSpecifyGroupNoticeSubject">
                 <message name="message">
-                        Vous devez préciser le sujet afin d&apos;envoyer une notification au groupe.
+                        Pour envoyer une notice au groupe, vous devez indiquer un sujet.
                 </message>
                 <option name="OK">
                         OK
@@ -274,10 +274,10 @@ Entrez une brève description des objectifs du groupe.
         </alert>
         <alert name="AddGroupOwnerWarning">
                 <message name="message">
-                        Vous vous apprêtez à ajouter des membres du groupe au rôle de [ROLE_NAME].
-Les membres ne peuvent pas être déchus de ce rôle.
-Ils devront quitter le rôle par eux-mêmes.
-Etes-vous sûr(e) de vouloir poursuivre?
+                        Vous êtes sur le point d&apos;ajouter des membres du groupe dans le rôle de [ROLE_NAME].
+Les membres ne peuvent pas être destitués de ce rôle.
+Ils doivent donner eux-mêmes leur démission.
+Êtes-vous certain de vouloir continuer ?
                 </message>
                 <ignore name="ignore">
                         Lorsque vous donnez à des membres du groupe le rôle de « propriétaire »
@@ -291,13 +291,11 @@ Etes-vous sûr(e) de vouloir poursuivre?
         </alert>
         <alert name="AssignDangerousActionWarning">
                 <message name="message">
-                        Vous vous apprêtez à ajouter la Faculté &apos;[ACTION_NAME]&apos; au 
-Rôle &apos;[ROLE_NAME]&apos;.
+                        Vous êtes sur le point d&apos;ajouter le pouvoir « [ACTION_NAME] » au rôle « [ROLE_NAME] ».
+ *Avertissement*
+ Tout membre disposant de ce pouvoir peut s&apos;affecter lui-même, ainsi que tout autre membre, à des rôles disposant de pouvoirs plus importants, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir.
  
- *AVERTISSEMENT*
-Tout membre disposant de cette Faculté peut s&apos;affecter lui-même --ainsi que tout autre Membre-- à des Rôles disposant de pouvoirs plus grands, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de savoir ce que vous faites avant d&apos;attribuer cette Faculté.
- 
-Ajouter cette Faculté à &apos;[ROLE_NAME]&apos;?
+Ajouter ce pouvoir à « [ROLE_NAME] » ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -308,13 +306,13 @@ Ajouter cette Faculté à &apos;[ROLE_NAME]&apos;?
         </alert>
         <alert name="AssignDangerousAbilityWarning">
                 <message name="message">
-                        Vous vous apprêtez à ajouter la Faculté &apos;[ACTION_NAME]&apos; au 
-Rôle &apos;[ROLE_NAME]&apos;.
+                        Vous êtes sur le point d&apos;ajouter le pouvoir « [ACTION_NAME] » au 
+rôle « [ROLE_NAME] ».
  
- *AVERTISSEMENT*
-Tout membre disposant de cette Faculté peut s&apos;attribuer --ainsi qu&apos;à tout autre Membre-- toutes Facultés, et accéder à des pouvoirs proches de ceux d&apos;un propriétaire. 
+ *Avertissement*
+ Tout membre dans un rôle avec ce pouvoir peut s&apos;attribuer à lui-même, ainsi qu&apos;à tout autre membre, Tous les pouvoirs, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire.
  
-Ajouter cette Faculté à &apos;[ROLE_NAME]&apos;?
+Ajouter ce pouvoir à « [ROLE_NAME] » ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -326,19 +324,18 @@ Ajouter cette Faculté à &apos;[ROLE_NAME]&apos;?
         <alert name="ClickPublishHelpGroup">
                 <message name="message">
                         L&apos;option &quot;Publier sur le Web&quot; nous permet de publier
-le nom du groupe, son insigne, sa charte, ses titres, et ses fondateurs sur le
+le nom du groupe, son logo, sa charte, ses titres, et ses fondateurs sur le
 site [SECOND_LIFE]. Il est de votre responsabilité d&apos;indiquer si 
-tout ou partie du contenu ci-dessus est considéré comme Adulte au regard
-des règles de base de la Communauté.
+tout ou partie du contenu ci-dessus est considéré comme Adulte selon les règles de base de la Communauté.
                 </message>
         </alert>
         <alert name="ClickPublishHelpLand">
                 <message name="message">
-                        L&apos;option &quot;Publier sur le Web&quot; nous permet de publier
-le nom, la description, l&apos;instantané et la localisation de cette parcelle
-sur le site [SECOND_LIFE]. Il est de votre responsabilité d&apos;indiquer si 
-tout ou partie du contenu ci-dessus est considéré comme Adulte au regard
-des règles de base de la Communauté.
+                        Sélectionner l&apos;option Afficher dans la recherche 
+En cochant cette case, votre parcelle apparaîtra :
+- dans les résultats de recherche ;
+- dans les objets publics ;
+- dans la recherche web.
                 </message>
         </alert>
         <alert name="ClickPublishHelpLandDisabled">
@@ -348,22 +345,23 @@ des règles de base de la Communauté.
         </alert>
         <alert name="ClickPublishHelpPostcard">
                 <message name="message">
-                        L&apos;option &quot;Publier sur le Web&quot; nous permet de publier
+                        L&apos;option Publier sur le Web nous permet de publier
 le nom du photographe dans [SECOND_LIFE], le sujet, le lieu, le message et
-l&apos;instantané sur le site [SECOND_LIFE]. Il est de votre responsabilité d&apos;indiquer si 
-tout ou partie du contenu des instantanés ci-dessus est considéré comme Adulte au regard
-des règles de base de la Communauté.
+la photo sur le site [SECOND_LIFE]. Vous devez indiquer indiquer si 
+les photos ci-dessus contiennent du contenu pour Adultes, conformément aux 
+règles de base de la Communauté.
                 </message>
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        L&apos;option &quot;Publier sur le Web&quot; nous permet de publier
-votre nom, image, et texte &apos;A propos&apos; sur le site [SECOND_LIFE].
+                        Si vous sélectionnez Afficher dans la recherche :
+- votre profil apparaîtra dans les résultats de recherche ;
+- un lien vers votre profil apparaîtra dans les pages de groupe publiques.
                 </message>
         </alert>
         <alert name="ClickPartnerHelpAvatar">
                 <message name="message">
-                        Vous pouvez proposer à un autre résident de dissoudre un partenariat existant par le biais du site de [SECOND_LIFE].
+                        Vous pouvez proposer à un autre résident de devenir votre partenaire ou dissoudre un partenariat existant à partir du site de [SECOND_LIFE].
 
 Aller sur le site de Second Life pour avoir plus d&apos;informations sur les partenariats ?
                 </message>
@@ -374,16 +372,36 @@ Aller sur le site de Second Life pour avoir plus d&apos;informations sur les par
                         Annuler
                 </option>
         </alert>
+        <alert name="ClickWebProfileHelpAvatar">
+                <message name="message">
+                        Si ce résident a défini une URL de profil web, vous pouvez :
+ * Cliquer sur Charger pour afficher la page dans cet onglet ;
+ * Cliquer sur Charger &gt; Dans un navigateur externe, pour afficher la page dans votre navigateur par défaut ;
+ * Cliquer sur Charger &gt; URL du domicile, pour retourner au profil web du résident.
+ 
+Lorsque vous êtes dans votre propre profil, vous pouvez définir n&apos;importe quelle URL comme profil web. Pour cela, saisissez l&apos;URL et cliquez sur OK.
+Les autres résidents peuvent visiter l&apos;URL que vous avez définie en regardant votre profil.
+                </message>
+        </alert>
+        <alert name="ClickWebProfileNoWebHelpAvatar">
+                <message name="message">
+                        Si ce résident a défini une URL de profil web, vous pouvez :
+ * Cliquer sur Ouvrir pour afficher la page dans votre navigateur par défaut.
+ 
+Lorsque vous êtes dans votre propre profil, vous pouvez définir n&apos;importe quelle URL comme profil web. Pour cela, saisissez l&apos;URL et cliquez sur OK.
+Les autres résidents peuvent visiter l&apos;URL que vous avez définie en regardant votre profil.
+                </message>
+        </alert>
         <alert name="ReputationMinGreaterThanMax">
                 <message name="message">
                         La réputation minimum est supérieure au maximum.
-Abaissez le minimum ou augmentez le maximum.
+Veuillez aissez le minimum ou augmentez le maximum.
                 </message>
         </alert>
         <alert name="MoneyMinGreaterThanMax">
                 <message name="message">
                         Le minimum est supérieur au maximum.
-Veuillez abaisser le minimum ou augmenter le maximum.
+Veuillez baisser le minimum ou augmenter le maximum.
                 </message>
         </alert>
         <alert name="OfficerTitleTooLong">
@@ -429,11 +447,11 @@ Souhaitez-vous continuer ?
         </alert>
         <alert name="JoinGroupCanAfford">
                 <message name="message">
-                        L&apos;inscription à ce groupe coûte L$[COST].
-Souhaitez-vous continuer ?
+                        Rejoindre ce groupe coûte [COST] L$.
+Voulez-vous continuer ?
                 </message>
                 <option name="Join">
-                        Fusionner
+                        Rejoindre
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -441,14 +459,13 @@ Souhaitez-vous continuer ?
         </alert>
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
-                        L&apos;inscription à ce groupe coûte L$[COST].
-Vous ne disposez pas d&apos;un solde suffisant pour vous inscrire à ce groupe.
+                        Rejoindre ce groupe coûte [COST] L$.
+Vous n&apos;avez pas suffisamment de L$ pour rejoindre ce groupe.
                 </message>
         </alert>
         <alert name="LandBuyPass">
                 <message name="message">
-                        Pour L$[COST], vous pouvez accéder à ce terrain (&apos;[PARCEL_NAME]&apos;)
-pour [TIME] heure(s).  Acheter un laissez-passer ?
+                        Pour [COST] L$ vous pouvez pénétrer sur ce terrain ([PARCEL_NAME]) et y rester [TIME] heures. Acheter un pass ?
                 </message>
                 <option name="OK">
                         OK
@@ -466,19 +483,17 @@ si vous êtes sûr(e) de vouloir démarrer des enchères.
         </alert>
         <alert name="SalePriceRestriction">
                 <message name="message">
-                        Le prix de vente doit être &gt; L$0 si vous vendez à tout le monde.
-Veuillez choisir une personne pour lui vendre à L$0.
+                        Pour rendre l&apos;annonce disponible à tous, le prix de vente doit être supérieur à 0 L$.
+Si le prix de vente est de 0 L$, vous devez choisir un acheteur spécifique.
                 </message>
         </alert>
         <alert name="ConfirmLandSaleChange">
                 <message name="message">
-                        Le terrain sélectionné d&apos;une surface de [LAND_SIZE] m2 est mis en vente.
-Votre prix de vente sera de L$[SALE_PRICE], pour une acquisition par [NAME].
- 
-Voulez-vous poursuivre les modifications ?
+                        Le terrain sélectionné, de [LAND_SIZE] m², est mis en vente.
+Votre prix de vente sera de [SALE_PRICE] L$ et la vente sera disponible à [NAME].
                 </message>
                 <option name="Continue">
-                        Continuer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -486,12 +501,12 @@ Voulez-vous poursuivre les modifications ?
         </alert>
         <alert name="ConfirmLandSaleToAnyoneChange">
                 <message name="message">
-                        Attention : En cliquant sur Vendre à n&apos;importe qui, vous rendez votre
+                        Attention : en cliquant sur Vendre à n&apos;importe qui, vous rendez votre
 terrain disponible à toute la communauté de Second Life, même aux personnes qui ne sont pas dans
 cette région.
 
 Le terrain sélectionné, de [LAND_SIZE] m², est mis en vente.
-Votre prix de vente sera de [SALE_PRICE] $L et la vente sera disponible à [NAME].
+Votre prix de vente sera de [SALE_PRICE] L$ et la vente sera disponible à [NAME].
                 </message>
                 <option name="Continue">
                         OK
@@ -502,17 +517,14 @@ Votre prix de vente sera de [SALE_PRICE] $L et la vente sera disponible à [NAME
         </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer tous les objets partagés
-avec le groupe &apos;[NAME]&apos; sur cette parcelle de terrain
-vers l&apos;inventaire de leurs propriétaires précédents?
+                        Êtes-vous certain de vouloir renvoyer tous les objets partagés par le groupe [NAME] sur cette parcelle dans l&apos;inventaire du propriétaire précédent ?
  
-*AVERTISSEMENT* Ceci supprimera les objets non-cessibles
-transférés au groupe !
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés !
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -520,14 +532,12 @@ Objets : [N]
         </alert>
         <alert name="ReturnObjectsOwnedByUser">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer tous les objets appartenant
-au résident &apos;[NAME]&apos; sur cette parcelle de terrain
-vers son inventaire ?
+                        Etes-vous certain de vouloir renvoyer tous les objets que [NAME] possède sur cette parcelle dans son inventaire ?
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -535,14 +545,12 @@ Objets : [N]
         </alert>
         <alert name="ReturnObjectsOwnedBySelf">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer tous les objets
-vous appartenant sur cette parcelle de terrain
-vers votre inventaire ?
+                        Êtes-vous certain de vouloir renvoyer tous les objets que vous possédez sur cette parcelle dans votre inventaire ?
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -550,17 +558,15 @@ Objets : [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedBySelf">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer tous les objets ne vous appartenant PAS
-sur cette parcelle de terrain vers l&apos;inventaire de leur propriétaire ?
-Les objets cessibles transférés à des groupes seront
-renvoyés à leurs propriétaires précédents.
+                        Êtes-vous certain de vouloir renvoyer tous les objets que vous ne possédez pas sur cette parcelle dans l&apos;inventaire de leur propriétaire ?
+Les objets transférables cédés à un groupe seront renvoyés aux propriétaires précédents.
  
-*AVERTISSEMENT* Ceci supprimera les objets non-cessibles transférés au groupe !
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés !
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -568,33 +574,37 @@ Objets : [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedByUser">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer tous les objets n&apos;appartenant PAS
-à [NAME] sur cette parcelle de terrain vers l&apos;inventaire de leur propriétaire ?
-Les objets cessibles transférés à des groupes seront
-renvoyés à leurs propriétaires précédents.
+                        Êtes-vous certain de vouloir renvoyer tous les objets que [NAME] ne possède pas sur cette parcelle dans l&apos;inventaire de leur propriétaire ?
+Les objets transférables cédés à un groupe seront renvoyés aux propriétaires précédents.
  
-*AVERTISSEMENT* Ceci supprimera les objets non-cessibles transférés au groupe !
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés !
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
         <alert name="ReturnAllTopObjects">
+                <message name="message">
+                        Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l&apos;inventaire de leur propriétaire ?
+                </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
         <alert name="DisableAllTopObjects">
+                <message name="message">
+                        Êtes-vous certain de vouloir désactiver tous les objets dans cette région ?
+                </message>
                 <option name="Disable">
-                        Désactiver
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -602,14 +612,12 @@ Objets : [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedByGroup">
                 <message name="message">
-                        Renvoyer les objets sur cette parcelle de terrain
-qui ne sont PAS partagés avec le groupe [NAME]
-à leurs propriétaires ?
+                        Renvoyer les objets de cette parcelle qui ne sont pas partagés avec le groupe [NAME] à leur propriétaire ?
  
-Objets : [N]
+Objets : [N]
                 </message>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -617,25 +625,24 @@ Objets : [N]
         </alert>
         <alert name="UnableToDisableOutsideScripts">
                 <message name="message">
-                        Impossible de désactiver les scripts extérieurs.
-La région entière autorise les dégâts (not safe).
-Les scripts doivent être autorisés pour faire fonctionner les armes à feu.
+                        Impossible de désactiver les scripts.
+Les dégâts sont autorisés dans toute la région.
+Pour que les armes fonctionnent, les scripts doivent être autorisés.
                 </message>
         </alert>
         <alert name="MustBeInParcel">
                 <message name="message">
-                        Vous devez vous trouver à l&apos;intérieur de la parcelle de terrain
-pour définir le point d&apos;atterrissage.
+                        Pour définir le point d&apos;atterrissage, vous devez vous trouver à l&apos;intérieur de la parcelle.
                 </message>
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
-                        Veuillez saisir l&apos;adresse mail du destinataire.
+                        Veuillez saisir une adresse e-mail valide pour le(s) destinataire(s).
                 </message>
         </alert>
         <alert name="PromptSelfEmail">
                 <message name="message">
-                        Veuillez saisir votre adresse mail.
+                        Veuillez saisir votre adresse e-mail.
                 </message>
         </alert>
         <alert name="PromptMissingSubjMsg">
@@ -651,78 +658,65 @@ pour définir le point d&apos;atterrissage.
         </alert>
         <alert name="ErrorProcessingSnapshot">
                 <message name="message">
-                        Erreur dans le traitement des données de l&apos;instantané
+                        Erreur dans le traitement des données de la photo
                 </message>
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
-                        Erreur d&apos;encodage de l&apos;instantané !
+                        Erreur d&apos;encodage de la photo.
                 </message>
         </alert>
         <alert name="ErrorUploadingPostcard">
                 <message name="message">
-                        Problème lors de l&apos;upload d&apos;une carte postale : [REASON]
+                        Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]
                 </message>
         </alert>
         <alert name="ErrorUploadingReportScreenshot">
                 <message name="message">
-                        Problème lors de l&apos;envoi d&apos;une capture d&apos;écran : [REASON]
+                        Une erreur est survenue lors du chargement de la capture d&apos;écran destinée au rapport, suite au problème suivant : [REASON]
                 </message>
         </alert>
         <alert name="MustAgreeToLogIn">
                 <message name="message">
-                        Vous devez accepter les Conditions Générales d&apos;Utilisation pour continuer à vous connecter à [SECOND_LIFE].
+                        Pour vous connecter à [SECOND_LIFE], vous devez accepter les Conditions d&apos;utilisation.
                 </message>
         </alert>
         <alert name="CouldNotPutOnOutfit">
                 <message name="message">
-                        Impossible de revêtir la tenue.
-Le dossier Tenues ne contient ni vêtements, ni éléments corporels, ni attachements.
+                        Impossible de mettre cet ensemble.
+Ce dossier ne contient pas d&apos;habits, de parties du corps ni de pièces jointes.
                 </message>
         </alert>
         <alert name="CannotWearTrash">
                 <message name="message">
-                        Impossible de porter des vêtements ou parties du corps se trouvant dans la corbeille.
+                        Vous ne pouvez pas porter d&apos;habits ni de parties du corps se trouvant dans la corbeille.
                 </message>
         </alert>
         <alert name="CannotWearInfoNotComplete">
                 <message name="message">
-                        Impossible de porter cet élément car ses informations ne sont pas encore disponibles.
-Veuillez réessayer dans une minute.
-                </message>
-        </alert>
-        <alert name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        Vous devez disposer d&apos;un compte pour vous connecter à [SECOND_LIFE].
+                        Vous ne pouvez pas porter cet article car il n&apos;a pas encore été chargé. Veuillez réessayer dans une minute.
                 </message>
-                <option name="OK">
-                        OK
-                </option>
         </alert>
         <alert name="MustHaveAccountToLogIn">
                 <message name="message">
-                        Vous devez disposer d&apos;un compte pour vous connecter à [SECOND_LIFE].
- 
-Vous rendre sur www.secondlife.com pour créer un nouveau compte ?
+                        Oups! Vous avez oublié de fournir certaines informations.
+Vous devez saisir le nom et le prénom de votre avatar.
+
+Pour entrer dans [SECOND_LIFE], vous devez avoir un compte. Voulez-vous en créer un maintenant ?
                 </message>
                 <option name="OK">
-                        OK
+                        Créer un compte
                 </option>
                 <option name="Cancel">
-                        Annuler
+                        Réessayer
                 </option>
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        Les petites annonces sont publiées dans la section &apos;Annonces&apos;
-du module de recherche, pour une durée d&apos;une semaine.
- 
-Rédigez votre annonce, puis cliquez sur &apos;Publier...&apos; pour
-l&apos;ajouter à la liste des annonces.
- 
-Vous devrez payer des frais d&apos;insertion au moment de cliquer sur &apos;Publier&apos;.
-Plus vous payez, plus votre annonce apparaîtra en haut de liste.
-Ceci est également valable pour les résultats de recherche de mots-clé.
+                        Les petites annonces sont publiées à l&apos;onglet Petites annonces de la section Recherche pendant une semaine.
+Rédigez votre annonce, puis cliquez sur Publier pour l&apos;ajouter à la liste des annonces.
+Au moment de cliquer sur Publier, vous serez invité à payer des frais.
+Plus vous payez cher, plus votre annonce est visible dans la liste ainsi que dans les résultats de recherche de mots-clés.
                 </message>
                 <option name="OK">
                         OK
@@ -736,11 +730,11 @@ Ceci est également valable pour les résultats de recherche de mots-clé.
         </alert>
         <alert name="DeleteClassified">
                 <message name="message">
-                        Supprimer l&apos;annonce &apos;[NAME]&apos;?
-Les frais d&apos;insertion sont non remboursables.
+                        Supprimer l&apos;annonce [NAME] ?
+Une fois payés, les frais ne sont pas remboursables.
                 </message>
                 <option name="Delete">
-                        Supprimer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -762,10 +756,10 @@ Les frais d&apos;insertion sont non remboursables.
         </alert>
         <alert name="DeleteAvatarPick">
                 <message name="message">
-                        Supprimer [PICK] des lieux favoris ?
+                        Supprimer le favori [PICK] ?
                 </message>
                 <option name="Delete">
-                        Supprimer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -788,10 +782,10 @@ Veuillez appliquer vos modifications et quitter
         </alert>
         <alert name="PromptGoToEventsPage">
                 <message name="message">
-                        Aller sur la page des événements [SECOND_LIFE] ?
+                        Aller à la page web de [SECOND_LIFE] réservée aux événements ?
                 </message>
                 <option name="GotoPage">
-                        Aller à la Page
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -809,17 +803,17 @@ Veuillez appliquer vos modifications et quitter
         </alert>
         <alert name="SelectProposalToView">
                 <message name="message">
-                        Veuillez choisir une proposition à afficher.
+                        Veuillez sélectionner une proposition.
                 </message>
         </alert>
         <alert name="SelectHistoryItemToView">
                 <message name="message">
-                        Veuillez choisir un elément de l&apos;historique à afficher.
+                        Veuillez sélectionner un historique.
                 </message>
         </alert>
         <alert name="ResetShowNextTimeDialogs">
                 <message name="message">
-                        Réinitialiser tous les dialogues &apos;Afficher la prochaine fois&apos; ?
+                        Souhaitez-vous réactiver tous les pop-ups que vous aviez désactivés ?
                 </message>
                 <option name="OK">
                         OK
@@ -841,7 +835,7 @@ Veuillez appliquer vos modifications et quitter
         </alert>
         <alert name="CacheWillClear">
                 <message name="message">
-                        Le cache sera vidé au redémarrage de [SECOND_LIFE].
+                        Le cache sera vidé après le redémarrage de [SECOND_LIFE].
                 </message>
         </alert>
         <alert name="CacheWillBeMoved">
@@ -862,11 +856,10 @@ Remarque : cela videra le cache.
         </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
-                        Aller sur la page [SECOND_LIFE] pour afficher le détail des enchères
-ou enchérir ?
+                        Aller à la page web de [SECOND_LIFE] pour voir le détail des enchères ou enchérir ?
                 </message>
                 <option name="GotoPage">
-                        Aller à la Page
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -874,7 +867,7 @@ ou enchérir ?
         </alert>
         <alert name="SaveChanges">
                 <message name="message">
-                        Enregistrer les modifications ?
+                        Enregistrer les changements ?
                 </message>
                 <option name="Save">
                         Enregistrer
@@ -888,76 +881,76 @@ ou enchérir ?
         </alert>
         <alert name="GestureSaveFailedTooManySteps">
                 <message name="message">
-                        Echec de la sauvegarde du geste.
-Ce geste comporte trop d&apos;étapes.
-Essayer de retirer quelques étapes, puis enregistrez à nouveau.
+                        L&apos;enregistrement du geste a échoué.
+Il y a trop d&apos;étapes dans ce geste.
+Essayez d&apos;en supprimer quelques-unes.
                 </message>
         </alert>
         <alert name="GestureSaveFailedTryAgain">
                 <message name="message">
-                        Echec de la sauvegarde du geste. Veuillez réessayer dans une minute.
+                        L&apos;enregistrement du geste a échoué. Veuillez réessayer dans une minute.
                 </message>
         </alert>
         <alert name="GestureSaveFailedObjectNotFound">
                 <message name="message">
-                        Impossible d&apos;enregistrer le geste car l&apos;objet ou son inventaire associé est introuvable.
-L&apos;objet est peut-être hors de portée ou a été supprimé.
+                        Le geste n&apos;a pas pu être enregistré car l&apos;objet ou l&apos;inventaire de l&apos;objet associé n&apos;a pas été trouvé.
+L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
                 </message>
         </alert>
         <alert name="GestureSaveFailedReason">
                 <message name="message">
-                        Problème lors de la sauvegarde d&apos;un geste : [REASON].  Veuillez réessayer de sauvegarder le geste ultérieurement.
+                        Une erreur est survenue lors de l&apos;enregistrement du geste, suite au problème suivant : [REASON]. Essayez d&apos;enregistrer votre geste ultérieurement.
                 </message>
         </alert>
         <alert name="SaveNotecardFailObjectNotFound">
                 <message name="message">
-                        Impossible d&apos;enregistrer la note car l&apos;objet ou son inventaire associé est introuvable.
-L&apos;objet est peut-être hors de portée ou a été supprimé.
+                        La note n&apos;a pas pu être enregistrée car l&apos;objet ou l&apos;inventaire de l&apos;objet associé n&apos;a pas été trouvé.
+L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
                 </message>
         </alert>
         <alert name="SaveNotecardFailReason">
                 <message name="message">
-                        Problème lors de la sauvegarde d&apos;une note : [REASON].  Veuillez réessayer de sauvegarder la note ultérieurement.
+                        Une erreur est survenue lors de l&apos;enregistrement de la note, suite au problème suivant : [REASON]. Essayez d&apos;enregistrer votre note ultérieurement.
                 </message>
         </alert>
         <alert name="ScriptCannotUndo">
                 <message name="message">
-                        Impossible d&apos;annuler toutes les modifications dans votre version du script.
-Voulez-vous charger la dernière version enregistrée sur le serveur ?
-(Attention : cette opération est définitive.)
+                        Impossible d&apos;annuler tous les changements dans votre version du script.
+Souhaitez-vous charger la dernière version enregistrée sur le serveur ?
+(**Attention** Cette opération est irréversible.)
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="SaveScriptFailReason">
                 <message name="message">
-                        Problème lors de la sauvegarde d&apos;un script : [REASON].  Veuillez réessayer de sauvegarder le script ultérieurement.
+                        Une erreur est survenue lors de l&apos;enregistrement du script, suite au problème suivant : [REASON]. Essayez d&apos;enregistrer votre script ultérieurement.
                 </message>
         </alert>
         <alert name="SaveScriptFailObjectNotFound">
                 <message name="message">
-                        Impossible d&apos;enregistrer le script car l&apos;objet associé est introuvable.
-L&apos;objet est peut-être hors de portée ou a été supprimé.
+                        Impossible d&apos;enregistrer le script car l&apos;objet qui le contient est introuvable.
+L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
                 </message>
         </alert>
         <alert name="SaveBytecodeFailReason">
                 <message name="message">
-                        Problème lors de la sauvegarde d&apos;un script compilé : [REASON].  Veuillez réessayer de sauvegarder le script ultérieurement.
+                        Une erreur est survenue lors de l&apos;enregistrement du script compilé, suite au problème suivant : [REASON]. Essayez d&apos;enregistrer votre script ultérieurement.
                 </message>
         </alert>
         <alert name="CouldNotStartStopScript">
                 <message name="message">
-                        Impossible de démarrer ou d&apos;arrêter le script car l&apos;objet associé est introuvable.
-L&apos;objet est peut-être hors de portée ou a été supprimé.
+                        Impossible de lancer ou d&apos;arrêter le script car l&apos;objet qui le contient est introuvable.
+L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
                 </message>
         </alert>
         <alert name="CannotDownloadFile">
                 <message name="message">
-                        Téléchargement du fichier impossible
+                        Impossible de télécharger le fichier
                 </message>
         </alert>
         <alert name="CannotWriteEncode">
@@ -967,7 +960,7 @@ L&apos;objet est peut-être hors de portée ou a été supprimé.
         </alert>
         <alert name="CannotWriteFile">
                 <message name="message">
-                        Ecriture du fichier [[FILE]] impossible
+                        Impossible d&apos;écrire le fichier [[FILE]]
                 </message>
         </alert>
         <alert name="CannotLoadWearable">
@@ -989,7 +982,7 @@ Etes-vous sûr(e) de vouloir supprimer ces eléments ?
         </alert>
         <alert name="DisplaySettingsSafe">
                 <message name="message">
-                        Les paramètres d&apos;affichage ont été définis ont été définis aux valeurs du mode sans échec 
+                        Les paramètres d&apos;affichage ont été définis sur sécurisé 
 car vous avez activé le mode sans échec.
                 </message>
         </alert>
@@ -1016,9 +1009,6 @@ Voulez-vous visiter [_URL] pour plus d&apos;informations ?
                 <option name="No">
                         Non
                 </option>
-                <url>
-                        http://www.secondlife.com/corporate/sysreqs.php
-                </url>
         </alert>
         <alert name="UnsupportedGPU">
                 <message name="message">
@@ -1027,7 +1017,7 @@ Voulez-vous visiter [_URL] pour plus d&apos;informations ?
         </alert>
         <alert name="UnsupportedCPU">
                 <message name="message">
-                        - Votre CPU ne remplit pas les conditions minimum requises.
+                        - Votre processeur ne remplit pas les conditions minimum requises.
                 </message>
         </alert>
         <alert name="UnsupportedCPUAmount">
@@ -1125,7 +1115,7 @@ afin de signaler le problème.
         </alert>
         <alert name="CannotConnectVerificationError">
                 <message name="message">
-                        Connexion impossible à [SECOND_LIFE].
+                        Connexion à [SECOND_LIFE] impossible.
 Le serveur d&apos;identification a rencontré une erreur de connexion SSL.
 Si vous continuez à recevoir ce message d&apos;erreur, veuillez vous rendre
 à la rubrique Support de SecondLife.com pour
@@ -1134,20 +1124,20 @@ signaler ce problème.
         </alert>
         <alert name="CannotConnectUnknownErrorWindows">
                 <message name="message">
-                        Connexion impossible à [SECOND_LIFE].
+                        Connexion à [SECOND_LIFE] impossible.
 Malgré nos efforts, une erreur inattendue s&apos;est produite.
 Veuillez vous rendre à la rubrique Support du site SecondLife.com
-pour signaler ce problème.  Si possible, joignez votre fichier SecondLife.log
+pour signaler ce problème. Si possible, joignez votre fichier SecondLife.log
 qui se trouve à l&apos;emplacement suivant : C:\Documents and Settings\(nom)\Application Data\SecondLife\logs
 Merci.
                 </message>
         </alert>
         <alert name="CannotConnectUnknownErrorDarwin">
                 <message name="message">
-                        Connexion impossible à [SECOND_LIFE].
+                        Connexion à [SECOND_LIFE] impossible.
 Malgré nos efforts, une erreur inattendue s&apos;est produite.
 Veuillez vous rendre à la rubrique Support du site SecondLife.com
-pour signaler ce problème.  Si possible, joignez votre fichier SecondLife.log
+pour signaler ce problème. Si possible, joignez votre fichier SecondLife.log
 qui se trouve à l&apos;emplacement suivant : ~/Library/Application Support/SecondLife/logs
 Merci.
                 </message>
@@ -1155,7 +1145,7 @@ Merci.
         <alert name="CannotResolveLoginToken">
                 <message name="message">
                         Un problème est survenu lors de la résolution
-de votre identification. Veuillez réessayer
+de votre authentification. Veuillez réessayer
 de vous connecter. Si vous continuez à recevoir ce message d&apos;erreur,
 veuillez vous rendre à la rubrique Support du site SecondLife.com.
                 </message>
@@ -1177,7 +1167,7 @@ pour des conseils et un lien vers la page web d&apos;état du service.
         </alert>
         <alert name="CannotConnectNoReplyFromLogin">
                 <message name="message">
-                        Connexion impossible.  Pas de réponse de la base de données d&apos;identification.
+                        Connexion impossible. Pas de réponse de la région.
  
 Veuillez réessayer d&apos;ici quelques minutes, ou cliquez sur Aide
 pour des conseils et un lien vers la page web d&apos;état du service.
@@ -1191,7 +1181,7 @@ pour des conseils et un lien vers la page web d&apos;état du service.
         </alert>
         <alert name="CannotConnectLoginTimeout">
                 <message name="message">
-                        Temps d&apos;attente de connexion à votre localisation dépassé. Veuillez réessayer.
+                        Temps d&apos;attente de connexion à votre emplacement dépassé. Veuillez réessayer.
                 </message>
         </alert>
         <alert name="FirstRunDialog">
@@ -1226,7 +1216,7 @@ Veuillez vérifier votre connexion.
         </alert>
         <alert name="WelcomeToSecondLife">
                 <message name="message">
-                        Welcome to [SECOND_LIFE] ! 
+                        Bienvenue sur [SECOND_LIFE] ! 
  
 Utilisez les touches de direction pour vous déplacer.
  
@@ -1257,17 +1247,12 @@ Veuillez choisir le sexe de votre personnage.
         </alert>
         <alert name="RegionNoTerraforming">
                 <message name="message">
-                        La région [REGION] n&apos;autorise pas le terraforming.
-Vous devrez acquérir du terrain dans une autre partie du monde
-pour le terraformer.
+                        Le terraformage est interdit dans la région [REGION].
                 </message>
         </alert>
         <alert name="CannotCopyWarning">
                 <message name="message">
-                        Vous n&apos;êtes pas autorisé(e) à copier
-cet élément. Il disparaîtra de votre
-inventaire si vous le donnez. Voulez-vous
-vraiment offrir cet élément?
+                        Vous n&apos;êtes pas autorisé à copier cet objet et il disparaîtra de votre inventaire si vous le donnez. Souhaitez-vous vraiment offrir cet objet ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -1278,7 +1263,7 @@ vraiment offrir cet élément?
         </alert>
         <alert name="CannotGiveItem">
                 <message name="message">
-                        Impossible d&apos;offrir l&apos;élément d&apos;inventaire.
+                        Impossible de donner l&apos;objet de l&apos;inventaire.
                 </message>
         </alert>
         <alert name="TransactionCancelled">
@@ -1288,20 +1273,18 @@ vraiment offrir cet élément?
         </alert>
         <alert name="TooManyItems">
                 <message name="message">
-                        Impossible d&apos;offrir autant d&apos;éléments en un seul transfert d&apos;inventaire.
+                        Impossible de donner plus de 42 objets au cours d&apos;un seul transfert d&apos;inventaire.
                 </message>
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        Aucun élément cessible.
+                        Vous n&apos;êtes pas autorisé à transférer les objets sélectionnés.
                 </message>
         </alert>
         <alert name="CannotCopyCountItems">
                 <message name="message">
-                        Vous n&apos;êtes pas autorisé(e) à copier [COUNT] des
-éléments sélectionnés. Ces éléments disparaîtront
-de votre inventaire.
-Souhaitez-vous réellement donner ces éléments ?
+                        Vous n&apos;êtes pas autorisé à copier [COUNT] des objets sélectionnés. Ces objets disparaîtront de votre inventaire.
+Souhaitez-vous vraiment donner ces objets ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -1312,20 +1295,19 @@ Souhaitez-vous réellement donner ces éléments ?
         </alert>
         <alert name="CannotGiveCategory">
                 <message name="message">
-                        Impossible d&apos;offrir la catégorie d&apos;inventaire.
+                        Vous n&apos;êtes pas autorisé à transférer le dossier sélectionné.
                 </message>
         </alert>
         <alert name="FreezeAvatar">
                 <message name="message">
-                        Bloquer cet avatar?
-Il ou elle sera momentanément incapable de bouger, 
-chatter, ou interagir avec le monde.
+                        Geler cet avatar ?
+Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde.
                 </message>
                 <option name="Freeze">
-                        Figer
+                        Geler
                 </option>
                 <option name="Unfreeze">
-                        Débloquer
+                        Dégeler
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1348,13 +1330,13 @@ Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le M
         </alert>
         <alert name="EjectAvatar">
                 <message name="message">
-                        Ejecter cet avatar de votre terrain ?
+                        Expulser cet avatar de votre terrain ?
                 </message>
                 <option name="Eject">
-                        Ejecter
+                        Expulser
                 </option>
                 <option name="EjectandBan">
-                        Ejecter et bannir
+                        Expulser et bannir
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1368,7 +1350,29 @@ Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le M
                         Expulser
                 </option>
                 <option name="EjectandBan">
-                        Expulser et interdire
+                        Expulser et bannir
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="EjectAvatarNoBan">
+                <message name="message">
+                        Expulser cet avatar de votre terrain ?
+                </message>
+                <option name="Eject">
+                        Expulser
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="EjectAvatarFullnameNoBan">
+                <message name="message">
+                        Expulser [AVATAR_NAME] de votre terrain ?
+                </message>
+                <option name="Eject">
+                        Expulser
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1376,19 +1380,18 @@ Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le M
         </alert>
         <alert name="InvalidUUID">
                 <message name="message">
-                        uuid invalide
+                        UUID invalide
                 </message>
         </alert>
         <alert name="AcquireErrorTooManyObjects">
                 <message name="message">
-                        ERREUR D&apos;ACQUISITION : trop d&apos;objets sélectionnés.
+                        Erreur d&apos;acquisition : trop d&apos;objets sélectionnés.
                 </message>
         </alert>
         <alert name="AcquireErrorObjectSpan">
                 <message name="message">
-                        ERREUR D&apos;ACQUISITION : les objets sont répartis sur plus d&apos;une région.
-Veuillez déplacer tous les objets à acquérir dans la
-même région.
+                        Erreur d&apos;acquisition : les objets sont répartis dans plus d&apos;une région.
+Veuillez mettre tous les objets que vous souhaitez acquérir dans la même région.
                 </message>
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
@@ -1411,12 +1414,11 @@ Etes-vous sûr(e) de vouloir prendre ces eléments ?
         <alert name="PromptGoToCurrencyPage">
                 <message name="message">
                         [EXTRA]
- 
- 
-Aller à [URL] pour en savoir plus sur l&apos;achat de devises ?
+
+Aller sur [URL] pour obtenir des informations sur l&apos;achat de devises ?
                 </message>
                 <option name="GotoPage">
-                        Aller à la Page
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1426,38 +1428,38 @@ Aller à [URL] pour en savoir plus sur l&apos;achat de devises ?
                 <message name="message">
                         Impossible de lier ces [COUNT] objets.
 Vous pouvez lier un maximum de [MAX] objets.
-Veuillez sélectionner moins d&apos;objets.
                 </message>
         </alert>
         <alert name="CannotLinkIncompleteSet">
                 <message name="message">
-                        Vous ne pouvez lier que des séries complètes d&apos;objets, et devez
-sélectionner plus d&apos;un objet.
+                        Vous ne pouvez lier que des ensembles d&apos;objets complets et vous devez choisir un minimum de deux objets.
                 </message>
         </alert>
         <alert name="CannotLinkModify">
                 <message name="message">
-                        Liaison impossible car vous ne disposez pas des autorisations de modification
-pour tous les objets.  Assurez-vous qu&apos;ils soient tous déverrouillés, et
-qu&apos;ils vous appartiennent tous.
+                        Impossible de lier car vous n&apos;avez pas la permission de modifier tous les objets. 
+
+Assurez-vous que vous êtes le propriétaire de tous les objets et qu&apos;aucun d&apos;eux n&apos;est verrouillé.
                 </message>
         </alert>
         <alert name="CannotLinkDifferentOwners">
                 <message name="message">
-                        Liaison impossible car tous les objets n&apos;ont pas le même
-propriétaire. Veuillez vous assurer que tous les objets sélectionnés vous appartiennent.
+                        Impossible de lier car les objets n&apos;ont pas tous le même propriétaire. 
+
+Assurez-vous que vous êtes le propriétaire de tous les objets sélectionnés.
                 </message>
         </alert>
         <alert name="NoFileExtension">
                 <message name="message">
-                        Le fichier &apos;[FILE]&apos; n&apos;a pas d&apos;extension.
-Veuillez vous assurer que le fichier a une extension valide.
+                        Pas d&apos;extension pour le fichier suivant : &apos;[FILE]&apos;
+
+Assurez-vous que le fichier a l&apos;extension correcte.
                 </message>
         </alert>
         <alert name="InvalidFileExtension">
                 <message name="message">
-                        Extension de fichier invalide : [EXTENSION]
-Requise : [VALIDS]
+                        Extension de fichier [EXTENSION] invalide 
+[VALIDS] attendu
                 </message>
                 <option name="OK">
                         OK
@@ -1465,87 +1467,87 @@ Requise : [VALIDS]
         </alert>
         <alert name="CannotUploadSoundFile">
                 <message name="message">
-                        Impossible de lire le fichier son uploadé :
+                        Impossible de lire le fichier son chargé :
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotRIFF">
                 <message name="message">
-                        Le fichier n&apos;est pas un fichier de type RIFF WAVE : 
+                        Il semble que le fichier ne soit pas un fichier RIFF WAVE : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotPCM">
                 <message name="message">
-                        Le fichier n&apos;est pas un fichier audio de type PCM WAVE : 
+                        Il semble que le fichier ne soit pas un fichier audio PCM WAVE : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidChannelCount">
                 <message name="message">
-                        Le fichier a un nombre de canaux invalide (doit être mono ou stereo) : 
+                        Le fichier contient un nombre de canaux invalide (doit être mono ou stéréo) : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidSampleRate">
                 <message name="message">
-                        Le fichier a un taux d&apos;échantillonage non supporté (doit être en 44.1kHz) : 
+                        Le fichier ne semble pas être pris en charge (doit être 44,1 k) : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidWordSize">
                 <message name="message">
-                        Le fichier a une longueur de mots non supportée (doit être en 8 ou 16-bit) : 
+                        Le fichier ne semble pas être pris en charge (doit faire 8 ou 16 bit) : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidHeader">
                 <message name="message">
-                        Segment &apos;données&apos; introuvable dans l&apos;en-tête WAV : 
+                        Impossible de trouver les données dans l&apos;en-tête WAV : 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidTooLong">
                 <message name="message">
-                        Le fichier audio est trop long (10 secondes max.) : 
+                        Le fichier audio est trop long (10 secondes maximum) : 
 [FILE]
                 </message>
         </alert>
         <alert name="ProblemWithFile">
                 <message name="message">
-                        Erreur du fichier [FILE]:
+                        Problème avec le fichier [FILE] :
  
 [ERROR]
                 </message>
         </alert>
         <alert name="CannotOpenTemporarySoundFile">
                 <message name="message">
-                        Impossible d&apos;ouvrir le fichier son compressé temporaire à écrire : [FILE]
+                        Impossible d&apos;ouvrir le fichier son compressé temporaire : [FILE]
                 </message>
         </alert>
         <alert name="UnknownVorbisEncodeFailure">
                 <message name="message">
-                        Erreur d&apos;encodage vorbis inconnue du fichier : [FILE]
+                        Échec d&apos;encodage Vorbis inconnu sur : [FILE]
                 </message>
         </alert>
         <alert name="CorruptResourceFile">
                 <message name="message">
-                        fichier ressource corrompu : [FILE]
+                        Fichier ressource corrompu : [FILE]
                 </message>
         </alert>
         <alert name="UnknownResourceFileVersion">
                 <message name="message">
-                        version de fichier ressource linden inconnue : [FILE]
+                        Version de fichier ressource Linden inconnu : [FILE]
                 </message>
         </alert>
         <alert name="UnableToCreateOutputFile">
                 <message name="message">
-                        Impossible de créer le fichier : [FILE]
+                        Impossible de créer le fichier de sortie : [FILE]
                 </message>
         </alert>
         <alert name="DoNotSupportBulkAnimationUpload">
                 <message name="message">
-                        L&apos;upload de fichiers d&apos;animation par lots n&apos;est pas encore possible.
+                        Actuellement, nous ne prenons pas en charge le chargement de lots de fichiers d&apos;animation.
                 </message>
         </alert>
         <alert name="CannotAccessOutputFile">
@@ -1555,60 +1557,57 @@ Requise : [VALIDS]
         </alert>
         <alert name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        Fonds insuffisants pour uploader [FILE] : il vous faut L$[COST], votre solde est de L$[BALANCE]
+                        Vous n&apos;avez pas suffisamment de L$ pour charger le fichier : le chargement coûte [COST] L$ et votre solde est de [BALANCE] L$
                 </message>
         </alert>
         <alert name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        Fonds insuffisants pour terminer l&apos;upload de [FILE] : il vous faut L$[COST], votre solde est de L$[BALANCE]
+                        Vous n&apos;avez pas suffisamment de L$ pour finir de charger le fichier [FILE] : le chargement coûte [COST] L$ et votre solde est de [BALANCE] L$
                 </message>
         </alert>
         <alert name="CannotUploadReason">
                 <message name="message">
-                        Upload du fichier [FILE] impossible : [REASON]
+                        Impossible de charger [FILE] suite au problème suivant : [REASON]
 Veuillez réessayer ultérieurement.
                 </message>
         </alert>
         <alert name="CannotCreateLandmarkNotOwner">
                 <message name="message">
-                        Vous ne pouvez créer un repère ici
-car le propriétaire du terrain ne l&apos;autorise pas.
-Essayez de vous déplacer de quelques mètres.
+                        Vous ne pouvez pas créer de repère ici car le propriétaire du terrain ne l&apos;autorise pas.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoScripts">
                 <message name="message">
-                        Recompilation impossible.
-Sélectionnez des objets dont les scripts
-sont valides.
+                        Impossible d&apos;effectuer les recompilations.
+Sélectionnez un objet avec un script.
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoPermission">
                 <message name="message">
-                        Recompilation impossible.
-Sélectionnez des objets dont vous êtes
-autorisé(e) à modifier les scripts.
+                        Impossible d&apos;effectuer les recompilations.
+
+Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoScripts">
                 <message name="message">
-                        Réinitialisation impossible.
-Sélectionnez des objets dont les scripts
-sont valides.
+                        Impossible d&apos;effectuer la réinitialisation.
+
+Veuillez sélectionner des objets avec des scripts.
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoPermission">
                 <message name="message">
-                        Réinitialisation impossible.
-Sélectionnez des objets dont vous êtes
-autorisé(e) à modifier les scripts.
+                        Impossible d&apos;effectuer la réinitialisation.
+
+Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoScripts">
                 <message name="message">
-                        Impossible de commander le démarrage de scripts.
-Sélectionnez des objets dont les scripts
-sont valides.
+                        Impossible de définir les scripts sur « exécution ».
+
+Veuillez sélectionner des objets avec des scripts.
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoPermission">
@@ -1620,9 +1619,9 @@ autorisé(e) à modifier les scripts.
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoScripts">
                 <message name="message">
-                        Impossible de commander l&apos;arrêt de scripts.
-Sélectionnez des objets dont les scripts
-sont valides.
+                        Impossible de définir les scripts sur « non-exécution ».
+
+Veuillez sélectionner des objets avec des scripts.
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoPermission">
@@ -1634,7 +1633,7 @@ autorisé(e) à modifier les scripts.
         </alert>
         <alert name="NoFrontmostFloater">
                 <message name="message">
-                        No frontmost floater to save
+                        Aucun floater frontmost à sauvegarder.
                 </message>
         </alert>
         <alert name="SeachFilteredOnShortWords">
@@ -1656,7 +1655,7 @@ Recherche effectuée : [FINALQUERY]
         </alert>
         <alert name="ColladaExportFailedInvalidPermissions">
                 <message name="message">
-                        Erreur d&apos;export Collada : Autorisations non valables ou objet verrouillé !
+                        Erreur d&apos;export Collada : autorisations non valables ou objet verrouillé !
                 </message>
         </alert>
         <alert name="ColladaExportFailedUnknownError">
@@ -1681,30 +1680,27 @@ Recherche effectuée : [FINALQUERY]
         </alert>
         <alert name="CouldNotTeleportReason">
                 <message name="message">
-                        Téléportation impossible.
+                        Impossible de téléporter.
 [REASON]
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerNothingSelected">
                 <message name="message">
-                        Impossible de définir le propriétaire :
-Sélection vide.
+                        Impossible de définir le propriétaire foncier :
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerMultipleRegions">
                 <message name="message">
-                        Impossible de forcer la propriété du terrain car la sélection couvre plusieurs
-régions. Veuillez sélectionner une zone plus petite et réessayez.
+                        Impossible de définir un propriétaire car la sélection couvre plusieurs régions. Veuillez sélectionner une zone plus petite et réessayer.
                 </message>
         </alert>
         <alert name="ForceOwnerAuctionWarning">
                 <message name="message">
-                        Cette parcelle a été mise aux enchères. Forcer la propriété
-annulera les enchères, ce qui peut mécontenter certains résidents
-si les enchères ont débuté. Forcer la propriété ?
+                        Cette parcelle est mise aux enchères. Définir un propriétaire annulerait les enchères, ce qui pourrait être gênant pour certains résidents si ces dernières ont commencé. Souhaitez-vous définir un propriétaire ?
                 </message>
                 <option name="Force">
-                        Forcer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1712,32 +1708,32 @@ si les enchères ont débuté. Forcer la propriété ?
         </alert>
         <alert name="CannotContentifyNothingSelected">
                 <message name="message">
-                        Ajout de contenu impossible :
-Sélection vide.
+                        Problème :
+Aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotContentifyNoRegion">
                 <message name="message">
-                        Ajout de contenu impossible :
-Aucune région.
+                        Problème :
+Aucune région sélectionnée.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNothingSelected">
                 <message name="message">
-                        Impossible de céder le terrain :
-Sélection vide.
+                        Impossible d&apos;abandonner le terrain :
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoRegion">
                 <message name="message">
-                        Impossible de céder le terrain :
-région introuvable.
+                        Impossible d&apos;abandonner le terrain :
+la région est introuvable.
                 </message>
         </alert>
         <alert name="CannotBuyLandNothingSelected">
                 <message name="message">
                         Impossible d&apos;acheter le terrain :
-Sélection vide.
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotBuyLandNoRegion">
@@ -1753,28 +1749,29 @@ la région dans laquelle il est situé est introuvable.
         </alert>
         <alert name="CannotDeedLandNothingSelected">
                 <message name="message">
-                        Transfert du terrain impossible :
-Sélection vide.
+                        Cession du terrain impossible :
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoGroup">
                 <message name="message">
-                        Transfert du terrain impossible :
-Aucun groupe.
+                        Cession du terrain impossible :
+aucun groupe sélectionné.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoRegion">
                 <message name="message">
-                        Transfert du terrain impossible :
-La région contenant ce terrain est introuvable.
-Veuillez utiliser Aide -&gt; Signaler un bug pour envoyer un rapport.
+                        Cession du terrain impossible :
+la région dans laquelle il est situé est introuvable.
+Veuillez utiliser Aide &gt; Signaler des bugs pour signaler le problème.
                 </message>
         </alert>
         <alert name="CannotDeedLandMultipleSelected">
                 <message name="message">
-                        Transfert du terrain impossible :
-Plusieurs parcelles distinctes sélectionnées.
-Essayez de sélectionner une surface plus petite.
+                        Cession du terrain impossible :
+plusieurs parcelles sélectionnées.
+
+Essayez de ne sélectionner qu&apos;une seule parcelle.
                 </message>
         </alert>
         <alert name="RegionNotFound">
@@ -1784,18 +1781,14 @@ Essayez de sélectionner une surface plus petite.
         </alert>
         <alert name="ParcelCanPlayMedia">
                 <message name="message">
-                        Cet endroit peut diffuser un flux vidéo. 
+                        Cette parcelle propose des flux de média. 
+Pour jouer des flux de média, il faut avoir une connexion internet rapide.
  
-Le flux vidéo requiert une connexion internet 
-d&apos;un débit de 768 kbps ou plus .
- 
-Lire le flux vidéo lorsque disponible ?
- 
-(Vous pouvez modifier cette option à tout moment dans
-Préferences &gt; Audio &amp; Vidéo.)
+Jouer les flux de média lorsqu&apos;ils sont disponibles ?
+(Vous pourrez modifier cette option ultérieurement sous Préférences &gt; Audio et Vidéo.)
                 </message>
                 <option name="PlayMedia">
-                        Lire le media
+                        Jouer le média
                 </option>
                 <option name="Disable">
                         Désactiver
@@ -1803,69 +1796,72 @@ Préferences &gt; Audio &amp; Vidéo.)
         </alert>
         <alert name="CannotDeedLandWaitingForServer">
                 <message name="message">
-                        Transfert du terrain impossible :
-Données de propriété en attente du serveur.
-Réessayez d&apos;ici quelques secondes.
+                        Cession du terrain impossible :
+rapport de propriété sur le point d&apos;être envoyé par le serveur.
+
+Merci de réessayer.
                 </message>
         </alert>
         <alert name="CannotDeedLandNoTransfer">
                 <message name="message">
-                        Transfert du terrain impossible :
-La région [REGION] n&apos;autorise pas le transfert de terrain.
+                        Cession du terrain impossible :
+la cession de terrain est interdite dans la région [REGION].
                 </message>
         </alert>
         <alert name="CannotReleaseLandWatingForServer">
                 <message name="message">
-                        Impossible de céder le terrain :
-En attente du serveur pour le calcul du coût.
-Veuillez réessayer d&apos;ici quelques secondes.
+                        Impossible d&apos;abandonner le terrain :
+mise à jour des informations sur la parcelle sur le point d&apos;être envoyée par le serveur.
+
+Veuillez réessayer dans quelques secondes.
                 </message>
         </alert>
         <alert name="CannotReleaseLandSelected">
                 <message name="message">
-                        Impossible de céder le terrain :
-plusieurs parcelles distinctes sélectionnées.
-Essayez de sélectionner une surface plus petite.
+                        Impossible d&apos;abandonner le terrain :
+vous n&apos;êtes pas le propriétaire des parcelles sélectionnées.
+
+Veuillez sélectionner une seule parcelle.
                 </message>
         </alert>
         <alert name="CannotReleaseLandDontOwn">
                 <message name="message">
-                        Impossible de céder le terrain :
-Vous n&apos;êtes pas autorisé(e) à libérer cette parcelle.
-Les parcelles vous appartenant sont affichées en vert.
+                        Impossible d&apos;abandonner le terrain :
+vous n&apos;avez pas la permission de libérer cette parcelle.
+Les parcelles qui vous appartiennent sont en vert.
                 </message>
         </alert>
         <alert name="CannotReleaseLandRegionNotFound">
                 <message name="message">
-                        Impossible de céder le terrain :
+                        Impossible d&apos;abandonner le terrain :
 la région dans laquelle il est situé est introuvable.
-Utilisez Aide -&gt; Signaler un bug pour envoyer un rapport.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoTransfer">
                 <message name="message">
-                        Impossible de céder le terrain :
-La région [REGION] n&apos;autorise pas la cession de terrain.
+                        Impossible d&apos;abandonner le terrain :
+le transfert de terrain est interdit dans la région [REGION].
                 </message>
         </alert>
         <alert name="CannotReleaseLandPartialSelection">
                 <message name="message">
-                        Impossible de céder le terrain :
-Vous devez sélectionner une parcelle entière pour la libérer.
-Essayez de double-cliquer pour sélectionner une parcelle entière, ou
-divisez votre parcelle au préalable.
+                        Impossible d&apos;abandonner le terrain :
+vous devez sélectionner une parcelle entière pour la libérer.
+
+Sélectionnez toute la parcelle ou divisez-la d&apos;abord.
                 </message>
         </alert>
         <alert name="ReleaseLandWarning">
                 <message name="message">
-                        Vous vous apprêtez à libérer [AREA] m2 de terrain.
-Cette parcelle sera retirée de vos possessions de terrain,
-mais ne vous rapportera aucun L$.
- 
-Libérer ce terrain ?
+                        Vous vous apprêtez à libérer [AREA] m² de terrain.
+Si vous libérez cette parcelle, elle sera supprimée de votre patrimoine, mais vous ne recevrez pas de L$.
+
+Libérer ce terrain ?
                 </message>
                 <option name="Release">
-                        Relâcher
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1874,27 +1870,26 @@ Libérer ce terrain ?
         <alert name="CannotDivideLandNothingSelected">
                 <message name="message">
                         Division du terrain impossible :
-Sélection vide.
+
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotDivideLandPartialSelection">
                 <message name="message">
                         Division du terrain impossible :
-Vous avez sélectionné une parcelle entière.
-Essayez de sélectionner une surface plus petite
-en cliquant/glissant.
+
+Toute la parcelle est sélectionnée.
+Sélectionnez une partie de la parcelle uniquement.
                 </message>
         </alert>
         <alert name="LandDivideWarning">
                 <message name="message">
-                        Diviser ce terrain séparera la parcelle en deux,
-chaque parcelle pouvant disposer de réglages spécifiques. Certains réglages
-seront réinitialisés à l&apos;issue de cette opération.
+                        Si vous divisez ce terrain, cette parcelle sera partagée en deux et chaque parcelle pourra avoir ses propres paramètres. Après cette opération, certains paramètres reviendront aux paramètres par défaut.
  
-Diviser le terrain ?
+Diviser le terrain ?
                 </message>
                 <option name="Divide">
-                        Diviser
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1903,51 +1898,50 @@ Diviser le terrain ?
         <alert name="CannotDivideLandNoRegion">
                 <message name="message">
                         Division du terrain impossible :
-La région dans laquelle il est situé est introuvable.
-Veuillez utiliser Aide -&gt; Signaler un bug pour envoyer un rapport.
+la région dans laquelle il est situé est introuvable.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
                 </message>
         </alert>
         <alert name="CannotJoinLandNoRegion">
                 <message name="message">
                         Impossible de fusionner le terrain :
-La région dans laquelle il est situé est introuvable.
-Veuillez utiliser Aide -&gt; Signaler un bug pour envoyer un rapport.
+la région dans laquelle il est situé est introuvable.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
                 </message>
         </alert>
         <alert name="CannotJoinLandNothingSelected">
                 <message name="message">
                         Impossible de fusionner le terrain :
-Sélection vide.
+aucune parcelle sélectionnée.
                 </message>
         </alert>
         <alert name="CannotJoinLandEntireParcelSelected">
                 <message name="message">
                         Impossible de fusionner le terrain :
-Vous avez sélectionné une parcelle entière.
-Essayez de sélectionner une surface plus grande
-en cliquant/glissant.
+vous avez sélectionné une seule parcelle.
+
+Sélectionnez le terrain sur les deux parcelles.
                 </message>
         </alert>
         <alert name="CannotJoinLandSelection">
                 <message name="message">
                         Impossible de fusionner le terrain :
-Vous devez sélectionner plus d&apos;une parcelle.
-Essayez de sélectionner une surface plus grande
-en cliquant/glissant.
+vous devez sélectionner au moins deux parcelles.
+
+Sélectionnez le terrain sur les deux parcelles.
                 </message>
         </alert>
         <alert name="JoinLandWarning">
                 <message name="message">
-                        Fusionner ce terrain créera une grande parcelle
-à partir de toutes les parcelles présentes dans le rectangle de sélection.
- 
-Vous devrez réinitialiser le nom et les options
-de la nouvelle parcelle. 
+                        En fusionnant ce terrain, vous créerez une grande parcelle composée de toutes les parcelles se trouvant dans le rectangle sélectionné. 
+Vous devrez réinitialiser le nom et les options de la nouvelle parcelle.
  
-Fusionner le terrain ?
+Fusionner le terrain ?
                 </message>
                 <option name="Join">
-                        Fusionner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1966,7 +1960,7 @@ Fusionner le terrain ?
         </alert>
         <alert name="ConfirmLandmarkCopy">
                 <message name="message">
-                        Copier cet élément vers votre inventaire ?
+                        Copier ce repère dans votre inventaire ?
                 </message>
                 <option name="Copy">
                         Copie
@@ -1977,10 +1971,10 @@ Fusionner le terrain ?
         </alert>
         <alert name="ConfirmItemCopy">
                 <message name="message">
-                        Copier cet élément vers votre inventaire ?
+                        Copier cet objet dans votre inventaire ?
                 </message>
                 <option name="Copy">
-                        Copie
+                        Copier
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -1988,34 +1982,30 @@ Fusionner le terrain ?
         </alert>
         <alert name="ResolutionSwitchFail">
                 <message name="message">
-                        Impossible de changer la résolution en [RESX] par [RESY]
+                        Échec du changement de résolution (à [RESX], de [RESY])
                 </message>
         </alert>
         <alert name="ErrorUndefinedGrasses">
                 <message name="message">
-                        Erreur : Pelouses indéfinies : [SPECIES]
+                        Erreur : herbes non identifiées  : [SPECIES]
                 </message>
         </alert>
         <alert name="ErrorUndefinedTrees">
                 <message name="message">
-                        Erreur : Arbres indéfinis : [SPECIES]
+                        Erreur : arbres non identifiés : [SPECIES]
                 </message>
         </alert>
         <alert name="CannotSaveWearableOutOfSpace">
                 <message name="message">
-                        Impossible de sauvegarder le fichier endossable &apos;[NAME]&apos;. Vous devez
-libérer de l&apos;espace disque sur votre ordinateur et
-sauvegarder le fichier à nouveau.
+                        Impossible de sauvegarder [NAME]. Pour pouvoir sauvegarder ce fichier, vous devez d&apos;abord libérer de la mémoire sur votre ordinateur.
                 </message>
         </alert>
         <alert name="CannotSaveToAssetStore">
                 <message name="message">
                         Impossible de sauvegarder le fichier [NAME] dans la base de données centrale.
-Cette erreur est généralement temporaire. Veuillez
-éditer et sauvegarder l&apos;élément endossable à nouveau
-d&apos;ici quelques minutes. Si le problème persiste, veuillez
-cliquer sur &apos;Aide | Signaler un bug&apos; dans le menu déroulant
-en indiquant les paramètres de votre réseau.
+Cette erreur est généralement temporaire. Veuillez éditer et sauvegarder l&apos;élément endossable à nouveau d&apos;ici quelques minutes. 
+
+Si le problème persiste, veuillez cliquer sur Aide | Signaler un bug dans le menu déroulant en indiquant les détails de votre connexion.
                 </message>
         </alert>
         <alert name="AppEarlyExit">
@@ -2033,16 +2023,12 @@ www.secondlife.com/support.
         </alert>
         <alert name="YouHaveBeenLoggedOut">
                 <message name="message">
-                        Vous avez été déconnecté(e) de [SECOND_LIFE]:
- 
-[MESSAGE]
- 
-Cliquez sur Continuer pour afficher les IM et le chat.
-Vous ne pourrez pas effectuer d&apos;autres opérations.
-Cliquez sur Quitter pour quitter [SECOND_LIFE] maintenant.
+                        Vous avez été déconnecté(e) de [SECOND_LIFE] :
+            [MESSAGE]
+Vous pouvez afficher vos messages instantanés et votre chat en cliquant sur Afficher IM et chat. Sinon, cliquez sur Quitter pour quitter immédiatement [SECOND_LIFE].
                 </message>
                 <option name="Continue">
-                        Continuer
+                        Afficher IM et chat
                 </option>
                 <option name="Quit">
                         Quitter
@@ -2050,32 +2036,28 @@ Cliquez sur Quitter pour quitter [SECOND_LIFE] maintenant.
         </alert>
         <alert name="OnlyOfficerCanBuyLand">
                 <message name="message">
-                        Impossible d&apos;acheter le terrain pour le groupe :
-Vous n&apos;êtes pas autorisé(e) à acheter du terrain pour votre groupe actif.
-Veuillez activer un autre groupe dans Edition -&gt; Groupes…
+                        Impossible d&apos;acheter du terrain pour le groupe :
+Vous n&apos;avez pas la permission d&apos;acheter de terrain pour votre groupe.
                 </message>
         </alert>
-        <alert name="AddFriend" title="Ajouter comme ami(e)">
+        <alert name="AddFriend" title="Devenir amis">
                 <message name="message">
-                        Les amis peuvent se localiser sur la carte et 
-reçoivent des notifications de présence. 
- 
-Proposer à [NAME] de devenir votre ami(e)?
+                        Vous pouvez suivre les déplacements de vos amis sur la carte et voir lorsqu&apos;ils se connectent.
+
+Proposer à [NAME] de devenir votre ami(e) ?
                 </message>
                 <option name="Offer">
-                        Offrir
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
-                Voulez-vous être mon ami ?
         </alert>
-        <alert name="AddFriendWithMessage" title="Ajouter comme ami">
+        <alert name="AddFriendWithMessage" title="Devenir amis">
                 <message name="message">
-                        Vous pouvez suivre les déplacements de vos
-amis sur la carte et voir lorsqu&apos;ils se connectent.
+                        Vous pouvez suivre les déplacements de vos amis sur la carte et voir lorsqu&apos;ils se connectent.
 
-Proposer à [NAME] de devenir votre ami ?
+Proposer à [NAME] de devenir votre ami(e) ?
                 </message>
                 <editline name="editline">
                         Voulez-vous être mon ami(e) ?
@@ -2089,10 +2071,10 @@ Proposer à [NAME] de devenir votre ami ?
         </alert>
         <alert name="RemoveFromFriends">
                 <message name="message">
-                        Souhaitez-vous retirer [FIRST_NAME] [LAST_NAME] de votre liste d&apos;amis ?
+                        Voulez-vous supprimer [FIRST_NAME] [LAST_NAME] de votre liste d&apos;amis ?
                 </message>
                 <option name="Remove">
-                        Retirer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2100,7 +2082,7 @@ Proposer à [NAME] de devenir votre ami ?
         </alert>
         <alert name="RemoveMultipleFromFriends">
                 <message name="message">
-                        Voulez-vous supprimer plusieurs personnes de votre liste d&apos;amis ?
+                        Voulez-vous supprimer plusieurs résidents de votre liste d&apos;amis ?
                 </message>
                 <option name="Remove">
                         OK
@@ -2111,14 +2093,10 @@ Proposer à [NAME] de devenir votre ami ?
         </alert>
         <alert name="GodDeleteAllScriptedPublicObjectsByUser">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir supprimer tous les objets scriptés appartenant à
- 
-** [AVATAR_NAME] **
- 
-sur tous les autres terrains de ce sim?
+                        Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains des autres résidents dans cette région ?
                 </message>
                 <option name="DELETE!!">
-                        SUPPRIMER !!
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2126,14 +2104,10 @@ sur tous les autres terrains de ce sim?
         </alert>
         <alert name="GodDeleteAllScriptedObjectsByUser">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir SUPPRIMER TOUS les objets scriptés appartenant à
- 
-** [AVATAR_NAME] **
- 
-sur L&apos;ENSEMBLE DU TERRAIN de ce sim ?
+                        Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!TOUT SUPPRIMER!!
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2141,15 +2115,10 @@ sur L&apos;ENSEMBLE DU TERRAIN de ce sim ?
         </alert>
         <alert name="GodDeleteAllObjectsByUser">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir SUPPRIMER TOUS les objets (scriptés ou non) 
-appartenant à
- 
-** [AVATAR_NAME] **
- 
-sur L&apos;ENSEMBLE DU TERRAIN de ce sim ?
+                        Êtes-vous certain de vouloir supprimer tous les objets (scriptés ou pas) appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!TOUT SUPPRIMER!!
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2158,22 +2127,22 @@ sur L&apos;ENSEMBLE DU TERRAIN de ce sim ?
         <alert name="PublishGroupInfoToWeb">
                 <message name="message">
                         L&apos;option &quot;Publier sur le Web&quot; nous permet de publier
-le nom du groupe, son insigne, sa charte, ses titres, et ses fondateurs sur le
+le nom du groupe, son logo, sa charte, ses titres et ses fondateurs sur le
 site [SECOND_LIFE]. Il est de votre responsabilité d&apos;indiquer si 
-tout ou partie du contenu ci-dessus est considéré comme Adulte au regard
-des règles de base de la Communauté.
+tout ou partie du contenu ci-dessus est considéré comme Adulte selon
+les règles de base de la Communauté.
                 </message>
         </alert>
         <alert name="BlankClassifiedName">
                 <message name="message">
-                        Vous devez remplir le champ &quot;nom&quot; de votre petite annonce.
+                        Vous devez choisir un nom pour votre petite annonce.
                 </message>
         </alert>
         <alert name="MinClassifiedPrice">
                 <message name="message">
-                        Les frais d&apos;insertion minimum sont de L$[MIN_PRICE].
+                        Le coût de l&apos;annonce doit être de [MIN_PRICE] L$ minimum.
  
-Veuillez entrer une somme plus importante.
+Veuillez saisir un montant plus élevé.
                 </message>
         </alert>
         <alert name="CantLoadVertexShaders">
@@ -2183,166 +2152,160 @@ Veuillez entrer une somme plus importante.
         </alert>
         <alert name="ConfirmObjectDeleteLock">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces eléments ?
+                        Au moins un des objets que vous avez sélectionnés est verrouillé.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteNoCopy">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces eléments ?
+                        Au moins un des objets que vous avez sélectionnés n&apos;est pas reproductible.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteNoOwn">
                 <message name="message">
-                        Au moins un objet ne vous appartient pas.
-Vous pouvez toutefois supprimer la sélection.
-Etes-vous sûr(e) de vouloir supprimer ces eléments ?
+                        Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopy">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Au moins un objet est non copiable.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces éléments ?
+                        Au moins un des objets est verrouillé.
+Au moins un des objets n&apos;est pas reproductible.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteLockNoOwn">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Au moins un objet ne vous appartient pas.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces eléments ?
+                        Au moins un des objets est verrouillé.
+Au moins un des objets ne vous appartient pas.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteNoCopyNoOwn">
                 <message name="message">
-                        Au moins un objet est non copiable.
-Au moins un objet ne vous appartient pas.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces eléments ?
+                        Au moins un des objets n&apos;est pas reproductible.
+Au moins un des objets ne vous appartient pas.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Au moins un objet est non copiable.
-Au moins un objet ne vous appartient pas.
-Vous pouvez toutefois supprimer la sélection en cours.
-Etes-vous sûr(e) de vouloir supprimer ces éléments ?
+                        Au moins un des objets est verrouillé.
+Au moins un des objets n&apos;est pas reproductible.
+Au moins un des objets ne vous appartient pas.
+
+Êtes-vous certain de vouloir supprimer ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectTakeLock">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Vous pouvez toutefois prendre la sélection en cours.
-Etes-vous sûr(e) de vouloir prendre ces éléments ?
+                        Au moins un des objets est verrouillé.
+
+Êtes-vous certain de vouloir prendre ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectTakeNoOwn">
                 <message name="message">
-                        Vous n&apos;êtes pas propriétaire de tous les objets que vous prenez.
-Si vous continuez, de nouvelles autorisations de propriété
-seront appliquées aux objets, pouvant restreindre votre
-capacité à les modifier ou les copier à l&apos;avenir.
-Vous pouvez toutefois prendre la sélection en cours.
-Etes-vous sûr(e) de vouloir prendre ces éléments?
+                        Vous n&apos;êtes pas le propriétaire de tous les objets que vous prenez.
+Si vous continuez, les permissions accordées au prochain propriétaire entreront en vigueur et vous risquez de ne plus pouvoir modifier ou copier les objets.
+
+Êtes-vous certain de vouloir prendre ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmObjectTakeLockNoOwn">
                 <message name="message">
-                        Au moins un objet est verrouillé.
-Vous n&apos;êtes pas propriétaire de tous les objets sélectionnés.
-Si vous poursuivez, de nouvelles autorisations de propriété
-seront appliquées aux objets, pouvant restreindre
-votre capacité à les modifier ou les copier à l&apos;avenir.
-Vous pouvez toutefois prendre la sélection.
-Etes-vous sûr(e) de vouloir prendre ces eléments ?
+                        Au moins un des objets est verrouillé.
+Vous n&apos;êtes pas le propriétaire de tous les objets que vous prenez.
+Si vous continuez, les permissions accordées au prochain propriétaire entreront en vigueur et vous risquez de ne plus pouvoir modifier ou copier les objets.
+Par contre, vous pouvez prendre les objets sélectionnés.
+
+Êtes-vous certain de vouloir prendre ces objets ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="CantBuyLandAcrossMultipleRegions">
                 <message name="message">
-                        Impossible d&apos;acheter le terrain car la sélection s&apos;étend sur plusieurs régions.
-Veuillez sélectionner une surface plus petite et recommencez.
+                        Impossible d&apos;acheter le terrain car la sélection couvre plusieurs régions.
+
+Veuillez sélectionner une zone plus petite et réessayer.
                 </message>
         </alert>
         <alert name="DeedLandToGroup">
                 <message name="message">
-                        En transférant cette parcelle, le groupe devra
-posséder et maintenir des crédits terrain suffisants. 
- 
-Le prix d&apos;achat du terrain n&apos;est pas remboursé
-au propriétaire. A la vente d&apos;une parcelle transférée, le prix
-de vente est divisé équitablement entre les membres du groupe. 
- 
-Transférer les [AREA] m2 de terrain au groupe
-&apos;[GROUP_NAME]&apos; ?
+                        Si vous cédez ce terrain, le groupe devra
+avoir les moyens de le prendre en charge.
+Le prix de la vente du terrain n&apos;est pas remboursé par le propriétaire. Si la parcelle que vous cédez se vend, le prix de la vente sera divisé en parts égales parmi les membres du groupe.
+
+Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
                 </message>
                 <option name="Deed">
-                        Transférer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2350,21 +2313,15 @@ Transférer les [AREA] m2 de terrain au groupe
         </alert>
         <alert name="DeedLandToGroupWithContribution">
                 <message name="message">
-                        En transférant cette parcelle, le groupe devra
-posséder et maintenir des crédits terrain suffisants. 
- 
-Ce transfert incluera une contribution de terrain
-simultanée au groupe de la part de &apos;[FIRST_NAME] [LAST_NAME]&apos;.
- 
-Le prix d&apos;achat du terrain n&apos;est pas remboursé
-au propriétaire. A la vente d&apos;une parcelle transférée, le prix
-de vente est divisé équitablement entre les membres du groupe. 
+                        Si vous cédez ce terrain, le groupe devra
+avoir les moyens de le prendre en charge.
+La cession incluera une contribution de terrain simultanée au groupe de [FIRST_NAME] [LAST_NAME].
+Le prix de la vente du terrain n&apos;est pas remboursé par le propriétaire. Si la parcelle que vous cédez se vend, le prix de la vente sera divisé en parts égales parmi les membres du groupe.
  
-Transférer les [AREA] m2 de terrain au groupe
-&apos;[GROUP_NAME]&apos; ?
+Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
                 </message>
                 <option name="Deed">
-                        Transférer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2372,14 +2329,12 @@ Transférer les [AREA] m2 de terrain au groupe
         </alert>
         <alert name="DisplaySetToSafe">
                 <message name="message">
-                        Les paramètres d&apos;affichage ont été définis ont été définis aux valeurs du mode sans échec 
-car vous avez activé le mode sans échec.
+                        Les paramètres d&apos;affichage sont au niveau le plus sûr, comme vous l&apos;aviez indiqué.
                 </message>
         </alert>
         <alert name="DisplaySetToRecommended">
                 <message name="message">
-                        Les paramètres d&apos;affichage ont été définis aux valeurs recommandées
-d&apos;après votre configuration matérielle.
+                        Vos paramètres d&apos;affichage ont été réglés avec une marge de sécurité en fonction de votre configuration système.
                 </message>
         </alert>
         <alert name="UnableToConnect">
@@ -2412,7 +2367,7 @@ Connexion impossible à [IP_ADDRESS]
         </alert>
         <alert name="SystemMayBeDown">
                 <message name="message">
-                        Connexion impossible à [SECOND_LIFE]
+                        Connexion à [SECOND_LIFE] impossible
 Le service est peut-être interrompu.
 Veuillez réessayer d&apos;ici quelques minutes, ou cliquez sur Aide
 pour des conseils et un lien vers la page web d&apos;état du service.
@@ -2429,11 +2384,16 @@ pour des conseils et un lien vers la page web d&apos;état du service.
                         [ERROR_MESSAGE]
                 </message>
         </alert>
+        <alert name="AvatarMoved">
+                <message name="message">
+                        L&apos;emplacement [TYPE] n&apos;est pas disponible actuellement. [HELP] 
+Vous avez été déplacé dans une région voisine.
+                </message>
+        </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        Vos vêtements sont en cours de téléchargement.
-Vous pouvez utiliser le monde normalement, les autres utilisateurs
-vous verront correctement.
+                        Vos habits sont toujours en train d&apos;être téléchargés. 
+Vous pouvez utiliser [SECOND_LIFE] sans problème, les autres résidents vous voient normalement.
                 </message>
                 <ignore name="ignore">
                         Lorsque les habits prennent longtemps à télécharger
@@ -2442,14 +2402,12 @@ vous verront correctement.
         <alert name="FirstRun">
                 <message name="message">
                         L&apos;installation de [SECOND_LIFE] est terminée.
- 
-Si vous utilisez [SECOND_LIFE] pour la première fois, vous devez ouvrir un compte
-avant de pouvoir vous connecter. 
- 
-Retourner sur www.secondlife.com pour ouvrir un nouveau compte ?
+
+S&apos;il s&apos;agit de la première fois que vous utilisez [SECOND_LIFE], vous devrez créer un compte avant de pouvoir vous connecter.
+Retourner sur www.secondlife.com pour créer un nouveau compte ?
                 </message>
                 <option name="NewAccount...">
-                        Nouveau Compte...
+                        Nouveau compte...
                 </option>
                 <option name="Continue">
                         Continuer
@@ -2464,11 +2422,9 @@ Veuillez vérifier votre connexion.
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        Connexion impossible.  Identification non reçue
-par le serveur.
- 
-Veuillez réessayer d&apos;ici quelques minutes, ou cliquez sur Aide
-pour des conseils et un lien vers la page web d&apos;état du service.
+                        Vous avez des problèmes à vous connecter. Il peut s&apos;agir d&apos;un problème avec votre connexion internet ou les serveurs de Second Life.
+
+Nous vous conseillons de vérifier votre connexion Internet et de réessayer dans quelques minutes, de cliquer sur Aide, ou bien de cliquer sur Téléporter pour être téléporté vers votre domicile.
                 </message>
                 <option name="OK">
                         OK
@@ -2482,36 +2438,31 @@ pour des conseils et un lien vers la page web d&apos;état du service.
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
-                        Votre personnage apparaîtra d&apos;ici quelques instants.
- 
-Utilisez les touches de direction pour marcher.
- 
-Appuyez sur la touche F1 pour obtenir de l&apos;aide
-ou en savoir plus sur [SECOND_LIFE].
+                        Votre personnage va apparaître dans un moment.
+
+Pour marcher, utilisez les flèches de direction.
+Appuyez sur F1 pour obtenir de l&apos;aide ou en savoir plus sur [SECOND_LIFE].
                 </message>
         </alert>
         <alert name="WelcomeChooseSex">
                 <message name="message">
-                        Votre personnage apparaîtra d&apos;ici quelques instants.
- 
-Utilisez les touches de direction pour marcher.
- 
-Appuyez sur la touche F1 pour obtenir de l&apos;aide
-ou en savoir plus sur [SECOND_LIFE].
- 
-Veuillez choisir le sexe de votre personnage.
-Vous pourrez le modifier ultérieurement.
+                        Votre personnage va apparaître dans un moment.
+
+Pour marcher, utilisez les flèches de direction.
+Appuyez sur F1 pour obtenir de l&apos;aide ou en savoir plus sur [SECOND_LIFE].
+Choisissez un avatar homme ou femme.
+Vous pourrez revenir sur votre décision plus tard.
                 </message>
                 <option name="Male">
-                        Masculin
+                        Homme
                 </option>
                 <option name="Female">
-                        Féminin
+                        Femme
                 </option>
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] Votre solde est insuffisant.
+                        [NAME] [PRICE] L$ Vous n&apos;avez pas suffisamment de L$ pour faire cela.
                 </message>
         </alert>
         <alert name="GrantedModifyRights">
@@ -2526,12 +2477,9 @@ Vous pourrez le modifier ultérieurement.
         </alert>
         <alert name="FlushMapVisibilityCaches">
                 <message name="message">
-                        Ceci videra le cache cartographique de la région.
- 
-Cette option n&apos;est réellement utile que pour le débogage. 
- 
-(Si vous êtes en production, attendez 5 minutes, les cartes de chacun
-seront mises à jour après redémarrage.)
+                        Cela videra le cache cartographique de cette région.
+Cela n&apos;est vraiment utile que pour faire du débugage. 
+(En production, attendez 5 minutes. Les cartes seront mises à jour après reconnexion.)
                 </message>
                 <option name="OK">
                         OK
@@ -2542,8 +2490,8 @@ seront mises à jour après redémarrage.)
         </alert>
         <alert name="OnlyCopyContentsOfSingleItem">
                 <message name="message">
-                        Impossible de copier le contenu de plus d&apos;un objet à la fois.
-Veuillez sélectionner un seul objet et recommencez.
+                        Impossible de copier les contenus de plus d&apos;un objet à la fois.
+Veuillez ne sélectionner qu&apos;un seul objet.
                 </message>
                 <option name="OK">
                         OK
@@ -2554,7 +2502,7 @@ Veuillez sélectionner un seul objet et recommencez.
         </alert>
         <alert name="KickUsersFromRegion">
                 <message name="message">
-                        Téléporter tous les utilisateurs présents dans la région vers leurs domiciles ?
+                        Téléporter tous les résidents de cette région chez eux ?
                 </message>
                 <option name="OK">
                         OK
@@ -2592,18 +2540,18 @@ Remplacer la texture [TEXTURE_NUM] avec une image de 24 bits, 512 X 512, ou plus
         </alert>
         <alert name="RawUploadStarted">
                 <message name="message">
-                        Upload en cours. Celui-ci peut prendre jusqu&apos;à 2 mn, 
-en fonction de votre vitesse de connexion.
+                        Le chargement a commencé. Cela va prendre une à deux minutes, 
+suivant votre vitesse de connexion.
                 </message>
         </alert>
         <alert name="ConfirmBakeTerrain">
                 <message name="message">
                         Etes-vous sûr(e) de vouloir figer le relief actuel, 
-en faire le point central des limites de réhaussement/abaissement de relief
-et la valeur par défaut pour l&apos;outil &apos;Terrain par défaut&apos; ?
+en faire le point central des limites d&apos;élévation/abaissement de relief
+et la valeur par défaut du bouton Annuler modification ?
                 </message>
                 <option name="Bake">
-                        Figer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2611,12 +2559,12 @@ et la valeur par défaut pour l&apos;outil &apos;Terrain par défaut&apos; ?
         </alert>
         <alert name="MaxAllowedAgentOnRegion">
                 <message name="message">
-                        Nombre maximum de résidents autorisés : [MAX_AGENTS]
+                        Vous ne pouvez pas autoriser plus de [MAX_AGENTS] résidents.
                 </message>
         </alert>
         <alert name="MaxBannedAgentsOnRegion">
                 <message name="message">
-                        Nombre maximum de résidents bannis : [MAX_BANNED]
+                        Vous ne pouvez pas bannir plus de [MAX_BANNED] résidents.
                 </message>
         </alert>
         <alert name="MaxAgentOnRegionBatch">
@@ -2627,7 +2575,7 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
         </alert>
         <alert name="MaxAllowedGroupsOnRegion">
                 <message name="message">
-                        Nombre maximum de groupes autorisés : [MAX_GROUPS]
+                        Vous ne pouvez pas avoir plus que [MAX_GROUPS] groupes autorisés.
                 </message>
                 <option name="Bake">
                         Figer
@@ -2638,35 +2586,34 @@ Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
         </alert>
         <alert name="MaxManagersOnRegion">
                 <message name="message">
-                        Nombre maximum de résidents bannis : [MAX_MANAGER]
+                        Vous ne pouvez avoir que [MAX_MANAGER] gérants de domaine.
                 </message>
         </alert>
         <alert name="OwnerCanNotBeDenied">
                 <message name="message">
-                        Impossible d&apos;ajouter le propriétaire du domaine à la liste noire du domaine.
+                        Impossible d&apos;ajouter le propriétaire du domaine à la liste des résidents bannis.
                 </message>
         </alert>
         <alert name="CanNotChangeAppearanceUntilLoaded">
                 <message name="message">
-                        Impossible de modifier son apparence tant que les vêtements et silhouettes ne sont pas chargés.
+                        Impossible de changer d&apos;apparence jusqu&apos;à ce que les habits et la silhouette soient chargés.
                 </message>
         </alert>
         <alert name="ClassifiedMustBeAlphanumeric">
                 <message name="message">
-                        Le nom de votre annonce doit commencer 
-par une lettre ou un chiffre (pas de ponctuations).
+                        Le nom de votre petite annonce doit commencer par un chiffre ou une lettre (A à Z). La ponctuation n&apos;est pas autorisée.
                 </message>
         </alert>
         <alert name="CantSetBuyObject">
                 <message name="message">
-                        Impossible de définir &quot;Acheter objet&quot;, car l&apos;objet n&apos;est pas à vendre. 
-Veuillez mettre l&apos;objet en vente et réessayez.
+                        Cet objet n&apos;est pas à vendre. 
+Veuillez choisir un objet à vendre et réessayer.
                 </message>
         </alert>
         <alert name="FinishedRawDownload">
                 <message name="message">
-                        Téléchargement du fichier relief RAW terminé : 
-[DOWNLOAD_PATH]
+                        Chargement du fichier de terrain raw effectué vers : 
+[DOWNLOAD_PATH].
                 </message>
         </alert>
         <alert name="DownloadWindowsMandatory">
@@ -2755,14 +2702,14 @@ Télécharger vers le dossier Applications ?
         </alert>
         <alert name="DeedObjectToGroup">
                 <message name="message">
-                        Le transfert de cet objet permettra au groupe de :
-* Recevoir l&apos;argent payé à l&apos;objet
+                        Si vous cédez cet objet, le groupe :
+* recevra les L$ versés pour l&apos;objet ;
                 </message>
                 <ignore name="ignore">
-                        Lors du transfert d&apos;objets au groupe
+                        Lors de la cession d&apos;objets au groupe
                 </ignore>
                 <option name="Deed">
-                        Transférer
+                        Céder
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2786,6 +2733,9 @@ Télécharger vers le dossier Applications ?
                 <message name="message">
                         Aller sur www.secondlife.com pour gérer votre compte ?
                 </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour gérer votre compte
+                </ignore>
                 <option name="OK">
                         OK
                 </option>
@@ -2793,10 +2743,83 @@ Télécharger vers le dossier Applications ?
                         Annuler
                 </option>
         </alert>
+        <alert name="WebLaunchBugReport101">
+                <message name="message">
+                        Pour apprendre à signaler correctement des bugs, consultez le Wiki de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter le Wiki et apprendre à signaler des bugs
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="WebLaunchSecurityIssues">
+                <message name="message">
+                        Pour apprendre à signaler un problème de sécurité, consultez le Wiki de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur les problèmes de sécurité.
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="WebLaunchQAWiki">
+                <message name="message">
+                        Consultez le Wiki sur l&apos;Assurance Qualité de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur l&apos;Assurance Qualité.
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="WebLaunchPublicIssue">
+                <message name="message">
+                        Pour signaler des bugs et autres problèmes, utilisez le JIRA de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter le JIRA
+                </ignore>
+                <option name="Gotopage">
+                        Aller sur cette page
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
+        <alert name="WebLaunchPublicIssueHelp">
+                <message name="message">
+                        Pour apprendre à utiliser JIRA, consultez le Wiki de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur le JIRA
+                </ignore>
+                <option name="Gotopage">
+                        Aller sur cette page
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
         <alert name="WebLaunchForums">
                 <message name="message">
                         Consultez la base de connaissances de [SECOND_LIFE] pour les derniers trucs &amp; astuces.
                 </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter la Base de connaissances
+                </ignore>
                 <option name="Gotopage">
                         Aller à la page
                 </option>
@@ -2804,10 +2827,27 @@ Télécharger vers le dossier Applications ?
                         Annuler
                 </option>
         </alert>
+        <alert name="WebLaunchSupport">
+                <message name="message">
+                        Contactez le Service clientèle de [SECOND_LIFE].
+                </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour contacter le Service clientèle
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
         <alert name="WebLaunchSupportWiki">
                 <message name="message">
-                        Visitez le blog officiel des Linden pour les dernières nouvelles et informations.
+                        Visitez le blog officiel des Lindens pour les dernières nouvelles et informations.
                 </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter le blog
+                </ignore>
                 <option name="Gotopage">
                         Aller à la page
                 </option>
@@ -2817,13 +2857,13 @@ Télécharger vers le dossier Applications ?
         </alert>
         <alert name="WebLaunchLSLGuide">
                 <message name="message">
-                        Consulter le Manuel LSL pour de l&apos;aide sur les scripts ?
+                        Consulter le Guide guide pour l&apos;écriture de scripts pour obtenir de l&apos;aide ?
                 </message>
                 <ignore name="ignore">
-                        Lors de l&apos;ouverture du navigateur web pour voir le Guide de scripting
+                        Lors de l&apos;ouverture du navigateur web pour voir le Guide pour l&apos;écriture de scripts
                 </ignore>
                 <option name="Gotopage">
-                        Aller à la page
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2833,6 +2873,9 @@ Télécharger vers le dossier Applications ?
                 <message name="message">
                         Consulter le Wiki LSL pour de l&apos;aide sur les scripts ?
                 </message>
+                <ignore name="ignore">
+                        Lors de l&apos;ouverture du navigateur web pour consulter le Guide sur l&apos;écriture de scripts
+                </ignore>
                 <option name="Gotopage">
                         Aller à la page
                 </option>
@@ -2842,18 +2885,15 @@ Télécharger vers le dossier Applications ?
         </alert>
         <alert name="ReturnToOwner">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir renvoyer les objets
-sélectionnés à leurs propriétaires ? Les objets cessibles transférés
-seront renvoyés à leurs propriétaires précédents.
-(Tous les objets renvoyés seront replacés dans leur dernier dossier.)
- 
-*AVERTISSEMENT* Les objets non cessibles transférés seront supprimés !
+                        Êtes-vous certain de vouloir renvoyer les objets sélectionnés à leur propriétaire ? Les objets donnés transférables seront renvoyés à leur ancien propriétaire.
+
+*Avertissement* Les objets non transférables seront supprimés !
                 </message>
                 <ignore name="ignore">
                         Lors du renvoi d&apos;objets à leurs propriétaires
                 </ignore>
                 <option name="Return">
-                        Retourner
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2861,7 +2901,7 @@ seront renvoyés à leurs propriétaires précédents.
         </alert>
         <alert name="GroupLeaveConfirmOfficer">
                 <message name="message">
-                        Vous êtes actuellement officier du groupe [GROUP].
+                        Vous êtes actuellement officier dans le groupe [GROUP].
 Quitter le groupe ?
                 </message>
                 <option name="Leave">
@@ -2874,10 +2914,10 @@ Quitter le groupe ?
         <alert name="GroupLeaveConfirmMember">
                 <message name="message">
                         Vous êtes actuellement membre du groupe [GROUP].
-Quitter le groupe ?
+Quitter le groupe ?
                 </message>
                 <option name="Leave">
-                        Partir
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2885,10 +2925,10 @@ Quitter le groupe ?
         </alert>
         <alert name="ConfirmKick">
                 <message name="message">
-                        Souhaitez-vous REELLEMENT dégager tous les utilisateurs de la grille ?
+                        Souhaitez-vous vraiment éjecter tous les utilisateurs de la grille ?
                 </message>
                 <option name="Kick">
-                        Vider Tous
+                        Éjecter tous
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -2896,15 +2936,15 @@ Quitter le groupe ?
         </alert>
         <alert name="MuteLinden">
                 <message name="message">
-                        Désolés, mais vous ne pouvez ignorer un Linden.
+                        Désolé, vous ne pouvez pas ignorer un Linden.
                 </message>
                 <option name="OK">
                         OK
                 </option>
         </alert>
-        <alert name="MuteByNameFailed" title="L&apos;objet n&apos;a pu être ignoré">
+        <alert name="MuteByNameFailed" title="Échec de la fonction Ignorer les objets par nom">
                 <message name="message">
-                        Vous avez déjà ignoré ce nom.
+                        Vous ignorez déjà ce résident.
                 </message>
                 <option name="OK">
                         OK
@@ -2912,14 +2952,13 @@ Quitter le groupe ?
         </alert>
         <alert name="RemoveItemWarn">
                 <message name="message">
-                        Bien qu&apos;autorisée, la suppression d&apos;inventaire peut endommager
-l&apos;objet. Souhaitez-vous supprimer cet elément d&apos;inventaire ?
+                        Si vous supprimez des contenus, vous risquez d&apos;endommager l&apos;objet. Souhaitez-vous supprimer cet objet ?
                 </message>
                 <option name="Yes">
-                        Oui
+                        OK
                 </option>
                 <option name="No">
-                        Non
+                        Annuler
                 </option>
         </alert>
         <alert name="CantRateOwnedByGroup">
@@ -2932,7 +2971,7 @@ l&apos;objet. Souhaitez-vous supprimer cet elément d&apos;inventaire ?
         </alert>
         <alert name="CantOfferCallingCard">
                 <message name="message">
-                        Impossible d&apos;offrir votre carte de visite actuellement. Veuillez réessayer dans un moment.
+                        Impossible d&apos;offrir une carte de visite actuellement. Veuillez réessayer dans un moment.
                 </message>
                 <option name="OK">
                         OK
@@ -2940,7 +2979,7 @@ l&apos;objet. Souhaitez-vous supprimer cet elément d&apos;inventaire ?
         </alert>
         <alert name="CantOfferFriendship">
                 <message name="message">
-                        Impossible de proposer de devenir votre ami(e). Veuillez réessayer dans quelques instants.
+                        Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
                 </message>
                 <option name="OK">
                         OK
@@ -2957,10 +2996,8 @@ Votre domicile doit se trouver sur un terrain vous appartenant ou appartenant à
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        Vous êtes en mode occupé.
-Le chat et les messages instantanés seront cachés. Les IM
-retourneront un message d&apos;occupation. Toutes les offres de téléportation
-et d&apos;inventaire seront déclinées.
+                        Mode occupé activé.
+Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
                 </message>
                 <ignore name="ignore">
                         Lors de l&apos;utilisation du mode Occupé
@@ -2988,19 +3025,16 @@ peuvent être joints aux notes.
         </alert>
         <alert name="JoinedTooManyGroupsMember">
                 <message name="message">
-                        Vous appartenez à trop de groupes pour vous inscrire
-à un nouveau. Veuillez quitter au moins un groupe
-avant de vous inscrire, ou déclinez l&apos;invitation.
-Pour quitter un groupe, sélectionnez l&apos;option &apos;Mes Groupes&apos;
-dans le menu &apos;Edition&apos;.
-[NAME] vous invite à devenir membre du groupe.
+                        Vous appartenez déjà à un nombre élevé de groupes et nous ne pouvez pas en rejoindre un nouveau. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
+Pour quitter un groupe, sélectionnez l&apos;option Groupe dans le menu Éditer.
+[NAME] vous invite à rejoindre un groupe.
 [INVITE]
                 </message>
                 <option name="Join">
-                        Fusionner
+                        Rejoindre
                 </option>
                 <option name="Decline">
-                        Décliner
+                        Refuser
                 </option>
         </alert>
         <alert name="JoinedTooManyGroupsOfficer">
@@ -3014,18 +3048,18 @@ dans le menu &apos;Edition&apos;.
 [INVITE]
                 </message>
                 <option name="Join">
-                        Fusionner
+                        Rejoindre
                 </option>
                 <option name="Decline">
-                        Décliner
+                        Refuser
                 </option>
         </alert>
         <alert name="KickUser">
                 <message name="message">
-                        Dégager cet utilisateur avec quel message ?
+                        Éjecter cet utilisateur avec quel message ?
                 </message>
                 <editline name="editline">
-                        Vous avez été déconnecté par un administrateur.
+                        Un administrateur vous a déconnecté.
                 </editline>
                 <option name="OK">
                         OK
@@ -3036,10 +3070,10 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="KickAllUsers">
                 <message name="message">
-                        Dégager tous les utilisateurs actuellement présents sur la grille avec quel message ?
+                        Éjecter tous les résidents actuellement en ligne avec quel message ?
                 </message>
                 <editline name="editline">
-                        Vous avez été déconnecté par un administrateur.
+                        Un administrateur vous a déconnecté.
                 </editline>
                 <option name="OK">
                         OK
@@ -3050,10 +3084,10 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="FreezeUser">
                 <message name="message">
-                        Bloquer cet utilisateur avec quel message ?
+                        Geler cet utilisateur avec quel message ?
                 </message>
                 <editline name="editline">
-                        Vous avez été bloqué. Vous ne pouvez ni vous déplacer, ni chatter. Un administrateur va vous contacter via message instantané (IM).
+                        Vous avez été gelé. Vous ne pouvez ni bouger ni chatter. Un administrateur va vous envoyer un message instantané (IM).
                 </editline>
                 <option name="OK">
                         OK
@@ -3064,10 +3098,10 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="UnFreezeUser">
                 <message name="message">
-                        Débloquer cet utilisateur avec quel message ?
+                        Dégeler cet utilisateur avec quel message ?
                 </message>
                 <editline name="editline">
-                        Vous n&apos;êtes plus bloqué.
+                        Vous n&apos;êtes plus gelé.
                 </editline>
                 <option name="OK">
                         OK
@@ -3078,7 +3112,7 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="ExpungeUser">
                 <message name="message">
-                        Entrez l&apos;id d&apos;un avatar à expulser
+                        Entrez l&apos;id de l&apos;avatar à éjecter
                 </message>
                 <option name="OK">
                         OK
@@ -3089,10 +3123,10 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="OfferTeleport">
                 <message name="message">
-                        Proposer de téléporter la personne avec le message suivant ?
+                        Proposez une téléportation avec le message suivant ?
                 </message>
                 <editline name="editline">
-                        Rejoins-moi à [REGION]
+                        On se rejoint à [REGION] ?
                 </editline>
                 <option name="OK">
                         OK
@@ -3103,10 +3137,10 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="OfferTeleportFromGod">
                 <message name="message">
-                        Super-invoquer l&apos;utilisateur ici ?
+                        Demander au résident de venir vous rejoindre ?
                 </message>
                 <editline name="editline">
-                        Rejoins-moi à [REGION]
+                        On se rejoint à [REGION] ?
                 </editline>
                 <option name="OK">
                         OK
@@ -3117,7 +3151,7 @@ dans le menu &apos;Edition&apos;.
         </alert>
         <alert name="TeleportFromLandmark">
                 <message name="message">
-                        Etes-vous certain de vouloir être téléporté ?
+                        Êtes-vous certain de vouloir être téléporté ?
                 </message>
                 <ignore name="ignore">
                         Lors de la téléportation depuis un repère de l&apos;inventaire
@@ -3129,12 +3163,11 @@ dans le menu &apos;Edition&apos;.
                         Annuler
                 </option>
         </alert>
-        <alert name="MessageEstate"
-             title="Envoyez un message à tout le monde dans votre domaine">
+        <alert name="MessageEstate" title="Envoyer un message à tout le monde dans votre domaine">
                 <message name="message">
-                        Composez une brève annonce qui sera
-envoyée à toutes les personnes présentes sur votre domaine.
+                        Saisissez un message court qui sera envoyé à tous les résidents se trouvant actuellement sur votre domaine.
                 </message>
+                <editline name="editline"/>
                 <option name="OK">
                         OK
                 </option>
@@ -3142,150 +3175,143 @@ envoyée à toutes les personnes présentes sur votre domaine.
                         Annuler
                 </option>
         </alert>
-        <alert name="ChangeLindenEstate" title="Modifier domaine Linden">
+        <alert name="ChangeLindenEstate" title="Modifier un domaine Linden">
                 <message name="message">
-                        Vous vous apprêtez à modifier un domaine appartenant aux Linden
-(continent, grille ado, orientation, etc.). 
- 
-Ceci est EXTREMEMENT DANGEREUX car cela peut fondamentalement 
-affecter l&apos;expérience des utilisateurs. Sur le continent, cela modifiera 
-des milliers de régions et provoquera l&apos;instabilité du serveur principal.
+                        Vous vous apprêtez à modifier un domaine appartenant aux Lindens (continent, zone réservée aux ados, orientation etc.). 
+
+Cela est extrêmement délicat car l&apos;expérience des résidents est en jeu. Sur le continent, cela modifiera 
+des milliers de régions et sera difficile à digérer pour le serveur.
  
-Continuer ?
+Continuer ?
                 </message>
                 <option name="ChangeEstate">
-                        Changer de domaine
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="ChangeLindenAccess" title="Modifier l&apos;accès au domaine Linden">
+        <alert name="ChangeLindenAccess" title="Modifier l&apos;accès à un domaine Linden">
                 <message name="message">
-                        Vous vous apprêtez à modifier la liste d&apos;accès d&apos;un domaine appartenant aux Linden
-(continent, grille ado, orientation, etc.). 
- 
-Ceci est DANGEREUX et ne doit être utilisé que pour invoquer le hack
-permettant le transfert d&apos;objets ou d&apos;argent depuis ou vers la grille. 
- 
-Cela modifie des milliers de régions et provoque l&apos;instabilité du serveur principal.
- 
-Continuer ?
+                        Vous vous apprêtez à modifier la liste d&apos;accès à un domaine appartenant aux Linden (continent, zone réservée aux ados, orientation etc.). 
+
+Cette action est délicate et ne doit être effectuée que pour appeler le hack autorisant des objets/L$ à être transférés à l&apos;intérieur/extérieur de la grille.  
+Cette action modifiera des milliers de régions et sera difficile à digérer pour le serveur.
                 </message>
                 <option name="ChangeEstate">
-                        Changer de domaine
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentAdd" title="Sélectionner domaine">
+        <alert name="EstateAllowedAgentAdd" title="Choisir le domaine">
                 <message name="message">
-                        Ajouter à la liste d&apos;accès de ce domaine seulement ou [ALL_ESTATES] ?
+                        Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentRemove" title="Sélectionner domaine">
+        <alert name="EstateAllowedAgentRemove" title="Choisir le domaine">
                 <message name="message">
-                        Retirer de la liste d&apos;accès pour ce domaine seulement ou pour [ALL_ESTATES] ?
+                        Supprimer de la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupAdd" title="Sélectionner domaine">
+        <alert name="EstateAllowedGroupAdd" title="Choisir le domaine">
                 <message name="message">
-                        Ajouter à la liste des groupes admis pour ce domaine seulement ou [ALL_ESTATES] ?
+                        Ajouter à la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupRemove" title="Sélectionner domaine">
+        <alert name="EstateAllowedGroupRemove" title="Choisir le domaine">
                 <message name="message">
-                        Retirer de la liste des groupes admis pour ce domaine seulement ou pour [ALL_ESTATES] ?
+                        Supprimer de la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateBannedAgentAdd" title="Sélectionner domaine">
+        <alert name="EstateBannedAgentAdd" title="Choisir le domaine">
                 <message name="message">
-                        Refuser l&apos;accès à ce domaine seulement ou à [ALL_ESTATES] ?
+                        Refuser l&apos;accès à ce domaine uniquement ou à [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateBannedAgentRemove" title="Sélectionner domaine">
+        <alert name="EstateBannedAgentRemove" title="Choisir le domaine">
                 <message name="message">
-                        Cesser de refuser l&apos;accès à ce domaine ou à [ALL_ESTATES] ?
+                        Supprimer ce résident de la liste des résidents bannis pour ce domaine uniquement ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateManagerAdd" title="Sélectionner domaine">
+        <alert name="EstateManagerAdd" title="Choisir le domaine">
                 <message name="message">
-                        Ajouter un administrateur de propriété pour cette propriété seulement ou pour l&apos;ensemble de vos propriétés ?
+                        Ajouter un gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateManagerRemove" title="Sélectionner domaine">
+        <alert name="EstateManagerRemove" title="Choisir le domaine">
                 <message name="message">
-                        Retirer l&apos;administrateur pour ce domaine seulement ou pour tous vos domaines?
+                        Supprimer le gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3293,24 +3319,24 @@ Continuer ?
         </alert>
         <alert name="EstateCovenantChange" title="Sélectionner domaine">
                 <message name="message">
-                        Modifier le message de la clause de sauvegarde pour ce domaine seulement ou pour [ALL_ESTATES] ?
+                        Modifier le message du règlement pour ce domaine uniquement ou pour [ALL_ESTATES] ?
                 </message>
                 <option name="ThisEstate">
                         Ce domaine
                 </option>
                 <option name="AllEstates">
-                        Tous domaines
+                        Tous les domaines
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="EstateKickUser" title="Confirmer Dégager">
+        <alert name="EstateKickUser" title="Confirmer">
                 <message name="message">
-                        Dégager [EVIL_USER] de ce domaine ?
+                        Éjecter [EVIL_USER] de ce domaine ?
                 </message>
                 <option name="Kick">
-                        Dégager
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3318,10 +3344,10 @@ Continuer ?
         </alert>
         <alert name="EstateChangeCovenant">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir modifier la clause de sauvegarde du domaine ?
+                        Êtes-vous certain de vouloir modifier le règlement du domaine ?
                 </message>
                 <option name="Change">
-                        Changer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3329,7 +3355,7 @@ Continuer ?
         </alert>
         <alert name="ProblemImportingEstateCovenant">
                 <message name="message">
-                        Erreur d&apos;importation de la clause de sauvegarde du domaine.
+                        Problème lors de l&apos;importation du règlement du domaine.
                 </message>
                 <option name="OK">
                         OK
@@ -3347,7 +3373,7 @@ Continuer ?
         </alert>
         <alert name="UnableToLoadNotecard">
                 <message name="message">
-                        Impossible de charger ressource de la note pour le moment.
+                        Impossible de lire les données de la note actuellement.
                 </message>
                 <option name="OK">
                         OK
@@ -3355,7 +3381,7 @@ Continuer ?
         </alert>
         <alert name="NotAllowedToViewNotecard">
                 <message name="message">
-                        Autorisations insuffisantes pour afficher la note associée à l&apos;ID de ressource demandée.
+                        Permissions pour afficher la note insuffisantes.
                 </message>
                 <option name="OK">
                         OK
@@ -3363,7 +3389,7 @@ Continuer ?
         </alert>
         <alert name="MissingNotecardAssetID">
                 <message name="message">
-                        ID de ressource de la note absent de la base de données.
+                        Les références de la note ne se trouvent pas dans la base de données.
                 </message>
                 <option name="OK">
                         OK
@@ -3371,12 +3397,12 @@ Continuer ?
         </alert>
         <alert name="PublishClassified">
                 <message name="message">
-                        Attention : les frais d&apos;insertion sont non remboursables.
- 
-Publier cette annonce maintenant pour L$[AMOUNT]?
+                        Rappel : les frais pour passer des petites annonces ne sont pas remboursables.
+
+Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
                 </message>
                 <option name="Publish">
-                        Publier
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3410,23 +3436,22 @@ Publier cette annonce maintenant pour L$[AMOUNT]?
                         Annuler
                 </option>
         </alert>
-        <alert name="ConfirmRestart" title="Confirmer redémarrage">
+        <alert name="ConfirmRestart" title="Confirmer le redémarrage">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir redémarrer cette région dans 2 minutes?
+                        Souhaitez-vous vraiment redémarrer cette région dans 2 minutes ?
                 </message>
                 <option name="Restart">
-                        Redémarrer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
                 </option>
         </alert>
-        <alert name="MessageRegion"
-             title="Envoyez un message à tout le monde dans la région">
+        <alert name="MessageRegion" title="Envoyer un message à tout le monde dans cette région">
                 <message name="message">
-                        Composez une brève annonce qui sera
-envoyée à toutes les personnes présentes dans cette région.
+                        Saisissez une message court qui sera envoyé à tous les résidents se trouvant actuellement dans cette région.
                 </message>
+                <editline name="editline"/>
                 <option name="OK">
                         OK
                 </option>
@@ -3434,74 +3459,72 @@ envoyée à toutes les personnes présentes dans cette région.
                         Annuler
                 </option>
         </alert>
-        <alert name="HelpRegionBlockTerraform" title="Interdire le terraforming">
+        <alert name="HelpRegionBlockTerraform" title="Bloquer le terraformage">
                 <message name="message">
-                        Si cette option est cochée, les propriétaires terriens ne pourront pas terraformer
-leur terrain, indépendamment des réglages &apos;Modifier Relief&apos; de chaque parcelle.
- 
-Défaut : désactivé
+                        Si vous cochez cette case, les propriétaires ne pourront plus terraformer leur terrain, quels que soient leurs paramètres à la section Modifier le terrain.
+
+Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionBlockFly" title="Interdire vol">
+        <alert name="HelpRegionBlockFly" title="Interdire le vol">
                 <message name="message">
-                        Si cette option est cochée, les personnes ne pourront pas voler dans cette région,
-indépendamment des réglages de &apos;Vol&apos; de chaque parcelle.
+                        Si vous cochez cette case, les résidents ne pourront plus voler dans cette région, quels que soient leurs paramètres.
  
-Défaut : désactivé
+Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionAllowDamage" title="Autoriser dégâts">
+        <alert name="HelpRegionAllowDamage" title="Autoriser les dégâts">
                 <message name="message">
-                        Cette option active le système de santé sur toutes les parcelles
-indépendamment des réglages individuels des parcelles. Si elle est
-décochée, les propriétaires de parcelles individuelles pourront 
-activer le système de santé sur leurs parcelles.
+                        Si vous cochez cette case, l&apos;alerte santé est désactivée sur toutes les parcelles quels que soient les paramètres individuels de la parcelle. Si la case n&apos;est pas cochée, les propriétaires de parcelles peuvent quand même activer l&apos;alerte santé de manière individuelle sur leurs parcelles.
  
-Défaut : désactivé
+Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionAgentLimit" title="Limite d&apos;avatars">
+        <alert name="HelpRegionAgentLimit" title="Nombre limite d&apos;avatars">
                 <message name="message">
                         Définit le nombre maximum d&apos;avatars autorisés dans cette région.
-Plus il y a d&apos;avatars dans une région, plus les performances peuvent se dégrader. 
+La performance peut varier en fonction du nombre d&apos;avatars présents.
  
-Défaut : 30
+Défaut : 40
                 </message>
         </alert>
-        <alert name="HelpRegionMaturity" title="Classification">
+        <alert name="HelpRegionObjectBonus" title="Bonus objet">
                 <message name="message">
-                        Définit la classification de la région (M=Adulte, PG=Tout Public), affichée dans le coin supérieur droit
-de l&apos;écran ou sous forme de bulles d&apos;aide sur la carte. Cette classification
-affecte également les résultats de recherche - les résidents peuvent choisir d&apos;exclure
-le contenu situé dans les régions Adultes. 
+                        Le bonus objet est le multiplicateur de prims autorisés sur une parcelle donnée. L&apos;échelle autorisée est comprise entre 1 et 10. Lorsque ce chiffre est de 1, chaque parcelle de 512 m² peut contenir 117 objets. S&apos;il est de 2, chaque parcelle peut contenir 234 objets, ou deux fois plus, et ainsi de suite. Le nombre maximum d&apos;objets autorisés dans une région est de 15 000, quel que soit le bonus objet. Attention : si vous définissez un bonus objet et décidez ensuite de le diminuer, cela peut entraîner la suppression ou le renvoi d&apos;objets. 
  
-Les bulles d&apos;aide de la carte ne seront pas modifiées avant 5 minutes, le système mettant périodiquement à jour les informations de la carte. 
+Défaut : 1.0
+                </message>
+        </alert>
+        <alert name="HelpRegionMaturity" title="Maturité">
+                <message name="message">
+                        Définit le niveau de maturité de la région. Ce niveau s&apos;affiche
+                        en haut de l&apos;écran et dans les pop-ups d&apos;astuces sur la carte. Ce paramètre influe aussi sur les résultats de recherche. Les résidents peuvent choisir de ne pas rechercher de contenu dans les régions Adultes.
  
-Défaut : PG (Tout public)
+Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
+ 
+Défaut : Tout public
                 </message>
         </alert>
-        <alert name="HelpRegionRestrictPushObject" title="Interdire de pousser">
+        <alert name="HelpRegionRestrictPushObject" title="Interdire les bousculades">
                 <message name="message">
-                        Limite les autorisations de pousser sur la région entière.
-Les avatars ne peuvent se pousser qu&apos;entre eux, ou être poussés par des scripts
-appartenant au propriétaire de la parcelle ou attribués au groupe sur la parcelle,
-si celle-ci est attribuée à un groupe.
-Pousser est lié à la fonction llPushObject() du langage LSL.
+                        Cette case permet de restreindre les bousculades dans toute une région.
+Lorsqu&apos;elle est cochée, les résidents ne peuvent être bousculés que par eux-mêmes ou par le propriétaire de la région.
+(Bousculer fait référence à la fonction LSL llPushObjet().)
  
-Défaut : Désactiver
+Défaut : Désactivé
                 </message>
         </alert>
-        <alert name="HelpParcelChanges" title="Fusionner/subdiviser parcelle">
+        <alert name="HelpParcelChanges" title="Fusionner/Diviser des parcelles">
                 <message name="message">
-                        Cette case permet de choisir si les parcelles n&apos;appartenant pas au gérant du domaine peuvent être fusionnées ou divisées ou pas. 
+                        Cette case permet de choisir si les parcelles n&apos;appartenant pas au gérant du domaine peuvent ou pas être fusionnées ou divisées. 
 Si cette case n&apos;est pas cochée :
  * Seuls les propriétaires ou gérants de domaine peuvent fusionner ou diviser des parcelles. 
  * Ils ne peuvent fusionner ou diviser que les parcelles du propriétaire, 
-       ou celles d&apos;un groupe dans lequel il ont les pouvoirs nécessaires.
+   ou celles d&apos;un groupe dans lequel il ont les pouvoirs nécessaires.
 Si cette case est cochée :
  * Tous les propriétaires peuvent fusionner ou diviser leurs parcelles. 
- * Pour les parcelles du groupe, ceux avec les pouvoirs nécessaires
-       peuvent fusionner ou diviser les parcelles.
+ * Pour les parcelles du groupe, les résidents avec les pouvoirs nécessaires
+   peuvent fusionner ou diviser les parcelles.
  
 Défaut : Cochée
                 </message>
@@ -3512,39 +3535,38 @@ Défaut : Cochée
 Défaut : Désactivé
                 </message>
         </alert>
-        <alert name="HelpParcelSearch" title="Do Not Show In Search">
+        <alert name="HelpParcelSearch" title="Ne pas afficher dans la recherche">
                 <message name="message">
-                        Checking this box will show:
-- this parcel in search results
-- this parcel&apos;s public objects
+                        Si vous cochez cette option, votre parcelle apparaîtra :
+- dans les résultats de recherche ;
+- dans les objets publics de cette parcelle.
                 </message>
         </alert>
-        <alert name="RegionMaturityChange" title="Classification de la Région modifiée.">
+        <alert name="RegionMaturityChange" title="Maturité de la région modifiée">
                 <message name="message">
-                        La classification de cette région a été modifiée.
- 
-Cependant, la carte du monde ne sera pas modifiée avant 5 minutes, le système mettant périodiquement à jour les informations de la carte.
+                        Le niveau de maturité de cette région a été mis à jour. 
+Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
                 </message>
         </alert>
         <alert name="HelpRegionLandResell" title="Revente de terrain">
                 <message name="message">
-                        Les propriétaires et administrateurs de domaines peuvent vendre tout terrain appartenant au propriétaire du domaine. 
-Si cette option est décochée, les acheteurs ne peuvent revendre leur terrain dans cette région. 
+                        Les propriétaires et gérants de domaine peuvent vendre n&apos;importe quel terrain appartenant à un propriétaire de domaine. 
+Si cette option n&apos;est pas cochée, les acheteurs ne peuvent pas revendre leur terrain dans cette région. 
 Si cette option est cochée, les acheteurs peuvent revendre leur terrain dans cette région. 
  
-Défaut : Ne pas autoriser
+Défaut : Ne pas autoriser
                 </message>
         </alert>
-        <alert name="HelpEstateCovenantID" title="ID de ressource de la clause de sauvegarde">
+        <alert name="HelpEstateCovenantID" title="ID de ressource du règlement">
                 <message name="message">
-                        Définit l&apos;ID d&apos;élément de la note pour la Clause de sauvegarde de ce Domaine. 
+                        Définit l&apos;ID de la note pour le règlement de ce domaine. 
  
 Défaut : 00000000-0000-0000-0000-000000000000 ou aucun
                 </message>
         </alert>
         <alert name="HelpRegionDisableScripts" title="Désactiver les scripts">
                 <message name="message">
-                        Lorsque la performance d&apos;une sim est faible, cela vient peut-être d&apos;un script. Ouvrez la barre de statistiques (Ctrl-Maj-1). Consultez le Simulateur de propriétés physiques FPS.
+                        Lorsque la performance d&apos;une sim est faible, cela vient peut-être d&apos;un script. Ouvrez la section Statistiques (Ctrl-Maj-1). Consultez le Simulateur de propriétés physiques FPS.
 S&apos;il est en dessous de 45, ouvrez le panel Heure situé en bas de la barre de statistiques. Si le script Heure indique 25mn ou moins, cliquez sur le bouton Afficher les scripts fréquemment utilisés. Vous verrez le nom et l&apos;emplacement des scripts qui sont peut-être à l&apos;origine du problème.
  
 Si vous cochez la case Désactiver les scripts et que vous appuyez sur Appliquer, tous les scripts de cette région seront temporairement désactivés. Vous devrez peut-être faire cela pour aller dans un endroit où se trouve un 
@@ -3554,7 +3576,7 @@ Décochez la case Désactiver le script, puis cliquez sur Appliquer pour réacti
 Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionDisableCollisions" title="Désactiver collisions">
+        <alert name="HelpRegionDisableCollisions" title="Désactiver les collisions">
                 <message name="message">
                         Lorsque la performance d&apos;une sim est faible, cela vient peut-être des objets physiques. 
 Ouvrez la barre de statistiques (Ctrl-Maj-1). Consultez le Simulateur de propriétés physiques FPS. S&apos;il est en dessous de 45, ouvrez le panel Heure situé en bas de la barre de statistiques. Si le script Heure indique 25mn ou moins, cliquez sur le bouton Afficher les objets souvent responsables de collision. 
@@ -3567,74 +3589,59 @@ Décochez la case Désactiver les collision, puis cliquez sur Appliquer pour ré
 Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionDisablePhysics" title="Désactiver Physiques">
+        <alert name="HelpRegionDisablePhysics" title="Désactiver les propriétés physiques">
                 <message name="message">
-                        Désactiver Physiques est équivalent à Désactiver Collisions, à la différence 
-que toute simulation physique est désactivée.  Non seulement les objets
-cessent toute collision, mais les avatars sont également immobilisés. 
+                        L&apos;option Désactiver les propriétés physiques est similaire à l&apos;option Désactiver les collisions sauf qu&apos;elle englobe toutes les simulations physiques.  Cela signifie que les objets n&apos;entreront plus en collision et que les avatars ne pourront plus bouger. 
  
-A n&apos;utiliser que lorsque Désactiver Collisions ne restitue pas
-assez de performances à la région pour analyser 
-un problème physique ou de &apos;Top Collider&apos;.
+Vous ne devriez utiliser cette option que lorsque l&apos;option Désactiver les collisions ne rend pas sufisamment de performance à la région pour résoudre un problème de physique ou trouver les objets souvent responsables de collisions.
  
-Assurez-vous de bien réactiver Physiques lorsque vous avez fini,
-sans quoi les avatars continueront à être immobilisés. 
+Une fois que vous avez fini, n&apos;oubliez pas de réactiver les propriétés physiques sinon vos avatars ne pourront pas bouger.  
  
-Défaut : décoché
+Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionTopColliders" title="Top Colliders">
+        <alert name="HelpRegionTopColliders" title="Objets souvent responsables de collision">
                 <message name="message">
-                        Affiche une liste d&apos;objets les plus exposés aux collisions potentielles entre objets. Ces objets peuvent
-ralentir la performance du sim.  Sélectionnez Afficher &gt; Barre de statistiques et
-vérifiez dans Simulateur &gt; Temps &gt; Temps du Sim (Physiques) si 
-plus de 20 ms sont consacrés à Physiques.
+                        Montre une liste des objets qui ont le plus de chances d&apos;entrer en collision avec d&apos;autres objets. Ces objets peuvent ralentir votre performance. Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Sim Time (Physics) pour voir si les propriétés physiques prennent plus de 20 ms.
                 </message>
         </alert>
-        <alert name="HelpRegionTopScripts" title="Top Scripts">
+        <alert name="HelpRegionTopScripts" title="Scripts souvent utilisés">
                 <message name="message">
-                        Affiche une liste d&apos;objets les plus occupés à exécuter des scripts LSL. Ces objets peuvent
-ralentir la performance du sim.  Sélectionnez Afficher &gt; Barre de statistiques et
-vérifiez dans Simulateur &gt; Temps &gt; Temps de script si 
-plus de 25 ms sont consacrés aux scripts.
+                        Dresse une liste des objets qui passent le plus de temps à exécuter des scripts LSL. Ces objets peuvent ralentir votre performance. 
+Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Script Time pour voir si les scripts prennent plus de 25 ms.
                 </message>
         </alert>
-        <alert name="HelpRegionRestart" title="Redémarrer région">
+        <alert name="HelpRegionRestart" title="Redémarrer la région">
                 <message name="message">
-                        Relancez le processus du serveur qui gère cette région
-après un avertissement de 2 minutes. Tous les résidents présents dans la région seront déconnectés.  Les données de la région seront sauvegardées, et celle-ci 
-sera à nouveau accessible d&apos;ici 90 secondes. 
+                        Redémarre le serveur en charge de la région après un avertissement de deux minutes. Tous les résidents dans cette région seront déconnectés. Les données de la région seront sauvegardées et réapparaîtront au bout de 90 secondes. 
  
-Le redémarrage d&apos;une région ne règle pas la plupart des 
-problèmes de performance, et doit être utilisé seulement lorsque nécessaire.
+Le redémarrage la région ne permet pas de résoudre la plupart des problèmes de performance. Les redémarrages ne doivent avoir lieu que si cela est vraiment nécessaire.
                 </message>
         </alert>
         <alert name="HelpRegionWaterHeight" title="Niveau de l&apos;eau">
                 <message name="message">
-                        Ceci est la hauteur en mètres du niveau d&apos;apparition de l&apos;eau. Si
-cette valeur est différente de 20 et que vous avez de l&apos;eau adjacente au bord du monde ou dans
-le &apos;vide&apos;, un espace sera visible. 
+                        Il s&apos;agit de la hauteur de l&apos;eau en mètres. 
+Si ce paramètre est différent de 20 et que vous avez de l&apos;eau adjacente au bord du monde ou de l&apos;eau « vide », il y aura un espace vide visible.
+ 
  
-Défaut : 20
+Défaut : 20
                 </message>
         </alert>
-        <alert name="HelpRegionTerrainRaise" title="Rehausser relief">
+        <alert name="HelpRegionTerrainRaise" title="Surélévation du terrain">
                 <message name="message">
-                        Les propriétaires de parcelles peuvent élever le relief de cette distance
-par rapport à la hauteur par défaut du relief figé.
+                        Il s&apos;agit de la distance (en mètres) à laquelle les propriétaires de parcelle peuvent surélever leur terrain, par rapport au terrain « figé » dont la hauteur est fixée par défaut.  
  
-Défaut : 4
+Défaut : 4
                 </message>
         </alert>
-        <alert name="HelpRegionTerrainLower" title="Abaisser relief">
+        <alert name="HelpRegionTerrainLower" title="Abaisser le terrain">
                 <message name="message">
-                        Les propriétaires de parcelles peuvent abaisser le relief de cette distance
-par rapport à la hauteur par défaut du relief figé.
+                        Il s&apos;agit de la distance (en mètres) à laquelle les propriétaires de parcelle peuvent abaisser leur terrain, par rapport au terrain « figé » dont la hauteur est fixée par défaut.  
  
-Défaut : -4
+Défaut : -4
                 </message>
         </alert>
-        <alert name="HelpRegionUploadRaw" title="Uploader relief au format RAW...">
+        <alert name="HelpRegionUploadRaw" title="Charger le terrain au format RAW">
                 <message name="message">
                         Ce bouton permet de charger un fichier .RAW dans la région où vous vous trouvez. 
 Ce fichier doit avoir les bonnes dimensions (RGB, 256 x 256) et 13 canaux. Le meilleur moyen de créer un fichier terrain est de télécharger le fichier RAW existant. Un bon moyen est de modifier le canal rouge (hauteur terrain) et de le charger. 
@@ -3644,113 +3651,77 @@ Le chargement peut prendre jusqu&apos;à 45 secondes. Veuillez noter que le char
 Pour en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
                 </message>
         </alert>
-        <alert name="HelpRegionDownloadRaw" title="Télécharger un relief au format RAW">
+        <alert name="HelpRegionDownloadRaw" title="Télécharger le terrain au format RAW">
                 <message name="message">
-                        Ce bouton télécharge un fichier contenant les données de hauteur, 
-les dimensions de la parcelle, le statut de parcelles mises en vente et quelques 
-autorisations pour cette région. Si vous ouvrez ce fichier à l&apos;aide d&apos;un programme comme 
-Photoshop, vous devrez préciser les dimensions du document : 
-RVB, 256x256 avec 13 canaux. Ce fichier de relief ne peut
-être ouvert autrement. 
+                        Ce bouton permet de télécharger un fichier contenant les données relatives à la hauteur du terrain, dimensions de la parcelle, les mises en vente ainsi que certaines permissions relatives à la parcelle pour cette région. Lorsque vous ouvrez le fichier avec un programme tel que Photoshop, vous devez indiquer les dimensions du document qui sont les suivantes : RGB, 256 x 256 avec 13 canaux. Le fichier terrain ne peut pas être ouvert différemment. 
  
-Pour plus d&apos;informations sur les champs de hauteur, allez sur : 
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+Pour en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
                 </message>
         </alert>
-        <alert name="HelpRegionUseEstateSun" title="Utiliser soleil du domaine">
+        <alert name="HelpRegionUseEstateSun" title="Utiliser le soleil du domaine">
                 <message name="message">
-                        Cette option définit la position du soleil de votre région 
-sur celle du soleil dans le reste du domaine. 
+                        Si vous cochez cette case, la position du soleil dans cette région sera la même que dans le reste du domaine. 
  
-Défaut : activé
+Défaut : activé
                 </message>
         </alert>
         <alert name="HelpRegionFixedSun" title="Soleil fixe">
                 <message name="message">
-                        Cette option définit la position du soleil
-sur celle du curseur de Phase et fige le soleil. 
+                        Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger. 
  
-Défaut : désactivé
+Défaut : désactivé
                 </message>
         </alert>
-        <alert name="HelpRegionBakeTerrain" title="Figer Relief">
+        <alert name="HelpRegionBakeTerrain" title="Figer le terrain">
                 <message name="message">
-                        Ce bouton sauvegarde la forme actuelle du relief comme nouvelle valeur 
-par défaut pour la région. Une fois figé, le terrain peut être ramené
-à sa forme par défaut en utilisant l&apos;outil &quot;Annuler Modifications&quot; dans
-le menu Modifier Relief. Le relief figé est également le point central
-qui fixe les limites d&apos;abaissement/réhaussement du relief.
+                        Ce bouton permet d&apos;enregistrer la forme actuelle du terrain comme nouvelle forme par défaut pour la région. Une fois figé, le terrain peut reprendre la forme enregistrée à partir de l&apos;option Rétablir le terrain à la section Modifer le terrain. Le terrain figé est aussi le point de référence pour les limites de surélévation et d&apos;abaissement.
                 </message>
         </alert>
-        <alert name="HelpEstateEstateManager" title="Administrateurs du domaine">
+        <alert name="HelpEstateEstateManager" title="Gérants du domaine">
                 <message name="message">
-                        Un administrateur de domaine est un résident à qui vous déléguez
-le contrôle de la région et le paramétrage du domaine.  Un administrateur de domaine
-peut modifier tous les paramètres à l&apos;aide de ces contrôles, sauf uploader, 
-télécharger, et fondre le relief.  Ils peuvent notamment
-autoriser ou bannir des résidents de votre domaine.  
+                        Un gérant de domaine est un résident chargé du contrôle de la région et des paramètres du domaine. Un gérant de domaine peut modifier tous les paramètres, mais ne peut pas charger, télécharger ni figer de terrain. Un des pouvoirs principaux du gérant est de bannir ou d&apos;autoriser un résident sur votre domaine. 
  
-Les administrateurs de domaines ne peuvent être ajoutés ou retirés
-que par le propriétaire du domaine. Ne choisissez comme administrateurs que des
-résidents en qui vous avez totale confiance, car vous serez
-responsables de leurs actes.
+Seuls les propriétaires de domaine peuvent ajouter ou supprimer des gérants de domaine. Lorsque vous choisissez un gérant de domaine, prenez un résident en qui vous avez confiance car vous serez en quelque sorte responsable de ses actions.
                 </message>
         </alert>
-        <alert name="HelpEstateUseGlobalTime" title="Utiliser l&apos;heure globale">
+        <alert name="HelpEstateUseGlobalTime" title="Utiliser le temps universel">
                 <message name="message">
-                        Cette option cale la position du soleil de votre domaine 
-sur celle du soleil des domaines appartenant aux Linden&apos; 
-sur le &apos;continent&apos;. 
+                        Cette case permet au soleil de votre domaine de suivre la position du soleil sur les domaines Linden du continent. 
  
-Défaut : activé
+Défaut : activé
                 </message>
         </alert>
         <alert name="HelpEstateFixedSun" title="Soleil fixe">
                 <message name="message">
-                        Cette option définit la position du soleil
-sur celle du curseur de Phase et fige le soleil.
+                        Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger.
                 </message>
         </alert>
-        <alert name="HelpEstateExternallyVisible" title="Visible depuis le continent">
+        <alert name="HelpEstateExternallyVisible" title="Accès public">
                 <message name="message">
-                        Définit si les résidents qui se trouvent sur des domaines du Continent (appartenant aux Linden) 
-peuvent voir votre domaine sur la carte du monde. 
+                        Cette option vous permet de choisir quels résidents d&apos;autres domaines peuvent pénétrer sur votre domaine sans devoir être ajoutés à la liste d&apos;accès.
  
-Défaut : activé
+Défaut : activé
                 </message>
         </alert>
-        <alert name="HelpEstateAllowDirectTeleport" title="Autoriser téléportation directe">
+        <alert name="HelpEstateAllowDirectTeleport" title="Autoriser la téléportation directe">
                 <message name="message">
-                        Activé, permet aux résidents de se téléporter directement vers n&apos;importe quel
-point de votre domaine.  Désactivé, les résidents se téléportent
-vers le téléport le plus proche. 
+                        Lorsqu&apos;elle est cochée, cette option permet aux résidents d&apos;être téléportés à n&apos;importe quel endroit sur votre domaine.  Lorsque cette option n&apos;est pas cochée, les résidents sont téléportés au téléhub le plus proche. 
  
-Défaut : désactivé
+Défaut : désactivé
                 </message>
         </alert>
         <alert name="HelpEstateAllowResident" title="Autoriser l&apos;accès">
                 <message name="message">
-                        Si un résident figure dans cette liste, l&apos;accès au domaine sera
-limité aux résidents de la liste et aux groupes affichés ci-dessous.
- 
-(Si le domaine est visible depuis le continent, l&apos;accès ne peut être 
-limité à une liste de résidents ou de groupes. Cette option sera 
-désactivée.  Seule la liste noire sera prise en compte.)
+                        L&apos;accès à ce domaine sera réservé aux résidents figurant dans cette liste et aux groupes ci-dessous.
+Cette option n&apos;est disponible que lorsque la case Accès public est décochée.
                 </message>
         </alert>
-        <alert name="HelpEstateAllowGroup" title="Autoriser l&apos;accès au groupe">
+        <alert name="HelpEstateAllowGroup" title="Autoriser l&apos;accès de groupe">
                 <message name="message">
-                        Si un groupe figure dans cette liste, l&apos;accès au domaine sera
-limité aux groupes de la liste et aux résidents nommément 
-autorisés ci-dessus. 
- 
-(Si le domaine est visible depuis le continent, l&apos;accès ne peut être 
-limité à une liste de résidents ou de groupes. Cette option sera 
-désactivée.  Seule la liste noire sera prise en compte.)
+                        L&apos;accès à ce domaine sera réservé aux groupes figurant dans cette liste et aux résidents ci-dessous.  Cette option n&apos;est disponible que lorsque la case Accès public est décochée.
                 </message>
         </alert>
-        <alert name="HelpEstateAbuseEmailAddress"
-             title="Adresse e-mail où signaler une infraction">
+        <alert name="HelpEstateAbuseEmailAddress" title="Adresse e-mail où signaler une infraction">
                 <message name="message">
                         Si vous utilisez une adresse e-mail valide, les rapports d&apos;infraction de ce domaine iront à cette adresse. 
 Si vous laissez ce champ vide, les rapports d&apos;infraction seront envoyés à Linden Lab uniquement.
@@ -3758,11 +3729,7 @@ Si vous laissez ce champ vide, les rapports d&apos;infraction seront envoyés à
         </alert>
         <alert name="HelpEstateBanResident" title="Refuser l&apos;accès">
                 <message name="message">
-                        Les résidents figurant sur cette liste n&apos;ont pas accès à votre domaine, 
-quels que soient les réglages d&apos;autorisations ou de groupe ci-dessus. 
- 
-Ajouter un résident à cette liste le retirera de
-la liste des personnes autorisées.
+                        Les résidents figurant sur cette liste ne peuvent pas pénétrer sur votre domaine, quels que soient les autres paramètres.
                 </message>
         </alert>
         <alert name="HelpEstateVoiceChat" title="Autoriser les chats vocaux">
@@ -3777,7 +3744,7 @@ Défaut : désactivé
                         Cette version de Second Life n&apos;est pas compatible avec la fonctionnalité de chat vocal dans cette région. Vous devez mettre à jour Second Life pour que le chat vocal fonctionne correctement.
                 </message>
         </alert>
-        <alert name="HelpEstateCovenant" title="Clause de sauvegarde du domaine">
+        <alert name="HelpEstateCovenant" title="Règlement du domaine">
                 <message name="message">
                         Définir un règlement pour le domaine vous permet de vendre les parcelles de ce domaine. S&apos;il n&apos;y a pas de règlement, vous ne pouvez pas vendre le terrain. Si vous ne souhaitez pas indiquer de règlement ou donner de conseils aux acheteurs, laissez la section relative au règlement vide. 
  
@@ -3792,22 +3759,22 @@ L&apos;acheteur est tenu  d&apos;accepter le règlement en cochant une case avan
 Veuillez sélectionner un seul objet et recommencez.
                 </message>
         </alert>
-        <alert name="BuyObjectOneOwner" title="Achat des objets impossible">
+        <alert name="BuyObjectOneOwner" title="Impossible d&apos;acheter des objets">
                 <message name="message">
-                        Vous ne pouvez acheter des objets à plusieurs personnes en même temps.
-Veuillez sélectionner un seul objet et réessayez.
+                        Impossible d&apos;acheter simultanément des objets de propriétaires différents. 
+Veuillez ne sélectionner qu&apos;un seul objet.
                 </message>
         </alert>
-        <alert name="BuyContentsOneOnly" title="Achat du contenu impossible">
+        <alert name="BuyContentsOneOnly" title="Impossible d&apos;acheter des contenus">
                 <message name="message">
-                        Impossible d&apos;acheter le contenu de plus d&apos;un objet à la fois. 
-Veuillez sélectionner un seul objet et recommencez.
+                        Impossible d&apos;acheter les contenus de plus d&apos;un objet à la fois. 
+Veuillez ne sélectionner qu&apos;un seul objet.
                 </message>
         </alert>
-        <alert name="BuyContentsOneOwner" title="Achat du contenu impossible">
+        <alert name="BuyContentsOneOwner" title="Impossible d&apos;acheter des contenus">
                 <message name="message">
-                        Vous ne pouvez acheter des objets à plusieurs personnes en même temps.
-Veuillez sélectionner un seul objet et réessayez.
+                        Impossible d&apos;acheter simultanément des objets de propriétaires différents. 
+Veuillez ne sélectionner qu&apos;un seul objet.
                 </message>
         </alert>
         <alert name="PermYes">
@@ -3822,15 +3789,15 @@ Veuillez sélectionner un seul objet et réessayez.
         </alert>
         <alert name="BuyOriginal">
                 <message name="message">
-                        Acheter objet original à [OWNER] pour L$[PRICE] ?
-Vous deviendrez propriétaire de l&apos;objet.
-Vous pourrez :
- Le modifier : [MODIFYPERM]
- Le copier : [COPYPERM]
- Le revendre ou le donner : [RESELLPERM]
+                        Acheter l&apos;objet original pour [PRICE] L$ à [PRICE] ?
+Vous deviendrez le propriétaire de cet objet.
+Vous pourrez :
+ Modifier : [MODIFYPERM]
+ Copier : [COPYPERM]
+ Revendre ou donner : [RESELLPERM]
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3838,15 +3805,15 @@ Vous pourrez :
         </alert>
         <alert name="BuyOriginalNoOwner">
                 <message name="message">
-                        Acheter objet original pour L$[PRICE] ?
-Vous deviendrez propriétaire de l&apos;objet.
-Vous pourrez :
- Le modifier : [MODIFYPERM]
- Le copier : [COPYPERM]
- Le revendre ou le donner : [RESELLPERM]
+                        Acheter l&apos;objet original pour [PRICE] L$ ?
+Vous deviendrez le propriétaire de cet objet.
+Vous pourrez :
+ Modifier : [MODIFYPERM]
+ Copier : [COPYPERM]
+ Revendre ou donner : [RESELLPERM]
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3854,15 +3821,15 @@ Vous pourrez :
         </alert>
         <alert name="BuyCopy">
                 <message name="message">
-                        Acheter une copie à [OWNER] pour L$[PRICE] ?
-L&apos;objet sera copié vers votre inventaire.
-Vous pourrez :
- Le modifier : [MODIFYPERM]
- Le copier : [COPYPERM]
- Le revendre ou le donner : [RESELLPERM]
+                        Acheter une copie pour [PRICE] L$ à [OWNER] ?
+L&apos;objet sera copié dans votre inventaire.
+Vous pourrez :
+ Modifier : [MODIFYPERM]
+ Copier : [COPYPERM]
+ Revendre ou donner : [RESELLPERM]
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3870,15 +3837,15 @@ Vous pourrez :
         </alert>
         <alert name="BuyCopyNoOwner">
                 <message name="message">
-                        Acheter une copie pour L$[PRICE] ?
-L&apos;objet sera copié vers votre inventaire.
-Vous pourrez :
- Le modifier : [MODIFYPERM]
- Le copier : [COPYPERM]
- Le revendre ou le donner : [RESELLPERM]
+                        Acheter une copie pour [PRICE] L$ ?
+L&apos;objet sera copié dans votre inventaire.
+Vous pourrez :
+ Modifier : [MODIFYPERM]
+ Copier : [COPYPERM]
+ Revendre ou donner : [RESELLPERM]
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3886,11 +3853,11 @@ Vous pourrez :
         </alert>
         <alert name="BuyContents">
                 <message name="message">
-                        Acheter le contenu à [OWNER] pour L$[PRICE] ?
-Il sera copié vers votre inventaire.
+                        Acheter des contenus pour [PRICE] L$ à [OWNER] ?
+Ils seront copiés dans votre inventaire.
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3898,11 +3865,11 @@ Il sera copié vers votre inventaire.
         </alert>
         <alert name="BuyContentsNoOwner">
                 <message name="message">
-                        Acheter le contenu pour L$[PRICE] ?
-Il sera copié vers votre inventaire.
+                        Acheter des contenus pour [PRICE] L$ ?
+Ils seront copiés dans votre inventaire.
                 </message>
                 <option name="Buy">
-                        Acheter
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3910,14 +3877,13 @@ Il sera copié vers votre inventaire.
         </alert>
         <alert name="ConfirmPurchase">
                 <message name="message">
-                        Cette transaction entraînera :
- 
+                        Suite à cette transaction, vous allez :
 [ACTION]
  
-Etes-vous sûr(e) de vouloir poursuivre cet achat ?
+Êtes-vous certain de vouloir effectuer cette transaction ?
                 </message>
                 <option name="Confirm">
-                        Confirmer
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3925,15 +3891,14 @@ Etes-vous sûr(e) de vouloir poursuivre cet achat ?
         </alert>
         <alert name="ConfirmPurchasePassword">
                 <message name="message">
-                        Cette transaction entraînera :
- 
+                        Suite à cette transaction, vous allez :
 [ACTION]
  
-Etes-vous sûr(e) de vouloir poursuivre cet achat ?
-Veuillez saisir à nouveau votre mot de passe et cliquez sur &apos;Confirmer&apos;.
+Êtes-vous certain de vouloir effectuer cette transaction ?
+Veuillez saisir à nouveau votre mot de passe et cliquer sur OK.
                 </message>
                 <option name="ConfirmPurchase">
-                        Confirmer votre achat
+                        OK
                 </option>
                 <option name="Cancel">
                         Annuler
@@ -3941,10 +3906,8 @@ Veuillez saisir à nouveau votre mot de passe et cliquez sur &apos;Confirmer&apo
         </alert>
         <alert name="SetPickLocation">
                 <message name="message">
-                        Note :
-Vous avez mis à jour la position
-de ce lieu mais les autres détails
-conserveront leurs valeurs initiales.
+                        Remarque :
+Vous avez mis à jour l&apos;emplacement de ce favori mais les autres détails resteront inchangés.
                 </message>
                 <option name="OK">
                         OK
@@ -3952,47 +3915,42 @@ conserveront leurs valeurs initiales.
         </alert>
         <alert name="MoveInventoryFromObject">
                 <message name="message">
-                        Vous avez sélectionné des éléments d&apos;inventaire non copiables.
-Ces éléments seront déplacés vers votre inventaire, et non copiés.
+                        Vous avez sélectionné des objets de l&apos;inventaire qui ne peuvent pas être copiés.
+Ces objets seront déplacés vers votre inventaire, et non pas copiés.
  
-Déplacer l(es) élément(s)?
+Déplacer les objets de l&apos;inventaire ?
                 </message>
                 <ignore name="ignore">
                         Lors du transfert d&apos;un inventaire non reproductible depuis des objets
                 </ignore>
                 <option name="Move">
-                        Se déplacer
+                        OK
                 </option>
                 <option name="Don&apos;tMove">
-                        Ne pas bouger
+                        Annuler
                 </option>
         </alert>
         <alert name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        Vous avez sélectionné des éléments d&apos;inventaire non copiables.  Ces éléments
-seront déplacés vers votre inventaire, et non copiés.
- 
-Cet objet étant scripté, le déplacement de ces éléments vers
-votre inventaire risque de perturber le fonctionnement du script. 
+                        Vous avez sélectionné des objets de l&apos;inventaire qui ne peuvent pas être copiés. Ces objets seront déplacés vers votre inventaire, et non pas copiés.
+Étant donné que l&apos;objet est
+scripté, déplacer ces objets vers votre inventaire risque de causer des problèmes au niveau du script. 
  
-Déplacer l(es) élément(s) d&apos;inventaire ?
+Déplacer les objets de l&apos;inventaire ?
                 </message>
                 <ignore name="ignore">
                         Lors du transfert d&apos;un inventaire non reproductible depuis des objets scriptés
                 </ignore>
                 <option name="Move">
-                        Se déplacer
+                        OK
                 </option>
                 <option name="Don&apos;tMove">
-                        Ne pas bouger
+                        Annuler
                 </option>
         </alert>
         <alert name="ClickActionNotPayable">
                 <message name="message">
-                        Avertissement : l&apos;action &quot;Payer Objet&quot; a été définie, mais elle
-ne fonctionnera que si un script de transaction money() y est ajouté, 
-car les résidents s&apos;attendent à ce que les objets 
-réagissent lorsqu&apos;un paiement est effectué.
+                        Avertissement : l&apos;action du clic Payer l&apos;objet a été défini mais ne fonctionnera que si un script est ajouté avec l&apos;event money().
                 </message>
                 <ignore name="ignore">
                         Lors du paramétrage de la fonction Payer sur des objets sans événement monétaire
@@ -4000,9 +3958,23 @@ réagissent lorsqu&apos;un paiement est effectué.
         </alert>
         <alert name="OpenObjectCannotCopy">
                 <message name="message">
-                        Cet objet ne contient aucun élément copiable.
+                        Vous n&apos;êtes autorisé à copier aucun élément dans cet objet.
                 </message>
         </alert>
+        <alert name="WebLaunchAccountHistory">
+                <message name="message">
+                        Aller sur le site de Second Life pour consulter l&apos;historique de votre compte ?
+                </message>
+                <ignore name="ignore">
+                        Lors du chargement de la page web contenant l&apos;historique de votre compte
+                </ignore>
+                <option name="Gotopage">
+                        Aller sur cette page
+                </option>
+                <option name="Cancel">
+                        Annuler
+                </option>
+        </alert>
         <alert name="ClickOpenF1Help">
                 <message name="message">
                         Visiter les pages d&apos;aide de Second Life ?
@@ -4033,7 +4005,7 @@ réagissent lorsqu&apos;un paiement est effectué.
         </alert>
         <alert name="ConfirmQuit">
                 <message name="message">
-                        Etes-vous sûr(e) de vouloir quitter?
+                        Êtes-vous certain de vouloir quitter ?
                 </message>
                 <ignore name="ignore">
                         Lorsque vous quittez Second Life
@@ -4052,14 +4024,14 @@ réagissent lorsqu&apos;un paiement est effectué.
 http://secondlife.com/corporate/tos.php 
 http://secondlife.com/corporate/cs.php
 
-Lorsqu&apos;elles sont signalées, toutes les infractions aux Conditions d&apos;utilisation et aux Règles de la communauté, font l&apos;objet d&apos;une enquête et sont résolues. Pour accéder aux détails de la résolution d&apos;un incident, allez sur :
+Lorsqu&apos;elles sont signalées, toutes les infractions aux Conditions d&apos;utilisation et aux Règles de la communauté font l&apos;objet d&apos;une enquête et sont résolues. Pour accéder aux détails de la résolution d&apos;un incident, allez sur :
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
                 <message name="message">
-                        Important : Ce rapport ira au propriétaire de la 
+                        Important : ce rapport ira au propriétaire de la 
 région dans laquelle vous êtes et non à Linden Lab.
 
 Pour aider les résidents et les visiteurs, le propriétaire de 
@@ -4078,129 +4050,130 @@ ne sera pas affecté par les résultats de cette enquête. Seul Linden Lab peut
 interdire l&apos;accès à l&apos;ensemble de Second Life.
                 </message>
         </alert>
+        <alert name="HelpReportBug">
+                <message name="message">
+                        N&apos;utilisez cet outil que pour signaler des problèmes techniques et soyez aussi précis que possible.
+Vous pouvez répondre à l&apos;e-mail automatique pour ajouter des détails à votre rapport.
+
+Tous les bugs signalés sont reproduits et évalués. Aucune réponse ne sera envoyée par e-mail.
+
+Si vous avez un problème technique, veuillez contacter le service clientèle à : 
+
+http://secondlife.com/community/support.php
+
+Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une enquête.
+                </message>
+        </alert>
         <alert name="HelpReportAbuseSelectCategory">
                 <message name="message">
-                        Veuillez choisir une catégorie pour ce rapport d&apos;abus.
- 
-Le choix d&apos;une catégorie nous permet de classer et traiter efficacement les rapports d&apos;abus.
+                        Veuillez choisir une catégorie pour ce rapport d&apos;infraction.
+Le choix d&apos;une catégorie nous permet de traiter les rapports d&apos;infraction plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportBugSelectCategory">
                 <message name="message">
                         Veuillez choisir une catégorie pour ce bug.
- 
-Le choix d&apos;une catégorie nous permet de classer et traiter efficacement les rapports de bugs.
+Le choix d&apos;une catégorie nous permet de traiter les bugs plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserNameEmpty">
                 <message name="message">
-                        Veuillez saisir le nom de la personne responsable de l&apos;abus.
- 
-La précision des données nous permet de classer et traiter efficacement les rapports d&apos;abus.
+                        Veuillez saisir le nom du contrevenant.
+Lorsque nous avons le nom du contrevenant, nous sommes en mesure de traiter les rapports plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserLocationEmpty">
                 <message name="message">
-                        Veuillez saisir le lieu où s&apos;est produit l&apos;abus constaté.
- 
-La précision des données nous permet de classer et traiter efficacement les rapports d&apos;abus.
+                        Veuillez indiquer l&apos;endroit où l&apos;infraction a eu lieu.
+Les informations précises et exactes nous permettent de traiter les rapports plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportAbuseSummaryEmpty">
                 <message name="message">
-                        Veuillez saisir un résumé de l&apos;abus constaté.
- 
-Un résumé précis nous permet de classer et traiter efficacement les rapports d&apos;abus.
+                        Veuillez saisir un récapitulatif de l&apos;infraction.
+Les récapitulatifs précis nous permettent de traiter les rapports plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportBugSummaryEmpty">
                 <message name="message">
-                        Veuillez saisir un résumé du bug constaté.
- 
-Un résumé précis nous permet de classer et traiter efficacement les rapports de bugs.
+                        Veuillez saisir un récapitulatif du bug.
+Les récapitulatifs précis nous permettent de résoudre les bugs plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportAbuseDetailsEmpty">
                 <message name="message">
-                        Veuillez saisir une description précise de l&apos;abus constaté.
-Soyez aussi précis(e) que possible, en indiquant les noms et les détails
-de l&apos;incident.
- 
-Une description précise nous permet de classer et traiter efficacement les rapports d&apos;abus.
+                        Veuillez saisir une description détaillée de l&apos;infraction.
+Soyez aussi précis que possible et essayez de fournir des noms ainsi que des détails sur l&apos;incident que vous signalez.
+Les descriptions précises nous permettent de traiter les rapports plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportBugDetailsEmpty">
                 <message name="message">
                         Veuillez saisir une description détaillée du bug.
-Soyez aussi précis(e) que possible, en indiquant les étapes pour reproduire le bug
-si possible.
- 
-Une description précise nous permet de classer et traiter efficacement les rapports de bugs.
+Soyez aussi spécifique que possible et essayez d&apos;indiquer les étapes à suivre pour reproduire le bug.
+Les descriptions précises nous permettent de résoudre les bugs plus rapidement.
                 </message>
         </alert>
         <alert name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         Cher résident,
+ 
+Il semble que vous souhaitiez reporter une infraction à des droits de propriété intellectuelle. Pour signaler correctement cette infraction :
 
-Si vous signalez une infraction aux droits de propriété intellectuelle, assurez-vous de fournir les détails suivants :
-
-(1) Vous pouvez envoyer un rapport d&apos;infraction si vous pensez qu&apos;un résident exploite le système de permissions de Second Life, par exemple en utilisant CopyBot ou des outils similaires, pour enfreindre des droits de propriété intellectuelle. L&apos;équipe chargée des infractions mènera une enquête et prendra les mesures nécessaires à l&apos;encontre de toute personne non respectueuse des Conditions d&apos;utilisation et des Règles de la communauté. Néanmoins, cette équipe ignorera les requêtes au sujet du retrait de contenu se trouvant sur Second Life.
-
-(2) Pour demander à ce que du contenu soit retiré de Second Life, vous devez soumettre un rapport d&apos;infraction valide, tel que fourni dans notre règlement sur le retrait de contenu à la page suivante : http://secondlife.com/corporate/dmca.php.
+(1) Remplissez un rapport d&apos;infraction. Vous pouvez soumettre un rapport d&apos;infraction si vous pensez qu&apos;un résident exploite le système de permissions de Second Life, par exemple en utilisant un CopyBot ou des outils similaires pour enfreindre des droits de propriété intellectuelle. Notre équipe chargée des infractions mènera une enquête et prendra les mesures nécessaires à l&apos;encontre du résident non respectueux des Conditions d&apos;utilisation ou des règles de la communauté. Sachez toutefois que l&apos;équipe chargée des infractions ne supprimera pas de contenu à l&apos;intérieur de Second Life.
 
-Si vous souhaitez continuer à signaler l&apos;infraction, veuillez fermer cette fenêtre et finir de soumettre votre rapport.
+(2) Demandez à ce que du contenu à l&apos;intérieur de Second Life soit supprimé. Pour demander à ce que du contenu soit supprimé de Second Life, vous devez soumettre un rapport d&apos;infraction valide, tel que fourni dans notre Règlement contre les violations des droit d&apos;auteurs (DMCA), à http://secondlife.com/corporate/dmca.php.
 
-Cordialement,
+Si vous souhaitez toujours reporter cette infraction, veuillez fermer cette fenêtre et soumettre votre rapport.  Vous devrez peut-être sélectionner la catégorie CopyBot ou exploitation abusive des permissions.
 
+Merci,
+ 
 Linden Lab
                 </message>
         </alert>
         <alert name="FailedRequirementsCheck">
                 <message name="message">
-                        Les composants nécessaires suivants sont absents de [FLOATER] :
+                        Les composantes requises suivantes ne se trouvent pas dans [FLOATER]:
 [COMPONENTS]
                 </message>
         </alert>
-        <alert name="ReplaceAttachment" title="Remplacer attachement existant">
+        <alert name="ReplaceAttachment" title="Remplacer la pièce-jointe existante">
                 <message name="message">
-                        Il y a déjà un objet attaché à cette partie du corps.
-Voulez-vous le remplacer par l&apos;objet sélectionné ?
+                        Vous avez déjà un objet sur cette partie du corps.
+Voulez-vous le remplacer par l&apos;objet sélectionné ?
                 </message>
                 <ignore name="ignore">
                         Lors du remplacement de pièces-jointes existantes
                 </ignore>
-                <option name="Yes">
-                        Oui
+                <option ignore="Remplacer automatiquement" name="Yes">
+                        OK
                 </option>
-                <option name="No">
-                        Non
+                <option ignore="Ne jamais remplacer" name="No">
+                        Annuler
                 </option>
         </alert>
-        <alert name="BusyModePay" title="Avertissement de mode occupé">
+        <alert name="BusyModePay" title="Réponse si occupé(e)">
                 <message name="message">
-                        Vous êtes en mode Occupé, ce qui signifie que vous
-ne recevrez aucun objet en échange de
-ce paiement.
+                        Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
  
-Voulez-vous quitter le mode Occupé avant
-de finaliser cette transaction ?
+Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
                 </message>
                 <ignore name="ignore">
                         Lorsque vous envoyez de l&apos;argent à une personne en mode Occupé
                 </ignore>
-                <option name="Yes">
-                        Oui
+                <option ignore="Toujours quitter le mode occupé" name="Yes">
+                        OK
                 </option>
-                <option name="No">
-                        Non
+                <option ignore="Ne jamais quitter le mode occupé" name="No">
+                        Annuler
                 </option>
         </alert>
         <alert name="ConfirmEmptyTrash">
                 <message name="message">
-                        Etes-vous certain de vouloir supprimer le contenu de votre poubelle de manière permanente  ?
+                        Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente  ?
                 </message>
                 <ignore name="ignore">
-                        Lorsque vous videz la poubelle de l&apos;inventaire
+                        Lorsque vous videz la corbeille de l&apos;inventaire
                 </ignore>
                 <option name="Yes">
                         OK
@@ -4211,7 +4184,7 @@ de finaliser cette transaction ?
         </alert>
         <alert name="ConfirmClearBrowserCache">
                 <message name="message">
-                        Etes-vous certain de vouloir vider le cache de votre navigateur ?
+                        Êtes-vous certain de vouloir vider le cache de votre navigateur ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -4222,7 +4195,7 @@ de finaliser cette transaction ?
         </alert>
         <alert name="ConfirmClearCookies">
                 <message name="message">
-                        Etes-vous certain de vouloir supprimer vos cookies ?
+                        Êtes-vous certain de vouloir supprimer vos cookies ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -4233,7 +4206,7 @@ de finaliser cette transaction ?
         </alert>
         <alert name="ConfirmClearMediaUrlList">
                 <message name="message">
-                        Etes-vous certain de vouloir supprimer la liste des URL enregistrées ?
+                        Êtes-vous certain de vouloir supprimer la liste des URL enregistrées ?
                 </message>
                 <option name="Yes">
                         Oui
@@ -4244,10 +4217,10 @@ de finaliser cette transaction ?
         </alert>
         <alert name="ConfirmEmptyLostAndFound">
                 <message name="message">
-                        Etes-vous certain de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
+                        Êtes-vous certain de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
                 </message>
                 <ignore name="ignore">
-                        Losque vous videz le dossier Objets trouvés dans vote inventaire
+                        Losque vous videz le dossier Objets trouvés dans votre inventaire
                 </ignore>
                 <option name="Yes">
                         Oui
@@ -4258,36 +4231,36 @@ de finaliser cette transaction ?
         </alert>
         <alert name="CopySLURL">
                 <message name="message">
-                        La SLURL suivante a été copiée sur votre presse-papier :
+                        La SLURL suivante a été copiée dans votre presse-papier :
  [SLURL] 
 
-Mettez-la dans une page web pour permettre aux autres utilisateurs d&apos;accéder facilement à cet endroit ou bien collez-la dans la barre d&apos;adresse de votre navigateur.
+Mettez-la dans une page web pour permettre aux autres résidents d&apos;accéder facilement à cet endroit ou bien collez-la dans la barre d&apos;adresse de votre navigateur.
                 </message>
                 <ignore name="ignore">
-                        Lorsque vous copiez une SLURL sur votre presse-papier
+                        Lorsque vous copiez une SLURL dans votre presse-papier
                 </ignore>
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        Ce panel contrôle la taille de la fenêtre et la résolution, ainsi que la qualité des graphiques client.  Les préférences de l&apos;interface graphique vous permettent de choisir entre 4 niveaux de graphiques : Faible, Moyen, Élevé et Ultra. Personnalisez vos options graphiques en cliquant sur le bouton Personnaliser et en changeant les paramètres suivants :
+                        Ce menu permet de contrôler la taille de la fenêtre et la résolution, ainsi que la qualité des graphiques client. Les préférences de l&apos;interface graphique vous permettent de choisir entre 4 niveaux de graphiques : Faible, Moyen, Élevé et Ultra. Personnalisez vos options graphiques en cliquant sur le bouton Personnaliser et en changeant les paramètres suivants :
 
-Shaders : active ou désactive les différents types de shaders pixels. 
+Effets : active ou désactive les différents types de shaders pixels. 
 
-Détails des reflets : définit le type d&apos;objets reflétés dans l&apos;eau.
+Objets reflétés : définit le type d&apos;objets reflétés dans l&apos;eau.
 
-Rendu de l&apos;avatar : définit les options qui impactent la manière dont le client rend les avatars.
+Rendu de l&apos;avatar : définit les options qui influent sur la manière dont le client rend les avatars.
 
-Distance d&apos;affichage : la distance à laquelle vous voyez les objets s&apos;afficher dans la scène.
+Limite d&apos;affichage : la distance à laquelle vous voyez les objets s&apos;afficher dans la scène.
 
 Nombre de particules max. : définit le nombre maximum de particules que vous pouvez voir à la fois sur votre écran.
 
 Qualité post-traitement : définit la résolution du rayonnement. 
 
-Détails du maillage : définit le niveau de détail ou le nombre de triangles utilisés dans le rendu de certains objets. Une valeur plus élevée prendra plus de temps pour apparaître, mais permettra d&apos;avoir des objets plus détaillés.
+Détails des rendus : définit le niveau de détail ou le nombre de polygones utilisés dans le rendu de certains objets. Une valeur plus élevée prendra plus de temps pour apparaître, mais permettra d&apos;avoir des objets plus détaillés.
 
-Détails de la lumière : définit les types de lumières que vous souhaitez faire apparaître.
+Sources lumineuses : définit les types de lumières que vous souhaitez faire apparaître.
 
-Détails du terrain : définit le niveau de détail que vous souhaitez utiliser dans la texture du terrain.
+Rendu du terrain : définit le niveau de détail que vous souhaitez utiliser dans la texture du terrain.
                 </message>
         </alert>
         <alert name="WLSavePresetAlert">
@@ -4335,7 +4308,7 @@ Détails du terrain : définit le niveau de détail que vous souhaitez utiliser
         </alert>
         <alert name="HelpEditSky">
                 <message name="message">
-                        Pour créer et sauvegarder plusieurs ciels, modifiez les curseurs WindLight.
+                        Pour créer et sauvegarder plusieurs ciels, utilisez les curseurs WindLight.
                 </message>
         </alert>
         <alert name="HelpEditDayCycle">
@@ -4345,7 +4318,7 @@ Détails du terrain : définit le niveau de détail que vous souhaitez utiliser
         </alert>
         <alert name="EnvSettingsHelpButton">
                 <message name="message">
-                        Ces paramètres permettent de modifier l&apos;environnement local sur votre ordinateur. Pour que vous ayez accès à tous les paramètres, votre carte graphique doit prendre en charge les shaders atmosphériques.
+                        Ces paramètres permettent de modifier l&apos;environnement local sur votre ordinateur. Pour que vous ayez accès à tous les paramètres, votre carte graphique doit prendre en charge les effets atmosphériques.
  
 Pour changer les différentes phases de la journée sur votre visualisateur, utilisez le curseur Heure de la journée.
  
@@ -4372,7 +4345,7 @@ La flèche jaune au dessus de la ligne du temps représente votre vue actuelle,
 
 Vous pouvez définir la position d&apos;une clé en la faisant glisser le long de la ligne du temps ou en définissant manuellement ses valeurs dans la section Réglages des images-clés. Dans cette même section, vous pouvez associer chaque clé au préréglage WindLight respectif.
 
-La Durée du cycle contrôle la durée d&apos;une « journée ». Si vous choisissez une valeur basse (2mn par exemple), cela signigie que toutes les animations de votre journée de 24h se dérouleront en 2mn seulement ! Une fois satisfait de vos choix, utilisez les boutons Jouer et Stop ! pour prévisualiser les résultats. Pour voir l&apos;animation, vous pouvez aussi bouger la flèche jaune au dessus de la ligne du temps. Si vous sélectionnez l&apos;option Utiliser heure domaine, vous synchronisez la durée de votre journée et votre heure avec celle du cycle du jour du domaine.
+La Durée du cycle contrôle la durée d&apos;une « journée ». Si vous choisissez une valeur basse (2mn par exemple), cela signifie que toutes les animations de votre journée de 24h se dérouleront en 2mn seulement ! Une fois satisfait de vos choix, utilisez les boutons Jouer et Stop ! pour prévisualiser les résultats. Pour voir l&apos;animation, vous pouvez aussi bouger la flèche jaune au dessus de la ligne du temps. Si vous sélectionnez l&apos;option Utiliser heure domaine, vous synchronisez la durée de votre journée et votre heure avec celle du cycle du jour du domaine.
 
 Une fois que vous êtes satisfait de votre Cycle du jour, vous pouvez le sauvegarder et le charger grâce aux boutons Enregistrer jour test et Charger Jour Test. Veuillez noter que pour l&apos;instant, nous ne pouvez avoir qu&apos;un seul Cycle du jour.
                 </message>
@@ -4390,7 +4363,7 @@ Il permet de simuler de nombreux paramètres d&apos;exposition, tels que les voi
         </alert>
         <alert name="HelpBlueDensity">
                 <message name="message">
-                        La Densité du bleu affecte la saturation générale des couleurs du ciel et du brouillard. Si vous déplacez le curseur Intensité (I) vers la droite, les couleurs deviennent plus vives et plus vibrantes. Si vous vous le déplacez complètement à gauche, les couleurs deviennent plus fades, puis finalement noires et blanches. Pour paramétrer avec précision la couleur du ciel, vous pouvez contrôler chacun des éléments de la saturation à l&apos;aide des curseurs Rouge/Vert/Bleu (RVB).
+                        La Densité du bleu affecte la saturation générale des couleurs du ciel et du brouillard. Si vous déplacez le curseur Intensité (I) vers la droite, les couleurs deviennent plus vives et plus vibrantes. Si vous le déplacez complètement à gauche, les couleurs deviennent plus fades, puis finalement noires et blanches. Pour paramétrer avec précision la couleur du ciel, vous pouvez contrôler chacun des éléments de la saturation à l&apos;aide des curseurs Rouge/Vert/Bleu (RVB).
                 </message>
         </alert>
         <alert name="HelpHazeDensity">
@@ -4412,7 +4385,7 @@ Les valeurs supérieures à 1 simulent des distances plus importantes pour des e
         </alert>
         <alert name="HelpMaxAltitude">
                 <message name="message">
-                        L&apos;Altitude max. ajuste les calculs de WindLight lors de la computation de la lumière atmosphérique. Quand la fin de la journée approche, il est utile pour ajuster la  « profondeur » du coucher de soleil.
+                        L&apos;Altitude max. ajuste les calculs de WindLight lors de la computation de la lumière atmosphérique. Quand la fin de la journée approche, il est utile pour ajuster la « profondeur » du coucher de soleil.
                 </message>
         </alert>
         <alert name="HelpSunlightColor">
@@ -4422,7 +4395,7 @@ Les valeurs supérieures à 1 simulent des distances plus importantes pour des e
         </alert>
         <alert name="HelpSunAmbient">
                 <message name="message">
-                        Ajuste la couleur et l&apos;intensité de la lumière atmosphérique ambiante de la scène.
+                        Ajuste la couleur et l&apos;intensité de la lumière atmosphérique ambiante.
                 </message>
         </alert>
         <alert name="HelpSunGlow">
@@ -4530,7 +4503,7 @@ Même chose que l&apos;azimut.
         </alert>
         <alert name="HelpWaterScaleAbove">
                 <message name="message">
-                        Contrôle la quantité de lumière réfractée lorsque quelque votre avatar regarde au dessus de l&apos;eau.
+                        Contrôle la quantité de lumière réfractée lorsque votre avatar regarde au dessus de l&apos;eau.
                 </message>
         </alert>
         <alert name="HelpWaterScaleBelow">
@@ -4633,8 +4606,7 @@ Même chose que l&apos;azimut.
                         Les objets qui font partie d&apos;une pièce-jointe ne peuvent pas être achetés.
                 </message>
         </alert>
-        <alert name="DebitPermissionDetails"
-             title="À propos des requêtes pour les permissions de débit">
+        <alert name="DebitPermissionDetails" title="À propos des requêtes pour les permissions de débit">
                 <message name="message">
                         Accepter cette requête donne au script la permission de prélever des dollars Linden (L$) sur votre compte de manière continue. Pour révoquer cette permission, le propriétaire de l&apos;objet doit supprimer l&apos;objet ou bien réinitialiser les scripts dans l&apos;objet.
                 </message>
@@ -4672,9 +4644,6 @@ Voulez-vous aller sur le site de Second Life pour vérifier votre âge ?
                 <option name="No">
                         Non
                 </option>
-                <url>
-                        https://secondlife.com/account/verification.php
-                </url>
         </alert>
         <alert name="Cannot enter parcel: no payment info on file">
                 <message name="message">
@@ -4692,8 +4661,10 @@ Voulez-vous aller sur le site de Second Life pour enregistrer ces informations 
                 <option name="No">
                         Non
                 </option>
-                <url>
-                        https://secondlife.com/account/
-                </url>
+        </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        The string [STRING_NAME] is missing from strings.xml
+                </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_about.xml b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
index a1de6fa..1565e7c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="A propos de Second Life">
         <text_editor name="credits_editor">
-                Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ et de nombreuses autres personnes.
+                Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les et de nombreuses autres personnes.
 
-  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,7 +26,7 @@
   Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  On ne peut pas voir très loin devant nous, mais l&apos;on peut déjà y voir qu&apos;il y a beaucoup à faire. --Alan Turing
+  Je m&apos;en sors avec un peu d&apos;aide de mes amis. --Richard Starkey
         </text_editor>
         <string name="you_are_at">
                 Votre position : [POSITION]
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 9742d2f..942c9e5 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,91 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="À propos du terrain">
         <tab_container name="landtab">
                 <panel label="Général" name="land_general_panel">
-                        <text type="string" length="1" name="Name:">
+                        <text length="1" name="Name:" type="string">
                                 Nom :
                         </text>
-                        <text type="string" length="1" name="Description:">
+                        <line_editor name="Name"/>
+                        <text length="1" name="Description:" type="string">
                                 Description :
                         </text>
-                        <text type="string" length="1" name="Owner:">
+                        <text_editor name="Description"/>
+                        <text length="1" name="Owner:" type="string">
                                 Propriétaire :
                         </text>
-                        <text type="string" length="1" name="OwnerText">
+                        <text length="1" name="OwnerText" type="string">
                                 Leyla Linden
                         </text>
-                        <button label="Profil..." label_selected="Profil..." name="Profile..." />
-                        <text type="string" length="1" name="Group:">
+                        <button label="Profil..." label_selected="Profil..." name="Profile..."/>
+                        <text length="1" name="Group:" type="string">
                                 Groupe :
                         </text>
-                        <button label="Définir..." label_selected="Définir..." name="Set..." />
-                        <check_box label="Autoriser le transfert au groupe" name="check deed"
-                             tool_tip="Un officier peut transférer ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe." />
-                        <button label="Transférer..." label_selected="Transférer..." name="Deed..."
-                             tool_tip="Vous ne pouvez transférer le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné." />
-                        <check_box label="Le propriétaire contribue par transfert" name="check contib"
-                             tool_tip="Lorsque le terrain est transféré au groupe, la contribution du précédent propriétaire suffit à l&apos;entretenir." />
-                        <check_box label="Le propriétaire contribue par une donation" name="check contrib"
-                             tool_tip="Lorsqu&apos;un titre de propriété est transféré au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant." />
-                        <text type="string" length="1" name="For Sale:">
+                        <text name="GroupText"/>
+                        <button label="Définir..." label_selected="Définir..." name="Set..."/>
+                        <check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier peut céder ce terrain au groupe. Il viendra alors s&apos;ajouter au patrimoine du groupe."/>
+                        <button label="Céder..." label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d&apos;officier dans le groupe sélectionné."/>
+                        <check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu&apos;un terrain est cédé au groupe, l&apos;ancien propriétaire fait également un don de terrain suffisant."/>
+                        <text length="1" name="For Sale:" type="string">
                                 À vendre :
                         </text>
-                        <text type="string" length="1" name="Not for sale.">
-                                Pas à vendre.
+                        <text length="1" name="Not for sale." type="string">
+                                Pas à vendre
                         </text>
-                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
-                                Prix : [PRICE] $L.
+                        <text length="1" name="For Sale: Price L$[PRICE]." type="string">
+                                Prix : [PRICE] L$.
                         </text>
-                        <button label="Vendre le terrain..." label_selected="Vendre le terrain..."
-                             name="Sell Land..." />
-                        <text type="string" length="1" name="For sale to">
+                        <text name="SalePending"/>
+                        <button label="Vendre le terrain..." label_selected="Vendre le terrain..." name="Sell Land..."/>
+                        <text length="1" name="For sale to" type="string">
                                 À vendre à : [BUYER]
                         </text>
-                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
+                        <text length="1" name="Sell with landowners objects in parcel." type="string">
                                 Objets inclus dans la vente.
                         </text>
-                        <text type="string" length="1" name="Selling with no objects in parcel.">
+                        <text length="1" name="Selling with no objects in parcel." type="string">
                                 Objets non inclus dans la vente.
                         </text>
-                        <button label="Annuler la vente du terrain"
-                             label_selected="Annuler la vente du terrain" name="Cancel Land Sale" />
-                        <text type="string" length="1" name="Claimed:">
-                                Réclamée :
+                        <button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale" width="165" left="275"/>
+                        <text length="1" name="Claimed:" type="string">
+                                Acquis :
                         </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text length="1" name="DateClaimText" type="string">
                                 Tue Aug 15 13:47:25 2006
                         </text>
-                        <text type="string" length="1" name="PriceLabel">
-                                Surface :
+                        <text length="1" name="PriceLabel" type="string">
+                                Surface :
                         </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text length="1" name="PriceText" type="string">
                                 4048 m²
                         </text>
-                        <text type="string" length="1" name="Traffic:">
-                                Trafic :
+                        <text length="1" name="Traffic:" type="string">
+                                Trafic :
                         </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text length="1" name="DwellText" type="string">
                                 0
                         </text>
-                        <button label="Acheter le terrain..." label_selected="Acheter le terrain..."
-                             name="Buy Land..." />
-                        <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..."
-                             name="Buy For Group..." />
-                        <button label="Acheter un passe..." label_selected="Acheter un passe..."
-                             name="Buy Pass..."
-                             tool_tip="Un passe vous donne un accès temporaire à ce terrain." />
-                        <button label="Céder le terrain..." label_selected="Céder le terrain..."
-                             name="Abandon Land..." />
-                        <button label="Récupérer le terrain…" label_selected="Récupérer le terrain…"
-                             name="Reclaim Land..." />
-                        <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..."
-                             tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères." />
-                        <text name="new users only">
+                        <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..." width="125" left="130"/>
+                        <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
+                        <button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125" left="130"/>
+                        <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="Abandon Land..."/>
+                        <button label="Redemander le terrain..." label_selected="Redemander le terrain…" name="Reclaim Land..."/>
+                        <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d&apos;un résident, avoir un contenu défini et ne pas être aux enchères."/>
+                        <string name="new users only">
                                 Nouveaux utilisateurs uniquement
-                        </text>
-                        <text name="anyone">
+                        </string>
+                        <string name="anyone">
                                 Tout le monde
-                        </text>
+                        </string>
                         <string name="area_text">
                                 Surface
                         </string>
@@ -122,61 +112,58 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
                         </string>
                 </panel>
                 <panel label="Règlement" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text length="1" name="covenant_timestamp_text" type="string">
                                 Last Modified Wed Dec 31 16:00:00 1969
                         </text>
-                        <text type="string" length="1" name="region_name_lbl">
+                        <text length="1" name="region_name_lbl" type="string">
                                 Région :
                         </text>
-                        <text type="string" length="1" name="region_name_text">
+                        <text length="1" name="region_name_text" type="string">
                                 leyla
                         </text>
-                        <text type="string" length="1" name="estate_name_lbl">
+                        <text length="1" name="estate_name_lbl" type="string">
                                 Domaine :
                         </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text length="1" name="estate_name_text" type="string">
                                 continent
                         </text>
-                        <text type="string" length="1" name="estate_owner_lbl">
+                        <text length="1" name="estate_owner_lbl" type="string">
                                 Propriétaire :
                         </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text length="1" name="estate_owner_text" type="string">
                                 (aucun)
                         </text>
-                        <text type="string" length="1" name="resellable_clause">
+                        <text length="1" name="resellable_clause" type="string">
                                 Le terrain acheté dans cette région ne peut être revendu.
                         </text>
-                        <text type="string" length="1" name="changeable_clause">
+                        <text length="1" name="changeable_clause" type="string">
                                 Le terrain acheté dans cette région ne peut être revendu/divisé.
                         </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
+                        <text_editor length="1" name="covenant_editor" type="string">
                                 Il n&apos;y a aucun règlement pour ce domaine.
                         </text_editor>
-                        <text name="can_resell">
+                        <string name="can_resell">
                                 Le terrain acheté dans cette région peut être revendu.
-                        </text>
-                        <text name="can_not_resell">
+                        </string>
+                        <string name="can_not_resell">
                                 Le terrain acheté dans cette région ne peut pas être revendu.
-                        </text>
-                        <text name="can_change">
+                        </string>
+                        <string name="can_change">
                                 Le terrain acheté dans cette région peut être fusionné ou divisé.
-                        </text>
-                        <text name="can_not_change">
+                        </string>
+                        <string name="can_not_change">
                                 Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
-                        </text>
+                        </string>
                 </panel>
                 <panel label="Objets" name="land_objects_panel">
                         <text name="parcel_object_bonus">
                                 Facteur Bonus Objets : [BONUS]
                         </text>
-                        <text type="string" length="1" name="Simulator primitive usage:">
-                                Prims utilisés sur le sim :
-                        </text>
-                        <text type="string" length="1" name="0 out of 0 available">
-                                0 sur 14055 (14055 disponibles)
+                        <text length="1" name="Simulator primitive usage:" type="string">
+                                Prims utilisées sur la parcelle :
                         </text>
-                        <text name="objects_available">
-                                [COUNT] sur [COUNT] ([COUNT] disponibles)
+                        <text name="objects_available" left="214" width="230">
+                                [COUNT] sur [MAX] ([AVAILABLE] disponibles)
                         </text>
                         <string name="objects_available_text">
                                 [COUNT] sur [MAX] ([AVAILABLE] disponibles)
@@ -184,113 +171,103 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
                         <string name="objects_deleted_text">
                                 [COUNT] sur [MAX] ([DELETED] seront supprimés)
                         </string>
-                        <text type="string" length="1" name="Primitives parcel supports:">
+                        <text length="1" name="Primitives parcel supports:" type="string" width="200">
                                 Prims max. sur la parcelle :
                         </text>
-                        <text type="string" length="1" name="object_contrib_text">
+                        <text length="1" name="object_contrib_text" type="string" left="214" width="152">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Primitives on parcel:">
+                        <text length="1" name="Primitives on parcel:" type="string">
                                 Prims sur la parcelle :
                         </text>
-                        <text type="string" length="1" name="total_objects_text">
+                        <text length="1" name="total_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Owned by parcel owner:">
+                        <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
                                 Appartenant au propriétaire :
                         </text>
-                        <text type="string" length="1" name="owner_objects_text">
+                        <text length="1" name="owner_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowOwner" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Set to group:">
+                        <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+                        <text length="1" name="Set to group:" type="string" left="14" width="180">
                                 Donnés au groupe :
                         </text>
-                        <text type="string" length="1" name="group_objects_text">
-                                0
+                        <text length="1" name="group_objects_text" type="string" left="214" width="48">
+                                [COUNT]
                         </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowGroup" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Owned by others:">
+                        <button label="Afficher" label_selected="Afficher" name="ShowGroup" width="60" right="-135"/>
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+                        <text length="1" name="Owned by others:" type="string" left="14" width="128">
                                 Appartenant à d&apos;autres :
                         </text>
-                        <text type="string" length="1" name="other_objects_text">
-                                0
+                        <text length="1" name="other_objects_text" type="string" left="214" width="48">
+                                [COUNT]
                         </text>
-                        <button label="Afficher" label_selected="Afficher" name="ShowOther" />
-                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..."
-                             tool_tip="Renvoyer les objets à leurs propriétaires." />
-                        <text type="string" length="1" name="Selected / sat upon:">
+                        <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
+                        <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires."  right="-10" width="119"/>
+                        <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
                                 Sélectionnés/où quelqu&apos;un est assis :
                         </text>
-                        <text type="string" length="1" name="selected_objects_text">
-                                0
-                        </text>
-                        <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
-                                Renvoi automatique des objets appartenant aux autres résidents (minutes, 0 pour désactiver):
+                        <text length="1" name="selected_objects_text" type="string" left="214" width="48">
+                                [COUNT]
                         </text>
-                        <text name="Autoreturn">
+                        <text name="Autoreturn" width="412" left="4">
                                 Renvoi automatique des objets d&apos;autres résidents (minutes, 0 pour désactiver) :
                         </text>
-                        <text type="string" length="1" name="Object Owners:">
+                        <line_editor name="clean other time" right="-6" width="36" />
+                        <text length="1" name="Object Owners:" type="string">
                                 Propriétaires :
                         </text>
-                        <button label="Rafraîchir la liste" label_selected="Rafraîchir la liste"
-                             name="Refresh List" />
-                        <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..."
-                             name="Return objects..." />
-                        <button label="" label_selected="" name="Type" tool_tip="Trier par type" />
-                        <button label="Nom" label_selected="Nom" name="Name" tool_tip="Trier par nom" />
-                        <button label="Trafic" label_selected="Trafic" name="Count" tool_tip="Trier par trafic" />
+                        <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh List"/>
+                        <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..." name="Return objects..."/>
                         <name_list label="Plus récents" name="owner list">
-                                <column label="Type" name="type" />
-                                <column label="Nom" name="name" />
-                                <column label="Nombre" name="count" />
+                                <column label="Type" name="type"/>
+                                <column name="online_status"/>
+                                <column label="Nom" name="name"/>
+                                <column label="Nombre" name="count"/>
+                                <column label="Plus récents" name="mostrecent"/>
                         </name_list>
                 </panel>
                 <panel label="Options" name="land_options_panel">
-                        <text type="string" length="1" name="allow_label">
+                        <text length="1" name="allow_label" type="string">
                                 Autoriser les autres résidents à :
                         </text>
-                        <text name="allow_label2">
+                        <check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n&apos;importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
+                        <check_box label="Créer des repères" name="check landmark"/>
+                        <check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n&apos;est pas cochée, ils ne pourront voler que lorsqu&apos;ils arrivent et passent au dessus de votre terrain."/>
+                        <text name="allow_label2" left="152">
                                 Créer des objets :
                         </text>
-                        <check_box label="Tous les résidents" name="edit objects check" />
-                        <check_box label="Modifier le terrain" name="edit land check" />
-                        <check_box label="Créer des repères" name="check landmark" />
-                        <check_box label="Groupe" name="edit group objects check" />
-                        <text name="allow_label3">
-                                Apporter des objets :
+                        <check_box label="Tous les résidents" name="edit objects check" left="285"/>
+                        <check_box label="Groupe" name="edit group objects check" left="395"/>
+                        <text name="allow_label3" left="152" width="134">
+                                Laisser entrer des objets :
                         </text>
-                        <check_box label="Tous les résidents" name="all object entry check" />
-                        <check_box label="Groupe" name="group object entry check" />
-                        <text name="allow_label4">
+                        <check_box label="Tous les résidents" name="all object entry check" left="285"/>
+                        <check_box label="Groupe" name="group object entry check" left="395"/>
+                        <text name="allow_label4" left="152">
                                 Exécuter des scripts :
                         </text>
-                        <check_box label="Groupe" name="check group scripts" />
-                        <check_box label="Voler" name="check fly" />
-                        <check_box label="Tous les résidents" name="check other scripts" />
-                        <text type="string" length="1" name="land_options_label">
+                        <check_box label="Tous les résidents" name="check other scripts" left="285"/>
+                        <check_box label="Groupe" name="check group scripts" left="395"/>
+                        <text length="1" name="land_options_label" type="string">
                                 Options du terrain :
                         </text>
-                        <check_box label="Sécurisé (pas de dégâts)" name="check safe" />
-                        <check_box label="Interdire les bousculades" name="PushRestrictCheck"
-                             tool_tip="llPushObject ne fonctionne que sur les scripts du propriétaire de la parcelle ou sur les scripts où la personne qui bouscule est aussi la propriétaire du script." />
-                        <check_box label="Afficher dans la recherche (30 $L/semaine) sous"
-                             name="ShowDirectoryCheck"
-                             tool_tip="Afficher la parcelle dans les résultats de recherche" />
-                        <combo_box name="land category">
+                        <check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n&apos;y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
+                        <check_box label="Pas de bousculades" left="14" bottom="-140"
+                                name="PushRestrictCheck" tool_tip="Empêche l&apos;utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
+                        <check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
+                        <combo_box name="land category" left="286" width="146" bottom="-160">
                                 <combo_item name="AnyCategory">
-                                        Toute catégorie
+                                        Toutes catégories
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        Emplacement Linden
+                                        Appartenant aux Lindens
                                 </combo_item>
                                 <combo_item name="Adult">
-                                        Adultes
+                                        Adulte
                                 </combo_item>
                                 <combo_item name="Arts&amp;Culture">
                                         Art et Culture
@@ -305,10 +282,10 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
                                         Jeux
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        Endroit favori
+                                        Favoris
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        Convivial pour les nouveaux
+                                        Accueil pour les nouveaux
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
                                         Parcs et Nature
@@ -323,186 +300,142 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
                                         Autre
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Publier liste sur le web" name="PublishCheck"
-                             tool_tip="Publiez vos informations de parcelle sur le web." />
-                        <check_box label="Contenu pour adultes" name="MatureCheck"
-                             tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." />
-                        <button label="?" label_selected="?" name="?" />
-                        <text type="string" length="1" name="Snapshot:">
+                        <button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
+                        <check_box label="Contenu pour adultes" name="MatureCheck" tool_tip="Les infos sur votre parcelle, ou le contenu de cette dernière, sont à caractère adulte." bottom="-180"/>
+                        <text length="1" name="Snapshot:" type="string" bottom="-200">
                                 Photo :
                         </text>
-                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" />
-                        <text type="string" length="1" name="Landing Point: (none)">
-                                Point d&apos;atterrissage : (aucun)
-                        </text>
-                        <text name="landing_point">
+                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" bottom="-319"/>
+                        <text name="landing_point" bottom="-323">
                                 Lieu d&apos;arrivée : [LANDING]
                         </text>
                         <string name="landing_point_none">
                                 (aucun)
                         </string>
-                        <button label="Définir" label_selected="Définir" name="Set"
-                             tool_tip="Définir le lieu d&apos;arrivée de l&apos;avatar sur votre position actuelle. ll doit se trouver sur cette parcelle de terrain." />
-                        <button label="Annuler" label_selected="Annuler" name="Clear"
-                             tool_tip="Dégager le lieu d&apos;arrivée." />
-                        <text type="string" length="1" name="Teleport Routing: ">
-                                Options de téléportation :
-                        </text>
-                        <combo_box name="landing type"
-                             tool_tip="Vous permet de paramétrer les téléportations sur votre terrain.">
-                                <combo_item type="string" length="1" name="Blocked">
-                                        Bloquée
+                        <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d&apos;arrivée des visiteurs. Définit l&apos;emplacement de votre avatar sur ce terrain." bottom="-323"/>
+                        <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d&apos;arrivée." bottom="-323"/>
+                        <text length="1" name="Teleport Routing: " type="string" bottom="-343">
+                                Règles de téléportation :
+                        </text>
+                        <combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
+                                <combo_item length="1" name="Blocked" type="string">
+                                        Bloqué
                                 </combo_item>
-                                <combo_item type="string" length="1" name="LandingPoint">
-                                        Lieu d&apos;arrivée défini
+                                <combo_item length="1" name="LandingPoint" type="string">
+                                        Lieu d&apos;arrivée fixe
                                 </combo_item>
-                                <combo_item type="string" length="1" name="Anywhere">
-                                        Lieu d&apos;arrivée indéfini
+                                <combo_item length="1" name="Anywhere" type="string">
+                                        Lieu d&apos;arrivée libre
                                 </combo_item>
                         </combo_box>
                         <string name="push_restrict_text">
-                                Interdire les bousculades
+                                Pas de bousculades
                         </string>
                         <string name="push_restrict_region_text">
-                                Interdire les bousculades (passer outre les règles de la région)
+                                Pas de bousculades (les règles de la région priment)
                         </string>
                 </panel>
-                <panel label="Média" name="land_media_panel">
-                        <text name="with media:">
+                <panel label="Médias" name="land_media_panel">
+                        <text name="with media:" width="85">
                                 Type de média :
                         </text>
-                        <combo_box name="media type"
-                             tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" />
-                        <text name="at URL:">
+                        <combo_box name="media type" tool_tip="Indiquez s&apos;il s&apos;agit de l&apos;URL d&apos;un film, d&apos;une page web ou autre" left="97"/>
+                        <text name="mime_type"/>
+                        <text name="at URL:" width="85">
                                 URL du média :
                         </text>
-                        <button label="Définir..." label_selected="Définir..." name="set_media_url" />
+                        <line_editor name="media_url" left="97"/>
+                        <button label="Définir..." label_selected="Définir..." name="set_media_url"/>
                         <text name="Description:">
                                 Description :
                         </text>
-                        <line_editor name="url_description"
-                             tool_tip="Texte affiché à côté du bouton Jouer/Charger" />
+                        <line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger" left="97"/>
+                        <text length="1" name="Media texture:" type="string">
+                                Remplacer
+la texture :
+                        </text>
+                        <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" left="97"/>
                         <text name="replace_texture_help">
                                 (Les objets avec cette texture affichent le film ou 
-la page web quand vous cliquez sur la flèche Jouer).
+la page web quand vous cliquez sur la flèche Jouer.)
                         </text>
                         <text name="Options:">
                                 Options
 média :
                         </text>
-                        <check_box label="Média en boucle" name="media_loop"
-                             tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera." />
-                        <check_box label="Masquer l&apos;URL du média" name="hide_media_url"
-                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML." />
-                        <check_box label="Masquer l&apos;URL de la musique" name="hide_music_url"
-                             tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique." />
-                        <text name="media_size"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut.">
+                        <check_box left="97" label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement."/>
+                        <check_box label="Média en boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
+                        <check_box left="97" label="Masquer l&apos;URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL du média. Cette option n&apos;est pas disponible pour les fichiers HTML."/>
+                        <check_box label="Masquer l&apos;URL de la musique" name="hide_music_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l&apos;URL de la musique."/>
+                        <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105" left="102">
                                 Taille du média :
                         </text>
-                        <spinner name="media_size_width"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
-                        <spinner name="media_size_height"
-                             tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." />
+                        <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." left_delta="89"/>
+                        <spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
                         <text name="pixels">
                                 pixels
                         </text>
-                        <text name="MusicURL:">
-                                URL de la musique :
+                        <text name="MusicURL:" bottom_delta="-28">
+                                URL de la
+musique :
                         </text>
+                        <line_editor name="music_url" left="97" bottom_delta="-12"/>
                         <text name="Sound:">
                                 Son :
                         </text>
-                        <check_box label="Limiter le son spatial à cette parcelle" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
-                                URL du flux :
-                        </text>
-                        <text type="string" length="1" name="Media texture:">
-                                Remplacer
-la texture :
-                        </text>
-                        <text type="string" length="1" name="Replace this texture:">
-                                Remplacer cette texture :
-                        </text>
-                        <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" />
-                        <text type="string" length="1" name="with content from this URL:">
-                                par du contenu situé à l&apos;URL suivante :
-                        </text>
-                        <check_box label="Échelle automatique" name="media_auto_scale"
-                             tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l&apos;échelle. La qualité visuelle sera peut-être amoindrie mais vous n&apos;aurez à faire aucune autre mise à l&apos;échelle ou alignement." />
+                        <check_box label="Limiter le son ambiant à cette parcelle" name="check sound local" left="97" />
                         <text name="Voice settings:">
                                 Voix :
                         </text>
-                        <radio_group name="parcel_voice_channel">
+                        <radio_group name="parcel_voice_channel" left="97" width="310">
                                 <radio_item name="Estate">
-                                        Utiliser le canal spatial du domaine
+                                        Utiliser le canal du domaine
                                 </radio_item>
                                 <radio_item name="Private">
-                                        Utiliser un canal spatial privé
+                                        Utiliser un canal privé
                                 </radio_item>
                                 <radio_item name="Disabled">
-                                        Désactiver les canaux spatiaux audios sur cette parcelle
+                                        Désactiver les canaux audios
                                 </radio_item>
                         </radio_group>
                 </panel>
                 <panel label="Accès" name="land_access_panel">
-                        <text type="string" length="1" name="Limit access to this parcel to:">
+                        <text length="1" name="Limit access to this parcel to:" type="string">
                                 Accès à cette parcelle
                         </text>
-                        <check_box label="Autoriser l&apos;accès public" name="public_access" />
+                        <check_box label="Autoriser l&apos;accès public" name="public_access"/>
                         <text name="Only Allow">
-                                Bloquer l&apos;accès :
-                        </text>
-                        <check_box
-                             label="Aux résidents qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab"
-                             name="limit_payment" tool_tip="Aux résidents non identifés" />
-                        <check_box label="Aux résidents dont l&apos;âge n&apos;a pas été vérifié"
-                             name="limit_age_verified"
-                             tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
+                                Bloquer l&apos;accès aux résidents :
+                        </text>
+                        <check_box label="Qui n&apos;ont pas fourni leurs informations de paiement à Linden Lab" name="limit_payment" tool_tip="Aux résidents non identifés"/>
+                        <check_box label="Dont l&apos;âge n&apos;a pas été vérifié" name="limit_age_verified" tool_tip="Aux résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com."/>
                         <string name="estate_override">
                                 Au moins une de ces options est définie au niveau du domaine.
                         </string>
-                        <check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck"
-                             tool_tip="Définir le groupe à l&apos;onglet Général." />
-                        <check_box label="Avatars : (0 dans la liste, 300 max)" name="AccessCheck" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-                        <button label="Retirer" label_selected="Retirer" name="Remove" />
-                        <check_box label="Vendre des passes à :" name="PassCheck"
-                             tool_tip="Autoriser un accès temporaire à cette parcelle" />
+                        <check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
+                        <check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
                         <combo_box name="pass_combo">
                                 <combo_item name="Anyone">
-                                        N&apos;importe qui
+                                        Tout le monde
                                 </combo_item>
                                 <combo_item name="Group">
                                         Groupe
                                 </combo_item>
                         </combo_box>
-                        <spinner label="Prix en $L :" name="PriceSpin" />
-                        <spinner label="Heures d&apos;accès :" name="HoursSpin" />
+                        <spinner label="Prix en L$ :" name="PriceSpin"/>
+                        <spinner label="Durée en heures :" name="HoursSpin"/>
                         <text label="Toujours autoriser" name="AllowedText">
                                 Résidents autorisés
                         </text>
-                        <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed" />
-                        <button label="Supprimer" label_selected="Supprimer" name="remove_allowed" />
-                        <text label="Interdire" name="BanCheck">
-                                Résidents interdits
+                        <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)"/>
+                        <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed"/>
+                        <button label="Supprimer" label_selected="Supprimer" name="remove_allowed"/>
+                        <text label="Bannir" name="BanCheck">
+                                Résidents bannis
                         </text>
-                        <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="add_banned" />
-                        <button label="Supprimer" label_selected="Supprimer" name="remove_banned" />
-                </panel>
-                <panel label="Bannir" name="land_ban_panel">
-                        <check_box label="Bannir les avatars suivants : (0 dans la liste, 300 max)"
-                             name="LandBanCheck" />
-                        <button label="Ajouter..." label_selected="Ajouter..." name="Add..." />
-                        <button label="Retirer" label_selected="Retirer" name="Remove" />
-                        <text type="string" length="1" name="Deny by Payment Status:">
-                                Refuser selon les infos de paiement :
-                        </text>
-                        <check_box label="Refuser sans infos de paiement enregistrées" name="DenyAnonymousCheck" />
-                        <check_box label="Refuser avec infos de paiement enregistrées" name="DenyIdentifiedCheck" />
-                        <check_box label="Refuser avec infos de paiement utilisées" name="DenyTransactedCheck" />
+                        <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)"/>
+                        <button label="Ajouter..." label_selected="Ajouter..." name="add_banned"/>
+                        <button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
index 59be25a..ea277bf 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="active_speakers" title="Intervenants actifs">
         <panel name="active_speakers_panel">
                 <scroll_list name="speakers_list">
-                        <column label="Nom" name="speaker_name" />
+                        <column label="Nom" name="speaker_name"/>
                 </scroll_list>
                 <panel name="volume_container">
-                        <button name="mute_btn" tool_tip="Rendre ce résident muet" />
+                        <button name="mute_btn" tool_tip="Ignorer ce résident"/>
                 </panel>
         </panel>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index bc63609..66e12be 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
         <text name="name_label">
                 Nom :
@@ -6,13 +6,11 @@
         <text name="description_label">
                 Description :
         </text>
-        <spinner label="Priorité" name="priority"
-             tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation." />
-        <text name="preview_label">
+        <spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
+        <text name="preview_label" width="110">
                 Prévisualiser pendant
         </text>
-        <combo_box label="" name="preview_base_anim"
-             tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
+        <combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
                 <combo_item name="Standing">
                         Debout
                 </combo_item>
@@ -26,16 +24,13 @@
                         En train de voler
                 </combo_item>
         </combo_box>
-        <check_box label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle." />
-        <spinner label="Début (%)" name="loop_in_point"
-             tool_tip="Définit le moment de l&apos;animation où la boucle repart." />
-        <spinner label="Fin (%)" name="loop_out_point"
-             tool_tip="Définit le moment de l&apos;animation où la boucle finit." />
-        <text name="hand_label">
+        <check_box  left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
+        <spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l&apos;animation où la boucle repart."/>
+        <spinner left="195" label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l&apos;animation où la boucle finit."/>
+        <text name="hand_label" width="110">
                 Mouvement de main
         </text>
-        <combo_box label="" name="hand_pose_combo"
-             tool_tip="Contrôle le mouvement des mains au cours de lanimation">
+        <combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l&apos;animation" left_delta="116" width="124">
                 <combo_item name="Spread">
                         Doigts écartés
                 </combo_item>
@@ -73,14 +68,13 @@
                         Taper
                 </combo_item>
                 <combo_item name="PeaceRight">
-                        Peace (droite)
+                        Paix (main droite)
                 </combo_item>
         </combo_box>
         <text name="emote_label">
                 Expression
         </text>
-        <combo_box label="" name="emote_combo"
-             tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation.">
+        <combo_box label="" name="emote_combo" tool_tip="Contrôle l&apos;expression du visage au cours de l&apos;animation." left_delta="116" width="124">
                 <combo_item name="[None]">
                         [None]
                 </combo_item>
@@ -142,20 +136,19 @@
                         Soucis
                 </combo_item>
         </combo_box>
-        <spinner label="Transition début (s)" name="ease_in_time"
-             tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement." />
-        <spinner label="Transition fin (s)" name="ease_out_time"
-             tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement." />
-        <button label="" name="play_btn" tool_tip="Jouer/Pauser votre animation." />
-        <button label="" name="stop_btn" tool_tip="Arrêter le playback" />
-        <slider label="" name="playback_slider" />
+        <spinner label_width="65" label="Transition &#10;début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation s&apos;intègre au mouvement."/>
+        <spinner label_width="65" left="160" width="125" label="Transition &#10;fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l&apos;animation disparaît du mouvement."/>
+        <button label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation." bottom_delta="-48"/>
+        <button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
+        <slider label="" name="playback_slider"/>
         <text name="bad_animation_text">
                 Impossible de lire le fichier d&apos;animation.
 
-Nous recommandons les fichiers BVH extraits de Poser 4.
+Nous recommandons les fichiers BVH extraits de
+Poser 4.
         </text>
-        <button label="Annuler" name="cancel_btn" />
-        <button label="Charger ([AMOUNT] $L)" name="ok_btn" />
+        <button label="Annuler" name="cancel_btn"/>
+        <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
         <string name="failed_to_initialize">
                 Echec de l&apos;initialisation du mouvement
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index 6730766..82d715d 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Choisir le résident">
         <text name="Type part of the person&apos;s name:">
                 Entrez les premières lettres du nom de la personne :
@@ -6,15 +6,15 @@
         <text name="instruct_search_resident_name">
                 Saisissez une partie du nom du résident :
         </text>
-        <button label="Trouver" label_selected="Trouver" name="Find" />
+        <button label="Chercher" label_selected="Chercher" name="Find"/>
         <text name="Or select a calling card:">
                 Ou sélectionnez une carte de visite :
         </text>
         <text name="Or select their calling card:">
-                Ou choisissez une carte de visite :
+                Ou sélectionnez une carte de visite :
         </text>
-        <button label="Sélectionner" label_selected="Sélectionner" name="Select" />
-        <button label="Fermer" label_selected="Fermer" name="Close" />
+        <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+        <button label="Fermer" label_selected="Fermer" name="Close"/>
         <text name="NotFound">
                 &apos;[TEXT]&apos; introuvable
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index ac7f212..929bc31 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="Textures de l&apos;avatar">
         <text name="">
                 Baked Textures
@@ -20,7 +20,7 @@
         <texture_picker label="Å’il" name="eye_texture" />
         <texture_picker label="Haut du corps" name="baked_upper_body" />
         <texture_picker label="Tatouage haut du corps" name="upper_bodypaint" />
-        <texture_picker label="Tricot de peau" name="undershirt" />
+        <texture_picker label="Tricot" name="undershirt" />
         <texture_picker label="Gants" name="gloves" />
         <texture_picker label="Chemise" name="shirt" />
         <texture_picker label="Veste (en haut)" name="upper_jacket" />
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml b/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
new file mode 100644
index 0000000..06bcdee
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="beacons" title="Balises">

+        <panel name="beacons_panel">

+                <check_box label="Objets scriptés avec Toucher uniquement" name="touch_only"/>

+                <check_box label="Objets scriptés" name="scripted"/>

+                <check_box label="Objets physiques" name="physical"/>

+                <check_box label="Sources sonores" name="sounds"/>

+                <check_box label="Sources des particules" name="particles"/>

+                <check_box label="Montrer les surbrillances" name="highlights"/>

+                <check_box label="Montrer les balises" name="beacons"/>

+                <text name="beacon_width_label">

+                        Largeur de la balise :

+                </text>

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index 18d8e1e..3d55a1e 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="Acheter des contenus">
         <text name="contains_text">
                 [NAME] contient :
         </text>
         <text name="buy_text">
-                Acheter [AMOUNT] $L à [NAME] ?
+                Acheter [AMOUNT] L$ à [NAME] ?
         </text>
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-        <button label="Acheter" label_selected="Acheter" name="buy_btn" />
-        <check_box label="Porter maintenant" name="wear_check" />
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+        <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
+        <check_box label="Porter maintenant" name="wear_check"/>
         <string name="no_copy_text">
                 (pas de copie)
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index d02e8e8..9ae924c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="Acheter des devises">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Acheter des L$">
         <text left="5" name="info_buying">
-                Achat de devises :
+                Achat de L$ :
         </text>
         <text left="5" name="info_cannot_buy" right="-5">
                 Impossible d&apos;acheter maintenant :
@@ -12,24 +12,24 @@
         <text name="error_message">
                 Quelque chose ne va pas.
         </text>
-        <button label="Aller sur le site" name="error_web" />
+        <button label="Aller sur le site" name="error_web"/>
         <text name="contacting">
-                En train de contacter Lindex...
+                En train de contacter le Lindex...
         </text>
         <text name="buy_action_unknown" right="-5">
-                Acheter des $L sur le marché des changes du LindeX
+                Acheter des L$ sur le marché du LindeX
         </text>
         <text name="buy_action">
-                [NAME] $L [PRICE]
+                [NAME] L$ [PRICE]
         </text>
         <text name="currency_action">
-                Acheter des $L
+                Acheter des L$
         </text>
         <line_editor name="currency_amt">
                 1234
         </line_editor>
         <text name="currency_est" width="138">
-                pour environ [USD] $US
+                pour environ [USD] US$
         </text>
         <text name="getting_data" width="138">
                 Obtention des données...
@@ -38,19 +38,19 @@
                 Actuellement, vous avez
         </text>
         <text name="balance_amount">
-                [AMT] $L
+                [AMT] L$
         </text>
         <text name="buying_label">
                 Vous achetez
         </text>
         <text name="buying_amount">
-                [AMT] $L
+                [AMT] L$
         </text>
         <text name="total_label">
                 Votre solde sera de
         </text>
         <text name="total_amount">
-                [AMT] $L
+                [AMT] L$
         </text>
         <text name="purchase_warning_repurchase">
                 En confirmant cette transaction, vous achetez uniquement les devises.
@@ -60,9 +60,9 @@ Vous devrez recommencer cette opération.
                 Vous n&apos;achetez pas assez de devises.
 Veuillez saisir un montant plus élevé.
         </text>
-        <button label="Acheter" name="buy_btn" />
-        <button label="Annuler" name="cancel_btn" />
+        <button label="Acheter" name="buy_btn"/>
+        <button label="Annuler" name="cancel_btn"/>
         <string name="buy_currency">
-                Acheter [LINDENS] $L pour environ [USD] $US
+                Acheter [LINDENS] L$ pour environ [USD] US$
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 815e16a..e2d5946 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="Acheter le terrain">
         <text name="region_name_label">
                 Région :
@@ -19,7 +19,7 @@
                 (inconnu)
         </text>
         <text name="resellable_changeable_label">
-                Terrains achetés dans cette région :
+                Terrain acheté dans cette région :
         </text>
         <text name="resellable_clause">
                 Le terrain acheté dans cette région peut être revendu ou pas.
@@ -31,9 +31,9 @@
                 Vous devez accepter le règlement du domaine :
         </text>
         <text_editor name="covenant_editor">
-                Chargement en cours...
+                Chargement...
         </text_editor>
-        <check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant" />
+        <check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant"/>
         <text name="info_parcel_label">
                 Parcelle :
         </text>
@@ -50,15 +50,15 @@
                 Prix :
         </text>
         <text name="info_price">
-                1500 $L, objets inclus
+                1500 L$, objets inclus
         </text>
-        <text name="info_action">
+        <text name="info_action" width="275">
                 Si vous achetez ce terrain :
         </text>
         <text name="error_message">
                 Quelque chose ne va pas.
         </text>
-        <button label="Aller sur le site" name="error_web" />
+        <button label="Aller sur le site" name="error_web"/>
         <text name="account_action">
                 Vous passerez à un compte Premium.
         </text>
@@ -67,44 +67,43 @@
         </text>
         <combo_box name="account_level">
                 <combo_item name="US$9.95/month,billedmonthly">
-                        9,95 $US/mois, facturation mensuelle
+                        9,95 US$/mois, facturation mensuelle
                 </combo_item>
                 <combo_item name="US$7.50/month,billedquarterly">
-                        7,50 $US/mois, facturation trimestrielle
+                        7,50 US$/mois, facturation trimestrielle
                 </combo_item>
                 <combo_item name="US$6.00/month,billedannually">
-                        6,00 $US/mois, facturation annuelle
+                        6,00 US$/mois, facturation annuelle
                 </combo_item>
         </combo_box>
-        <text name="land_use_action">
-                Augmentez vos frais d&apos;occupation de terrain à 40 $US/mois.
+        <text name="land_use_action" width="210" right="430">
+                Augmentez vos frais d&apos;occupation de terrain à 40 US$/mois.
         </text>
         <text name="land_use_reason">
                 Vous possédez un terrain de 1,309 mètres carrés. 
 Cette parcelle fait 512 mètres carrés.
         </text>
         <text name="purchase_action">
-                Payez au résident X 4 000 $L pour le terrain
+                Payez au résident X 4 000 L$ pour le terrain
         </text>
         <text name="currency_reason">
-                Vous avez 2 100 $L.
+                Vous avez 2 100 L$.
         </text>
         <text name="currency_action">
-                Acheter des $L
+                Acheter des L$
         </text>
         <line_editor name="currency_amt">
                 1000
         </line_editor>
         <text name="currency_est">
-                pour environ [AMOUNT2] $US
+                pour environ [AMOUNT2] US$
         </text>
         <text name="currency_balance">
-                Vous avez 2 100 $L.
+                Vous avez 2 100 L$.
         </text>
-        <check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe."
-             name="remove_contribution" />
-        <button label="Acheter" name="buy_btn" />
-        <button label="Annuler" name="cancel_btn" />
+        <check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe." name="remove_contribution"/>
+        <button label="Acheter" name="buy_btn"/>
+        <button label="Annuler" name="cancel_btn"/>
         <text name="can_resell">
                 Peut être revendu.
         </text>
@@ -184,20 +183,20 @@ et la seule fois où vous pouvez acheter une parcelle &apos;Premier Terrain&apos
         </text>
         <text name="first_time_but_not_first_land">
                 Ceci est votre première acquisition de terrain, mais cette
-parcelle n&apos;est pas réservée aux nouveaux acheteurs.  Vous devriez
-peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
+parcelle n&apos;est pas réservée aux nouveaux acheteurs. Vous devriez
+peut-être chercher une parcelle Premier Terrain moins chère.
         </text>
         <text name="land_holdings">
-                Vous possédez un terrain de [BUYER] mètres carrés.
+                Vous possédez un terrain de [BUYER] m².
         </text>
         <text name="pay_to_for_land">
-                Payez [AMOUNT] $L à [SELLER] pour ce terrain
+                Payez [AMOUNT] L$ à [SELLER] pour ce terrain
         </text>
         <text name="buy_for_US">
-                Acheter [AMOUNT] $L pour environ [AMOUNT2] $US,
+                Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
         </text>
         <text name="parcel_meters">
-                Cette parcelle fait [AMOUNT] mètres carrés.
+                Cette parcelle fait [AMOUNT] m².
         </text>
         <text name="premium_land">
                 Ce terrain est premium et les frais associés sont de [AMOUNT]/m².
@@ -206,7 +205,8 @@ peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
                 Ce terrain est en solde et les frais associés sont de [AMOUNT]/m².
         </text>
         <text name="meters_supports_object">
-                [AMOUNT] m² peuvent prendre en charge [AMOUNT2] objets
+                [AMOUNT] m²
+peuvent contenir [AMOUNT2] prims
         </text>
         <text name="sold_with_objects">
                 vendu avec objets
@@ -215,21 +215,21 @@ peut-être chercher une parcelle &apos;Premier Terrain&apos; moins chère.
                 Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d&apos;occupation de terrain avant que l&apos;achat de cette parcelle ne soit finalisé.
         </text>
         <text name="have_enough_lindens">
-                Vous avez [AMOUNT]$L, ce qui est suffisant pour acheter ce terrain.
+                Vous avez [AMOUNT]L$, ce qui est suffisant pour acheter ce terrain.
         </text>
         <text name="not_enough_lindens">
-                Vous n&apos;avez que [AMOUNT] $L et vous avez besoin de [AMOUNT2] $L de plus.
+                Vous n&apos;avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus.
         </text>
         <text name="balance_left">
-                Après cet achat, il vous restera [AMOUNT] $L.
+                Après cet achat, il vous restera [AMOUNT] L$.
         </text>
         <text name="balance_needed">
-                Pour avoir les moyens d&apos;acquérir ce terrain, vous devez acheter au moins [AMOUNT] $L.
+                Pour avoir les moyens d&apos;acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$.
         </text>
         <string name="no_parcel_selected">
                 (aucune parcelle sélectionnée)
         </string>
         <string name="buy_currency">
-                Acheter [LINDENS] $L pour environ [USD] $US
+                Acheter [LINDENS] L$ pour environ [USD] US$
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 52b5101..9e0ce25 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="Acheter une copie de l&apos;objet">
         <text name="contents_text">
                 et ses contenus :
         </text>
         <text name="buy_text">
-                Acheter pour [AMOUNT] $L à [NAME] ?
+                Acheter pour [AMOUNT] L$ à [NAME] ?
         </text>
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-        <button label="Acheter" label_selected="Acheter" name="buy_btn" />
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+        <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
         <string name="title_buy_text">
                 Acheter
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
index 8bb6c40..26476e3 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="chat floater" title="Chat local">
         <string name="ringing">
                 Connexion au chat vocal du Monde en cours…
@@ -10,16 +10,16 @@
                 Voix non disponible à l&apos;endroit où vous êtes
         </string>
         <string name="hang_up">
-                Déconnecté du chat vocal du Monde
+                Déconnecté du chat vocal
         </string>
         <string name="voice_icon">
                 icn_voice-localchat.tga
         </string>
         <string name="IM_logging_string">
-                -- Connexion de messagerie instantanée activée --
+                -- Archivage des IM activé --
         </string>
         <string name="IM_end_log_string">
-                - Fin da la connexion --
+                - Fin de l&apos;archivage --
         </string>
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
@@ -28,14 +28,13 @@
                                         Gestes
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Afficher le texte ignoré" name="show mutes" />
-                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn"
-                             tool_tip="Cliquez ici pour voir la liste des intervenants actifs dans cette session IM." />
+                        <check_box label="Afficher le texte ignoré" name="show mutes"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affichez/masquez la liste des intervenants actifs dans cette session IM."/>
                         <panel name="chat_panel">
                                 <string name="gesture_label">
                                         Gestes
                                 </string>
-                                <line_editor label="Cliquez ici pour chatter." name="Chat Editor" />
+                                <line_editor label="Cliquez ici pour chatter." name="Chat Editor"/>
                                 <flyout_button label="Dire" name="Say" tool_tip="(Entrée)">
                                         <flyout_button_item name="shout_item">
                                                 Crier
@@ -43,6 +42,9 @@
                                         <flyout_button_item name="say_item">
                                                 Dire
                                         </flyout_button_item>
+                                        <flyout_button_item name="whisper_item">
+                                                Chuchoter
+                                        </flyout_button_item>
                                 </flyout_button>
                         </panel>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index 38c8a18..adab86d 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="Sélecteur de couleurs">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Choix de texture et de couleur">
         <text name="r_val_text">
                 Rouge :
         </text>
@@ -18,14 +18,14 @@
         <text name="l_val_text">
                 Lum :
         </text>
-        <check_box label="Appliquer immédiatement" name="apply_immediate" left="4" width="108"/>
-        <button label="" label_selected="" name="color_pipette" left_delta="138"/>
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-        <button label="Sélectionner" label_selected="Sélectionner" name="select_btn" />
-        <text name="Current color:" left="8">
+        <check_box label="Application auto" left="4" name="apply_immediate" width="108"/>
+        <button label="" label_selected="" left_delta="138" name="color_pipette"/>
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+        <button label="Sélectionner" label_selected="Sélectionner" name="select_btn"/>
+        <text left="8" name="Current color:">
                 Couleur actuelle :
         </text>
-        <text name="(Drag below to save.)" left="8" width="114">
+        <text left="8" name="(Drag below to save.)" width="114">
                 (Faire glisser dessous
 pour enregistrer.)
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_customize.xml b/linden/indra/newview/skins/default/xui/fr/floater_customize.xml
index 0df5c8e..bd499b7 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -1,525 +1,449 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="Apparence" width="511">
-        <tab_container name="customize tab container" tab_min_width="113" width="509">
-                <panel label="Parties du corps" />
-                <panel label="Parties du corps" name="body_parts_placeholder" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Apparence" width="513">
+        <tab_container name="customize tab container" tab_min_width="115" width="511">
+                <panel label="Parties du corps"/>
+                <panel label="Parties du corps" name="body_parts_placeholder"/>
                 <panel label="Silhouette" left="119" name="Shape" width="389">
-                        <button label="Créer une silhouette" label_selected="Créer une silhouette"
-                             name="Create New" width="140" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <button label="Corps" label_selected="Corps" name="Body" />
-                        <button label="Tête" label_selected="Tête" name="Head" />
-                        <button label="Yeux" label_selected="Yeux" name="Eyes" />
-                        <button label="Oreilles" label_selected="Oreilles" name="Ears" />
-                        <button label="Nez" label_selected="Nez" name="Nose" />
-                        <button label="Bouche" label_selected="Bouche" name="Mouth" />
-                        <button label="Menton" label_selected="Menton" name="Chin" />
-                        <button label="Torse" label_selected="Torse" name="Torso" />
-                        <button label="Jambes" label_selected="Jambes" name="Legs" />
-                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New" width="140"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <button label="Corps" label_selected="Corps" name="Body"/>
+                        <button label="Tête" label_selected="Tête" name="Head"/>
+                        <button label="Yeux" label_selected="Yeux" name="Eyes"/>
+                        <button label="Oreilles" label_selected="Oreilles" name="Ears"/>
+                        <button label="Nez" label_selected="Nez" name="Nose"/>
+                        <button label="Bouche" label_selected="Bouche" name="Mouth"/>
+                        <button label="Menton" label_selected="Menton" name="Chin"/>
+                        <button label="Torse" label_selected="Torse" name="Torso"/>
+                        <button label="Jambes" label_selected="Jambes" name="Legs"/>
+                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portée
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de silhouette, faites-en glisser une à partir de votre
-inventaire. jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
 une nouvelle et de la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
                         <radio_group name="sex radio">
-                                <radio_item type="string" length="1" name="radio">
+                                <radio_item length="1" name="radio" type="string">
                                         Femme
                                 </radio_item>
-                                <radio_item type="string" length="1" name="radio2">
+                                <radio_item length="1" name="radio2" type="string">
                                         Homme
                                 </radio_item>
                         </radio_group>
                 </panel>
                 <panel label="Peau" name="Skin">
-                        <button label="Créer une peau" label_selected="Créer une peau" name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <button label="Couleur" label_selected="Couleur" name="Skin Color" width="84" />
-                        <button label="Détails visage" label_selected="Détails visage" name="Face Detail"
-                             width="84" />
-                        <button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84" />
-                        <button label="Détails corps" label_selected="Détails corps" name="Body Detail"
-                             width="84" />
-                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <button label="Couleur" label_selected="Couleur" name="Skin Color" width="84"/>
+                        <button label="Détails visage" label_selected="Détails visage" name="Face Detail" width="84"/>
+                        <button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84"/>
+                        <button label="Détails corps" label_selected="Détails corps" name="Body Detail" width="84"/>
+                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portée
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de peau, faites-en glisser une à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer une nouvelle et de la porter.
+Vous pouvez aussi en créer une nouvelle et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <texture_picker label="Tatouages tête" name="Head Tattoos"
-                             tool_tip="Cliquez pour sélectionner une image" width="78" />
-                        <texture_picker label="Tatouages haut" name="Upper Tattoos"
-                             tool_tip="Cliquez pour sélectionner une image" width="78" />
-                        <texture_picker label="Tatouages bas" name="Lower Tattoos"
-                             tool_tip="Cliquez pour sélectionner une image" width="78" />
+                        <texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+                        <texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+                        <texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
                 </panel>
                 <panel label="Cheveux" name="Hair">
-                        <button label="Créer des cheveux" label_selected="Créer des cheveux"
-                             name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <button label="Couleur" label_selected="Couleur" name="Color" />
-                        <button label="Style" label_selected="Style" name="Style" />
-                        <button label="Sourcils" label_selected="Sourcils" name="Eyebrows" />
-                        <button label="Pilosité" label_selected="Pilosité" name="Facial" />
-                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <button label="Couleur" label_selected="Couleur" name="Color"/>
+                        <button label="Style" label_selected="Style" name="Style"/>
+                        <button label="Sourcils" label_selected="Sourcils" name="Eyebrows"/>
+                        <button label="Pilosité" label_selected="Pilosité" name="Facial"/>
+                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portés
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de chevelure, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
                 </panel>
                 <panel label="Yeux" name="Eyes">
-                        <button label="Créer des yeux" label_selected="Créer des yeux" name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portés
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer vos yeux, faites-les glisser de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer de nouveaux et de les porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
                 </panel>
-                <panel label="Vêtements" />
-                <panel label="Habits" name="clothes_placeholder" />
+                <panel label="Vêtements"/>
+                <panel label="Habits" name="clothes_placeholder"/>
                 <panel label="Chemise" name="Shirt">
-                        <button label="Créer une chemise" label_selected="Créer une chemise"
-                             name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
-                                [DESC]: non porté
+                        <text length="1" name="title_not_worn" type="string">
+                                [DESC]: non portée
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de chemise, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer une nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Pantalon" name="Pants">
-                        <button label="Créer un pantalon" label_selected="Créer un pantalon"
-                             name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non porté
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de pantalon, faites-en glisser un de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est
-d&apos;en créer un nouveau et de le porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Chaussures" name="Shoes">
-                        <button label="Créer des chaussures" label_selected="Créer des chaussures"
-                             name="Create New" width="140" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" width="140"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portées
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de chaussures, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle paire et de la porter.
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Chaussettes" name="Socks">
-                        <button label="Créer des chaussettes" label_selected="Créer des chaussettes"
-                             name="Create New" width="140" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New" width="140"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portées
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de chaussettes, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle paire et de la porter.
+inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Veste" name="Jacket">
-                        <button label="Créer une veste" label_selected="Créer une veste" name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portée
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de veste, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. L&apos;autre possibilité est d&apos;en créer une
-nouvelle et de la porter.
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81" />
-                        <texture_picker label="Tissu (dessus)" name="Upper Fabric"
-                             tool_tip="Cliquez pour sélectionner une image" width="81" />
-                        <texture_picker label="Tissu (dessous)" name="Lower Fabric"
-                             tool_tip="Cliquez pour sélectionner une image" width="81" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81"/>
+                        <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
+                        <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
                 </panel>
                 <panel label="Gants" name="Gloves">
-                        <button label="Créer des gants" label_selected="Créer des gants" name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portés
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de gants, faites-en glisser une paire à partir de votre
-inventaire. L&apos;autre possibilité est d&apos;en créer une nouvelle paire
-et de la porter.
+inventaire. Vous pouvez aussi en créer une nouvelle paire
+et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
-                <panel label="Tricot de peau" name="Undershirt">
-                        <button label="Créer un tricot de peau" label_selected="Créer un tricot"
-                             name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                <panel label="Tricot" name="Undershirt">
+                        <button label="Créer un tricot" label_selected="Créer un tricot" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non porté
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de tricot, faites-en glisser un à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer un nouveau et de le porter.
+Vous pouvez aussi en créer un nouveau et le porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Sous-vêtements" name="Underpants">
-                        <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements"
-                             name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portés
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Pour changer de sous-vêtement, faites-en glisser un à partir de votre
-inventaire. L&apos;autre possibilité est d&apos;en créer un nouveau et de le porter.
+                        <text length="1" name="not worn instructions" type="string">
+                                Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
                 <panel label="Jupe" name="Skirt">
-                        <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New" />
-                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82" />
-                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save"
-                             width="82" />
-                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188"
-                             name="Save As" width="105" />
-                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert"
-                             width="82" />
-                        <text type="string" length="1" name="title">
+                        <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
+                        <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+                        <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+                        <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+                        <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: impossible de modifier
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: en cours de chargement...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: non portée
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Emplacement : [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
+                        <text length="1" name="not worn instructions" type="string">
                                 Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
-L&apos;autre possibilité est d&apos;en créer une nouvelle et de la porter.
+Vous pouvez aussi en créer une nouvelle et la porter.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Vous n&apos;avez pas la permission de modifier cet objet.
                         </text>
-                        <color_swatch label="Couleur/Teinte" name="Color/Tint"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74" />
-                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"
-                             width="74" />
+                        <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+                        <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
                 </panel>
         </tab_container>
-        <scroll_container left="214" name="panel_container" />
-        <button label="Créer un ensemble" label_selected="Créer un ensemble"
-             name="Make Outfit" right="-252" width="115" />
-        <button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All"
-             right="-131" width="115" />
-        <button label="Fermer" label_selected="Fermer" name="Close" width="115" />
+        <scroll_container left="216" name="panel_container"/>
+        <button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" right="-252" width="115"/>
+        <button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All" right="-131" width="115"/>
+        <button label="Fermer" label_selected="Fermer" name="Close" width="115"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_directory.xml b/linden/indra/newview/skins/default/xui/fr/floater_directory.xml
index 2b08d05..b12b1fb 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_directory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="directory" title="Rechercher dans Second Life">
         <tab_container name="Directory Tabs">
                 <panel label="Tout" name="find_all_panel">
@@ -8,13 +8,13 @@
                         <string name="not_found_text">
                                 Aucun résultat.
                         </string>
-                        <button label="Précédente" name="back_btn" />
-                        <button label="Suivante" name="forward_btn" />
-                        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life" />
-                        <button label="Rechercher" name="search_btn" width="80" />
+                        <button label="Précédente" name="back_btn"/>
+                        <button label="Suivante" name="forward_btn"/>
+                        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+                        <button label="Rechercher" name="search_btn" width="80"/>
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
-                                        Toute catégorie
+                                        Toutes catégories
                                 </combo_item>
                                 <combo_item name="Events">
                                         Événements
@@ -23,16 +23,16 @@
                                         Groupes
                                 </combo_item>
                                 <combo_item name="People">
-                                        Personnes
+                                        Résidents
                                 </combo_item>
                                 <combo_item name="Places">
-                                        Endroits
+                                        Lieux
                                 </combo_item>
                                 <combo_item name="Wiki">
                                         Wiki
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Inclure le contenu pour adultes" name="mature_check" />
+                        <check_box label="Inclure le contenu pour adultes" name="mature_check"/>
                         <string name="loading_text">
                                 Chargement en cours...
                         </string>
@@ -53,56 +53,55 @@
                         <string name="not_found_text">
                                 Aucun résultat.
                         </string>
-                        <button label="Parcourir" label_selected="Parcourir" name="Browse" />
+                        <button label="Parcourir" label_selected="Parcourir" name="Browse"/>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nom" name="name" />
-                                <column label="Prix" name="price" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nom" name="name"/>
+                                <column label="Prix" name="price"/>
                         </scroll_list>
-                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev" />
-                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;" />
+                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
                         <text name="find" width="63">
                                 Trouver :
                         </text>
-                        <line_editor left_delta="51" name="name" width="128" />
-                        <check_box label="Inclure le contenu pour adultes" name="incmature" />
+                        <line_editor left_delta="51" name="name" width="128"/>
+                        <check_box label="Inclure le contenu pour adultes" name="incmature"/>
                         <combo_box left="195" name="Category">
                                 <combo_item name="AnyCategory">
-                                        Toute catégorie
+                                        Toutes catégories
                                 </combo_item>
                                 <combo_item name="Shopping">
                                         Shopping
                                 </combo_item>
                                 <combo_item name="LandRental">
-                                        Terrain à louer
+                                        Terrains à louer
                                 </combo_item>
                                 <combo_item name="PropertyRental">
-                                        Propriété à louer
+                                        Propriétés à louer
                                 </combo_item>
                                 <combo_item name="SpecialAttraction">
-                                        Divertissements spéciaux
+                                        Divertissements
                                 </combo_item>
                                 <combo_item name="NewProducts">
                                         Nouveaux produits
                                 </combo_item>
                                 <combo_item name="Employment">
-                                        Emploi
+                                        Emplois
                                 </combo_item>
                                 <combo_item name="Wanted">
                                         Offres
                                 </combo_item>
                                 <combo_item name="Service">
-                                        Service
+                                        Services
                                 </combo_item>
                                 <combo_item name="Personal">
                                         Rencontres
                                 </combo_item>
                         </combo_box>
-                        <button label="Rechercher" label_selected="Rechercher" name="Search" width="85" />
-                        <button label="Passer une annonce…" label_selected="Passer une annonce…"
-                             name="Place an Ad..." width="135" />
-                        <button label="Supprimer" label_selected="Supprimer" name="Delete" />
+                        <button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
+                        <button label="Passer une annonce…" label_selected="Passer une annonce…" name="Place an Ad..." width="135"/>
+                        <button label="Supprimer" label_selected="Supprimer" name="Delete"/>
                 </panel>
                 <panel label="Événements" name="events_panel">
                         <string name="searching_text">
@@ -112,15 +111,15 @@
                                 Aucun résultat.
                         </string>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nom" name="name" />
-                                <column label="Heure (Californie)" name="date" width="115" />
-                                <column label="" name="event_id" />
-                                <column label="Heure" name="time" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nom" name="name"/>
+                                <column label="Heure (Californie)" name="date" width="115"/>
+                                <column label="" name="event_id"/>
+                                <column label="Heure" name="time"/>
                         </scroll_list>
-                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev" />
-                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;" />
+                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
                                         En cours et futurs
@@ -129,15 +128,12 @@
                                         Date
                                 </radio_item>
                         </radio_group>
-                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;"
-                             tool_tip="Revenir en arrière d&apos;un jour" />
+                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Revenir en arrière d&apos;un jour"/>
                         <text name="date_text">
                                 6/6
                         </text>
-                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;"
-                             tool_tip="Avancer d&apos;un jour" />
-                        <button label="Aujourd&apos;hui" label_selected="Aujourd&apos;hui" name="Today"
-                             tool_tip="Afficher les événements qui ont lieu aujourd&apos;hui" />
+                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avancer d&apos;un jour"/>
+                        <button label="Aujourd&apos;hui" label_selected="Aujourd&apos;hui" name="Today" tool_tip="Afficher les événements qui ont lieu aujourd&apos;hui"/>
                         <text name="text">
                                 Catégorie :
                         </text>
@@ -149,7 +145,7 @@
                                         Tout
                                 </combo_item>
                                 <combo_item name="Discussion">
-                                        Discussion
+                                        Discussions
                                 </combo_item>
                                 <combo_item name="Sports">
                                         Sports
@@ -158,7 +154,7 @@
                                         Musique live
                                 </combo_item>
                                 <combo_item name="Commercial">
-                                        Publicité
+                                        Publicités
                                 </combo_item>
                                 <combo_item name="Nightlife/Entertainment">
                                         Divertissements/Soirées
@@ -182,21 +178,20 @@
                                         Divers
                                 </combo_item>
                         </combo_box>
-                        <line_editor left="370" name="event_search_text" width="175" />
-                        <check_box label="Inclure le contenu &#10;pour adultes" left="551" name="incmature" />
-                        <button label="Rechercher" label_selected="Rechercher" left_delta="129" name="Search"
-                             tool_tip="Rechercher" />
-                        <button label="Supprimer" label_selected="Supprimer" name="Delete" />
+                        <line_editor left="370" name="event_search_text" width="175"/>
+                        <check_box label="Inclure le contenu &#10;pour adultes" left="551" name="incmature"/>
+                        <button label="Rechercher" label_selected="Rechercher" left_delta="129" name="Search" tool_tip="Rechercher"/>
+                        <button label="Supprimer" label_selected="Supprimer" name="Delete"/>
                 </panel>
-                <panel label="A la Une" name="showcase_panel">
+                <panel label="À la Une" name="showcase_panel">
                         <string name="searching_text">
                                 Recherche en cours...
                         </string>
                         <string name="not_found_text">
                                 Aucun résultat.
                         </string>
-                        <button label="Précédente" name="back_btn" />
-                        <button label="Suivante" name="forward_btn" />
+                        <button label="Précédente" name="back_btn"/>
+                        <button label="Suivante" name="forward_btn"/>
                         <string name="loading_text">
                                 Chargement en cours...
                         </string>
@@ -218,21 +213,21 @@
                                 Aucun résultat.
                         </string>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nom" name="name" />
-                                <column label="Prix en $L" name="price" width="75" />
-                                <column label="Surface" name="area" width="65" />
-                                <column label="$L/m²" name="per_meter" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nom" name="name"/>
+                                <column label="Prix en L$" name="price" width="75"/>
+                                <column label="Surface" name="area" width="65"/>
+                                <column label="L$/m²" name="per_meter"/>
                         </scroll_list>
-                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev" />
-                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;" />
+                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
                         <combo_box name="type" width="150">
                                 <combo_item name="AllTypes">
                                         Tous types
                                 </combo_item>
                                 <combo_item name="Auction">
-                                        Enchère
+                                        Enchères
                                 </combo_item>
                                 <combo_item name="MainlandSales">
                                         À vendre - Continent
@@ -243,28 +238,27 @@
                         </combo_box>
                         <combo_box name="rating" width="150">
                                 <combo_item name="PG&amp;Mature">
-                                        Public averti et adulte
+                                        Tout public et Adulte
                                 </combo_item>
                                 <combo_item name="PGonly">
-                                        Public averti uniquement
+                                        Tout public uniquement
                                 </combo_item>
                                 <combo_item name="Matureonly">
-                                        Adultes uniquement
+                                        Adulte uniquement
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Prix &lt;= $L" left="157" name="pricecheck" />
-                        <check_box label="Surface &gt;= m²" left="157" name="areacheck" />
-                        <line_editor left="251" name="priceedit" width="50" />
-                        <line_editor left="251" name="areaedit" width="50" />
-                        <button label="Rechercher" label_selected="Rechercher" left="306" name="Search"
-                             width="85" />
+                        <check_box label="Prix &lt;= L$" left="157" name="pricecheck"/>
+                        <check_box label="Surface &gt;= m²" left="157" name="areacheck"/>
+                        <line_editor left="251" name="priceedit" width="50"/>
+                        <line_editor left="251" name="areaedit" width="50"/>
+                        <button label="Rechercher" label_selected="Rechercher" left="306" name="Search" width="85"/>
                         <text left="399" name="land" width="379">
-                                Les terrains peuvent être achetés directement en dollars Linden (L$) ou
-aux enchères (en $L ou $US). Pour acheter directement, visitez le terrain
+                                Vous pouvez acheter un terrain directement en dollars Linden (L$) ou
+aux enchères (en L$ ou US$). Pour acheter directement, visitez le terrain
 et cliquez sur le nom de l&apos;endroit dans la barre de titre.
                         </text>
                 </panel>
-                <panel label="Endroits" name="places_panel">
+                <panel label="Lieux" name="places_panel">
                         <string name="searching_text">
                                 Recherche en cours...
                         </string>
@@ -272,27 +266,27 @@ et cliquez sur le nom de l&apos;endroit dans la barre de titre.
                                 Aucun résultat.
                         </string>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nom" name="name" />
-                                <column label="Trafic" name="dwell" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nom" name="name"/>
+                                <column label="Trafic" name="dwell"/>
                         </scroll_list>
-                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev" />
-                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;" />
+                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
                         <text name="find" width="63">
                                 Trouver :
                         </text>
-                        <line_editor left_delta="51" name="name" width="128" />
-                        <check_box label="Inclure les parcelles avec du contenu Adultes" name="incmature" />
+                        <line_editor left_delta="51" name="name" width="128"/>
+                        <check_box label="Inclure les parcelles avec du contenu Adulte" name="incmature"/>
                         <combo_box left="195" name="Category" width="170">
                                 <combo_item name="AnyCategory">
-                                        Toute catégorie
+                                        Toutes catégories
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        Emplacement Linden
+                                        Appartenant aux Lindens
                                 </combo_item>
                                 <combo_item name="Adult">
-                                        Adultes
+                                        Adulte
                                 </combo_item>
                                 <combo_item name="Arts&amp;Culture">
                                         Art et Culture
@@ -307,10 +301,10 @@ et cliquez sur le nom de l&apos;endroit dans la barre de titre.
                                         Jeux
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        Endroit favori
+                                        Favoris
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        Convivial pour les nouveaux
+                                        Accueil pour les nouveaux
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
                                         Parcs et Nature
@@ -325,10 +319,9 @@ et cliquez sur le nom de l&apos;endroit dans la barre de titre.
                                         Autre
                                 </combo_item>
                         </combo_box>
-                        <button label="Rechercher" label_selected="Rechercher" left_delta="178" name="Search"
-                             width="80" />
+                        <button label="Rechercher" label_selected="Rechercher" left_delta="178" name="Search" width="80"/>
                 </panel>
-                <panel label="Personnes" name="people_panel">
+                <panel label="Résidents" name="people_panel">
                         <string name="searching_text">
                                 Recherche en cours...
                         </string>
@@ -336,32 +329,32 @@ et cliquez sur le nom de l&apos;endroit dans la barre de titre.
                                 Aucun résultat.
                         </string>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nom" name="name" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nom" name="name"/>
                         </scroll_list>
-                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev" />
-                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;" />
+                        <button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+                        <button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
                         <text name="find" width="63">
                                 Trouver :
                         </text>
-                        <line_editor left_delta="51" name="name" width="200" />
-                        <button label="Rechercher" label_selected="Rechercher" name="Search" width="80" />
+                        <line_editor left_delta="51" name="name" width="200"/>
+                        <button label="Rechercher" label_selected="Rechercher" name="Search" width="80"/>
                 </panel>
                 <panel label="Groupes" name="groups_panel">
-                        <button label="&lt; Précédent" label_selected="&lt; Précédent" name="&lt; Prev" />
-                        <button label="Suivant &gt;" label_selected="Suivant &gt;" name="Next &gt;" />
+                        <button label="&lt; Précédent" label_selected="&lt; Précédent" name="&lt; Prev"/>
+                        <button label="Suivant &gt;" label_selected="Suivant &gt;" name="Next &gt;"/>
                         <string name="searching_text">
                                 Recherche en cours...
                         </string>
                         <string name="not_found_text">
                                 Aucun résultat.
                         </string>
-                        <button label="Précédente" name="back_btn" />
-                        <button label="Suivante" name="forward_btn" />
-                        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life" />
-                        <button label="Rechercher" name="search_btn" width="80" />
-                        <check_box label="Inclure le contenu pour adultes" name="mature_check" />
+                        <button label="Précédente" name="back_btn"/>
+                        <button label="Suivante" name="forward_btn"/>
+                        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+                        <button label="Rechercher" name="search_btn" width="80"/>
+                        <check_box label="Inclure le contenu pour adultes" name="mature_check"/>
                         <string name="loading_text">
                                 Chargement en cours...
                         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index c2454a8..1d14142 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Environment Editor Floater" title="Editeur d&apos;environnement">
-        <text name="EnvTimeText" bottom="-45" >
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Éditeur d&apos;environnement">
+        <text bottom="-45" name="EnvTimeText">
                 Heure de la
 journée
         </text>
-        <text name="EnvTimeText2" bottom_delta="-36" >
+        <text bottom_delta="-36" name="EnvTimeText2">
                 Midi
         </text>
         <text name="EnvCloudText">
                 Couverture
 nuageuse
         </text>
-        <text name="EnvWaterColorText" bottom="-45" >
+        <text bottom="-45" name="EnvWaterColorText">
                 Couleur de
 l&apos;eau
         </text>
-        <color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+        <color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
         <text name="EnvWaterFogText">
                 Brouillard
 dans l&apos;eau
         </text>
-        <button label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" bottom="-144"/>
-        <button label="Ciel avancé" name="EnvAdvancedSkyButton" />
-        <button label="Eau avancée" name="EnvAdvancedWaterButton" />
-        <button label="?" name="EnvSettingsHelpButton" />
+        <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
+        <button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
+        <button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
+        <button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index c8e618b..531080f 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -1,117 +1,77 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="Outils Admin">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Outils divins">
         <tab_container name="GodTools Tabs">
                 <panel label="Grille" name="grid">
-                        <button label="Vider Tous" label_selected="Vider Tous" name="Kick all users" />
-                        <button label="Vider le cache cartographique de la région"
-                             label_selected="Vider le cache cartographique de la région"
-                             name="Flush This Region&apos;s Map Visibility Caches" />
+                        <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175" />
+                        <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region&apos;s Map Visibility Caches" width="285"/>
                 </panel>
                 <panel label="Région" name="region">
-                        <text name="Sim Name:">
+                        <text name="Sim Name:" width="70">
                                 Nom du sim :
                         </text>
-                        <check_box label="Initiation" name="check prelude"
-                             tool_tip="Définir cette région comme zone d&apos;initiation." />
-                        <check_box label="Soleil fixe" name="check fixed sun"
-                             tool_tip="Définir la position du soleil (comme dans Région/Domaine &gt; Terrain.)" />
-                        <check_box label="Réinitialiser le domicile à la téléportation"
-                             name="check reset home"
-                             tool_tip="Lorsqu&apos;un résident se téléporte à l&apos;extérieur, réinitialise son domicile à la position de sa destination." />
-                        <check_box label="Visible" name="check visible"
-                             tool_tip="Cochez pour rendre la région visible aux non-admins." />
-                        <check_box label="Dégâts" name="check damage"
-                             tool_tip="Cochez pour activer les dégâts dans cette région." />
-                        <check_box label="Bloquer le suivi de trafic" name="block dwell"
-                             tool_tip="Cochez pour que la région ne comptabilise pas le trafic." />
-                        <check_box label="Bloquer le terraformage" name="block terraform"
-                             tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain" />
-                        <check_box label="Bac à sable" name="is sandbox"
-                             tool_tip="Basculer cette région en bac à sable." />
-                        <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain"
-                             tool_tip="Enregistrer le terrain actuel comme terrain par défaut." />
-                        <button label="Rétablir le terrain" label_selected="Rétablir le terrain"
-                             name="Revert Terrain"
-                             tool_tip="Remplacer le terrain actuel avec le terrain par défaut." />
-                        <button label="Échanger le terrain" label_selected="Échanger le terrain"
-                             name="Swap Terrain"
-                             tool_tip="Échanger le terrain actuel avec le terrain par défaut." />
+                        <line_editor left="85" name="region name" width="198" />
+                        <check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d&apos;initiation."/>
+                        <check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine &gt; Terrain.)"/>
+                        <check_box label="Réinitialiser le domicile &#10;à la téléportation" name="check reset home" tool_tip="Lorsqu&apos;un résident se téléporte à l&apos;extérieur, réinitialise son domicile à la position de sa destination."  height="32"/>
+                        <check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins."  bottom_delta="-32"/>
+                        <check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
+                        <check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
+                        <check_box label="Bloquer le terraformage" name="block terraform" tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain"/>
+                        <check_box label="Bac à sable" name="is sandbox" tool_tip="Basculer cette région en bac à sable."/>
+                        <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut." width="118" />
+                        <button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut." width="118" />
+                        <button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut." width="118" />
                         <text name="estate id">
                                 ID du domaine :
                         </text>
                         <text name="parent id">
                                 ID parent :
                         </text>
-                        <line_editor name="parentestate"
-                             tool_tip="Il s&apos;agit du domaine parent de cette région" />
+                        <line_editor name="parentestate" tool_tip="Il s&apos;agit du domaine parent de cette région"/>
                         <text name="Grid Pos: ">
                                 Position sur la grille :
                         </text>
-                        <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" />
-                        <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" />
+                        <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" left_delta="120" width="35"/>
+                        <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" left_delta="40" width="35" />
                         <text name="Redirect to Grid: ">
                                 Rediriger vers la grille :
                         </text>
-                        <text name="billable factor text">
+                        <line_editor left_delta="120" name="redirectx" width="35" />
+                        <line_editor left_delta="40" name="redirecty" width="35" />
+                        <spinner left="320" name="billable factor" width="70" />
+                        <text name="billable factor text" font="SansSerifSmall" left_delta="-120" width="120">
                                 Facteur de facturation :
                         </text>
-                        <text name="land cost text">
-                                $L par m² :
+                        <spinner left="320" name="land cost" width="70" />
+                        <text name="land cost text" left_delta="-120">
+                                L$ par m² :
                         </text>
-                        <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh"
-                             tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus." />
-                        <button label="Appliquer" label_selected="Appliquer" name="Apply"
-                             tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." />
-                        <button label="Sélectionner une région" label_selected="Sélectionner une région"
-                             name="Select Region"
-                             tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain." />
-                        <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique"
-                             name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." />
+                        <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
+                        <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
+                        <button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l&apos;aide de l&apos;outil Terrain."  width="140" left="136"/>
+                        <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140" left="136"/>
                 </panel>
                 <panel label="Objets" name="objects">
-                        <text name="Sim Name:">
+                        <text name="Sim Name:" width="70">
                                 Nom du sim :
                         </text>
-                        <text name="region name">
-                                Gallois
+                        <text name="region name" left_delta="75">
+                                Welsh
                         </text>
-                        <check_box label="Désactiver les scripts" name="disable scripts"
-                             tool_tip="Cochez pour désactiver tous les scripts dans cette région" />
-                        <check_box label="Désactiver les collisions" name="disable collisions"
-                             tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région" />
-                        <check_box label="Désactiver les propriétés physiques" name="disable physics"
-                             tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région" />
-                        <button label="Appliquer" label_selected="Appliquer" name="Apply"
-                             tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." />
-                        <button label="Définir la cible" label_selected="Définir la cible" name="Set Target"
-                             tool_tip="Définir l&apos;avatar cible pour la suppression de l&apos;objet." />
+                        <check_box label="Désactiver les &#10;scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
+                        <check_box label="Désactiver les &#10;collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
+                        <check_box label="Désactiver les &#10;propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
+                        <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."  bottom="-85"/>
+                        <button label="Définir la cible" label_selected="Définir la cible" name="Set Target" tool_tip="Définir l&apos;avatar cible pour la suppression de l&apos;objet."/>
                         <text name="target_avatar_name">
                                 (aucune cible)
                         </text>
-                        <button
-                             label="Supprimer tous les objets scriptés de la cible sur les terrains des autres"
-                             label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres"
-                             name="Delete Target&apos;s Scripted Objects On Others Land"
-                             tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés." />
-                        <button label="Supprimer les objets scriptés de la cible sur *tous* les terrains"
-                             label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains"
-                             name="Delete Target&apos;s Scripted Objects On *Any* Land"
-                             tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés." />
-                        <button label="Supprimer *tous* les objets de la cible"
-                             label_selected="Supprimer *tous* les objets de la cible"
-                             name="Delete *ALL* Of Target&apos;s Objects"
-                             tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés." />
-                        <button label="Afficher les objets souvent responsables de collision"
-                             label_selected="Afficher les objets souvent responsables de collision"
-                             name="Get Top Colliders"
-                             tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. " />
-                        <button label="Afficher les scripts fréquemment utilisés"
-                             label_selected="Afficher les scripts fréquemment utilisés"
-                             name="Get Top Scripts"
-                             tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts." />
-                        <button label="Résumé des scripts" label_selected="Résumé des scripts"
-                             name="Scripts digest"
-                             tool_tip="Dresse une liste des scripts et de leurs occurrences." />
+                        <button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés."/>
+                        <button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+                        <button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+                        <button width="300" label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
+                        <button width="300" label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
+                        <button width="300" label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
                 </panel>
                 <panel label="Requête" name="request">
                         <text name="Destination:">
@@ -145,8 +105,7 @@
                         <text name="Parameter:">
                                 Paramètre :
                         </text>
-                        <button label="Effectuer la requête" label_selected="Effectuer la requête"
-                             name="Make Request" />
+                        <button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml b/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
index d2c7857..af58b2a 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groupinfo" title="Les Linden – Informations sur le groupe">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="groupinfo" title="Les Linden – Profil du groupe">
         <tab_container name="tab">
                 <panel label="Général" name="gen">
                         <text name="title_box">
-                                Infos sur le groupe
+                                Profil du groupe
                         </text>
                         <text name="txt">
                                 Les groupes sont un moyen divertissant de collaborer avec vos amis.
                         </text>
                         <text name="txt2">
-                                Les groupes vous permettent d&apos;avoir un titre, un emblème et de voter.
+                                Les groupes vous permettent d&apos;avoir un titre, un logo et de voter.
                         </text>
                         <text name="txt3">
-                                Tout le monde peut créer un groupe. Chaque personne peut appartenir à 15 groupes maximum.
+                                Tout le monde peut créer un groupe. Chaque résident peut appartenir jusqu&apos;à 15 groupes.
                         </text>
                         <text name="txt4">
                                 Pour rester actif, un groupe doit avoir au moins 3 membres.
                         </text>
                         <text name="group_create_text">
-                                La création d&apos;un groupe coûte 100 $L.
+                                La création d&apos;un groupe coûte 100 L$.
                         </text>
                         <text name="lbl">
                                 Nom :
@@ -29,17 +29,15 @@
                         <text name="lbl2">
                                 Charte :
                         </text>
-                        <check_box label="Afficher dans la liste du groupe" name="sho" />
-                        <check_box label="Afficher les membres dans la liste du groupe" name="sho_mem" />
-                        <check_box label="Publier sur le web." name="allow_publish"
-                             tool_tip="Publiez votre profil sur le web." />
-                        <button label="?" label_selected="?" name="publish_help_btn" />
-                        <check_box label="Adulte" name="mature"
-                             tool_tip="Les informations de votre profil sont à caractère adulte." />
+                        <check_box label="Afficher dans la liste du groupe" name="sho"/>
+                        <check_box label="Afficher les membres dans la liste du groupe" name="sho_mem"/>
+                        <check_box label="Publier sur le web." name="allow_publish" tool_tip="Publiez votre profil sur le web."/>
+                        <button label="?" label_selected="?" name="publish_help_btn"/>
+                        <check_box label="Adulte" name="mature" tool_tip="Les informations de votre profil sont à caractère adulte."/>
                 </panel>
                 <panel label="Titres" name="tit">
                         <text name="txt">
-                                Titres au sein du groupe
+                                Titres de groupe
                         </text>
                         <text name="txt2">
                                 Les groupes peuvent avoir des officiers et des membres avec des titres particuliers.
@@ -54,9 +52,9 @@
                                 Titre du membre :
                         </text>
                         <text name="lbl3">
-                                Pour créer l&apos;emblème du groupe, faites glisser une texture depuis votre inventaire.
+                                Pour créer le logo du groupe, faites glisser une texture depuis votre inventaire.
                         </text>
-                        <texture_picker name="insig" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker name="insig" tool_tip="Cliquez pour sélectionner une image"/>
                 </panel>
                 <panel label="Membres" name="mem">
                         <text name="txt">
@@ -74,44 +72,40 @@
                         <text name="members_label">
                                 Membres :
                         </text>
-                        <button label="Expulser le membre" label_selected="Expulser le membre"
-                             name="eject_member_btn" />
+                        <button label="Expulser le membre" label_selected="Expulser le membre" name="eject_member_btn"/>
                 </panel>
                 <panel label="Vote" name="voting">
                         <tab_container name="tab">
                                 <panel label="Élection" name="recall">
                                         <text name="txt">
-                                                Élections du groupe
+                                                Élections
                                         </text>
                                         <text name="instructions">
                                                 Pour commencer une nouvelle élection, cliquez sur Lancer l&apos;élection.  
-Tous les membres qui ne sont pas officiers sont candidats.
+Les candidats incluent tous les membres qui ne sont pas officiers.
                                         </text>
                                         <text name="lbl">
                                                 Candidats :
                                         </text>
-                                        <button label="Vote" label_selected="Voter" name="btn_vote" />
-                                        <button label="M&apos;abstenir" label_selected="M&apos;abstenir" name="btn_abstain" />
-                                        <button label="Lancer l&apos;élection" label_selected="Lancer l&apos;élection"
-                                             name="btn_start_election" />
+                                        <button label="Vote" label_selected="Voter" name="btn_vote"/>
+                                        <button label="M&apos;abstenir" label_selected="M&apos;abstenir" name="btn_abstain"/>
+                                        <button label="Lancer l&apos;élection" label_selected="Lancer l&apos;élection" name="btn_start_election"/>
                                         <text name="lbl2">
                                                 Quorum :
                                         </text>
-                                        <spinner name="quorum"
-                                             tool_tip="Nombre  total de votants nécessaires pour que les résultats de l&apos;élection soient valides." />
+                                        <spinner name="quorum" tool_tip="Nombre total de votants nécessaires pour que les résultats de l&apos;élection soient valides."/>
                                         <text name="quorum_text">
                                                 sur un total de 111 membres.
                                         </text>
                                         <text name="lbl3">
                                                 Majorité :
                                         </text>
-                                        <radio_group name="majority"
-                                             tool_tip="Majorité de tous les votes nécessaires pour remporter l&apos;élection.">
+                                        <radio_group name="majority" tool_tip="Majorité de tous les votes nécessaires pour remporter l&apos;élection.">
                                                 <radio_item name="radio">
                                                         Majorité simple
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        Majorité des deux-tiers
+                                                        Majorité des 2/3
                                                 </radio_item>
                                                 <radio_item name="radio3">
                                                         Unanimité
@@ -120,7 +114,7 @@ Tous les membres qui ne sont pas officiers sont candidats.
                                         <text name="duration_lbl">
                                                 Durée :
                                         </text>
-                                        <spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)." />
+                                        <spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)."/>
                                         <text name="duration_days">
                                                 jours
                                         </text>
@@ -141,34 +135,29 @@ Tous les membres qui ne sont pas officiers sont candidats.
                                         <text name="proposal_lbl">
                                                 Propositions :
                                         </text>
-                                        <button label="Oui" label_selected="Oui" name="btn_yes" />
-                                        <button label="Non" label_selected="Non" name="btn_no" />
-                                        <button label="M&apos;abstenir" label_selected="M&apos;abstenir" name="btn_abstain" />
-                                        <button label="Afficher la liste" label_selected="Afficher la liste"
-                                             name="btn_view_list" />
-                                        <button label="Afficher l&apos;objet" label_selected="Afficher l&apos;objet"
-                                             name="btn_view_item" />
-                                        <button label="Créer une proposition" label_selected="Créer une proposition"
-                                             name="btn_proposal" />
-                                        <button label="Soumettre" label_selected="Soumettre" name="btn_submit" />
+                                        <button label="Oui" label_selected="Oui" name="btn_yes"/>
+                                        <button label="Non" label_selected="Non" name="btn_no"/>
+                                        <button label="M&apos;abstenir" label_selected="M&apos;abstenir" name="btn_abstain"/>
+                                        <button label="Afficher la liste" label_selected="Afficher la liste" name="btn_view_list"/>
+                                        <button label="Afficher l&apos;objet" label_selected="Afficher l&apos;objet" name="btn_view_item"/>
+                                        <button label="Créer une proposition" label_selected="Créer une proposition" name="btn_proposal"/>
+                                        <button label="Soumettre" label_selected="Soumettre" name="btn_submit"/>
                                         <text name="quorum_lbl">
                                                 Quorum :
                                         </text>
-                                        <spinner name="quorum"
-                                             tool_tip="Nombre  total de votants nécessaires pour que les résultats de l&apos;élection soient valides." />
+                                        <spinner name="quorum" tool_tip="Nombre total de votants nécessaires pour que les résultats de l&apos;élection soient valides."/>
                                         <text name="quorum_text">
                                                 sur un total de 111 membres.
                                         </text>
                                         <text name="majority_lbl">
                                                 Majorité :
                                         </text>
-                                        <radio_group name="majority"
-                                             tool_tip="Majorité de tous les votes nécessaires pour remporter l&apos;élection.">
+                                        <radio_group name="majority" tool_tip="Majorité de tous les votes nécessaires pour remporter l&apos;élection.">
                                                 <radio_item name="radio">
                                                         Majorité simple
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        Majorité des deux-tiers
+                                                        Majorité des 2/3
                                                 </radio_item>
                                                 <radio_item name="radio3">
                                                         Unanimité
@@ -177,20 +166,20 @@ Tous les membres qui ne sont pas officiers sont candidats.
                                         <text name="duration_lbl">
                                                 Durée :
                                         </text>
-                                        <spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)." />
+                                        <spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)."/>
                                         <text name="duration_text">
                                                 jours
                                         </text>
                                         <text name="start_lbl">
-                                                Début du vote :
+                                                Début :
                                         </text>
                                         <text name="end_lbl">
-                                                Fin du vote :
+                                                Fin :
                                         </text>
                                 </panel>
                                 <panel label="Historique" name="History">
                                         <text name="txt">
-                                                Historique des votes du groupe
+                                                Historique des votes
                                         </text>
                                         <text name="instructions">
                                                 Vous pouvez afficher les anciens résultats en sélectionnant le vote et
@@ -204,16 +193,14 @@ Tous les membres qui ne sont pas officiers sont candidats.
                                         <text name="vote_text_lbl">
                                                 Résultats du vote :
                                         </text>
-                                        <button label="Afficher la liste" label_selected="Afficher la liste"
-                                             name="btn_view_list" />
-                                        <button label="Afficher l&apos;objet" label_selected="Afficher l&apos;objet"
-                                             name="btn_view_item" />
+                                        <button label="Afficher la liste" label_selected="Afficher la liste" name="btn_view_list"/>
+                                        <button label="Afficher l&apos;objet" label_selected="Afficher l&apos;objet" name="btn_view_item"/>
                                 </panel>
                         </tab_container>
                 </panel>
                 <panel label="Invitation" name="inv">
                         <text name="txt">
-                                Invitations du groupe
+                                Invitations
                         </text>
                         <text name="txt2">
                                 Les invitations sont envoyées par messagerie instantanée.
@@ -224,21 +211,17 @@ Tous les membres qui ne sont pas officiers sont candidats.
                         <text name="lbl">
                                 Officiers :
                         </text>
-                        <button label="Ajouter un officier..." label_selected="Ajouter un officier..."
-                             name="add_officer_btn" />
-                        <button label="Supprimer la sélection" label_selected="Supprimer la sélection"
-                             name="remove_officer_btn" />
+                        <button label="Ajouter un officier..." label_selected="Ajouter un officier..." name="add_officer_btn"/>
+                        <button label="Supprimer la sélection" label_selected="Supprimer la sélection" name="remove_officer_btn"/>
                         <text name="lbl2">
                                 Membres :
                         </text>
-                        <button label="Ajouter un membre..." label_selected="Ajouter un membre..."
-                             name="add_member_btn" />
-                        <button label="Supprimer la sélection" label_selected="Supprimer la sélection"
-                             name="remove_member_btn" />
+                        <button label="Ajouter un membre..." label_selected="Ajouter un membre..." name="add_member_btn"/>
+                        <button label="Supprimer la sélection" label_selected="Supprimer la sélection" name="remove_member_btn"/>
                         <text name="lbl3">
-                                Frais d&apos;adhésion :
+                                Frais d&apos;inscription :
                         </text>
-                        <check_box label="Inscription libre (sans invitation)" name="open" />
+                        <check_box label="Inscription libre (sans invitation)" name="open"/>
                 </panel>
                 <panel label="Terrain" name="land">
                         <text name="txt">
@@ -247,37 +230,32 @@ Tous les membres qui ne sont pas officiers sont candidats.
                         <text name="lbl">
                                 Total des contributions :
                         </text>
-                        <button label="Carte..." label_selected="Carte..." name="map_btn" />
+                        <button label="Carte..." label_selected="Carte..." name="map_btn"/>
                         <text name="lbl2">
-                                Total du terrain utilisé :
+                                Superficie déjà utilisée :
                         </text>
                         <text name="lbl3">
-                                Terrain disponible :
+                                Superficie disponible :
                         </text>
-                        <button label="Définir la contribution" label_selected="Définir la contribution"
-                             name="set_contrib_btn" />
+                        <button label="Définir la contribution" label_selected="Définir la contribution" name="set_contrib_btn"/>
                         <text name="warning_label">
-                                Avertissement : ce groupe a trop de terrain. les membres du groupe doivent faire une contribution plus importante.
+                                Avertissement : ce groupe a trop de terrain. Les membres du groupe doivent faire une contribution plus importante.
                         </text>
                 </panel>
                 <panel label="Argent" name="mon">
                         <tab_container name="group money history tab">
-                                <panel label="Planification" name="money panel" />
+                                <panel label="Planification" name="money panel"/>
                                 <panel label="Détails" name="money panel2">
-                                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="&lt; Earlier"
-                                             tool_tip="Reculer dans le temps" />
-                                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="Later &gt;"
-                                             tool_tip="Avancer dans le temps" />
+                                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="&lt; Earlier" tool_tip="Reculer dans le temps"/>
+                                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="Later &gt;" tool_tip="Avancer dans le temps"/>
                                 </panel>
                                 <panel label="Ventes" name="money panel3">
-                                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="&lt; Earlier"
-                                             tool_tip="Reculer dans le temps" />
-                                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="Later &gt;"
-                                             tool_tip="Avancer dans le temps" />
+                                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="&lt; Earlier" tool_tip="Reculer dans le temps"/>
+                                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="Later &gt;" tool_tip="Avancer dans le temps"/>
                                 </panel>
                         </tab_container>
                 </panel>
         </tab_container>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Annuler" label_selected="Annuler" name="Cancel" />
+        <button label="OK" label_selected="OK" name="OK"/>
+        <button label="Annuler" label_selected="Annuler" name="Cancel"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 1f17670..e3624c7 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Hardware Settings Floater" title="Configuration du matériel">
         <text name="Filtering:">
                 Filtres :
         </text>
-        <check_box label="Filtre anisotrope (plus lent si activé)" name="ani" />
+        <check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
         <text name="Antialiasing:">
                 Anti-aliasing :
         </text>
@@ -24,17 +24,15 @@
                         16x
                 </combo_item>
         </combo_box>
-        <spinner label="Gamma :" name="gamma" />
-        <text name="(brightness, lower is brighter)" left="217" >
-                (luminosité, valeur faible = plus lumineux, 0 = défaut)
+        <spinner label="Gamma :" name="gamma"/>
+        <text left="217" name="(brightness, lower is brighter)">
+                (0 = défaut, valeur faible = plus lumineux)
         </text>
         <text name="Enable VBO:">
                 Activer le VBO :
         </text>
-        <check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo"
-             tool_tip="Sur un matériel moderne, cette option permet une meilleure performance.  Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés." />
-        <slider label="Mémoire texture (Mo) :" name="GrapicsCardTextureMemory"
-             tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues." />
-        <spinner label="Rapport de distance &#10;du brouillard :" name="fog" />
-        <button label="OK" label_selected="OK" name="OK" />
+        <check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+        <slider label="Mémoire vidéo (Mo) :" name="GrapicsCardTextureMemory" tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues."/>
+        <spinner label="Indice du brouillard :" name="fog"/>
+        <button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
new file mode 100644
index 0000000..1538189
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="htmlfloater" title="">
+        <button label="Fermer" name="close_btn" />
+        <button label="Précédente" name="back_btn" />
+        <button label="Suivante" name="forward_btn" />
+        <button label="Rafraîchir" name="reload_btn" />
+        <button label="Arrêter" name="stop_btn" />
+        <button label="Domicile" name="home_btn" />
+        <button label="Aller" name="go_btn" />
+        <string name="home_page_url">
+                http://www.secondlife.com
+        </string>
+        <string name="support_page_url">
+                http://support.secondlife.com
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 9833fd2..3727e35 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
         <text name="name_label">
                 Nom :
@@ -9,7 +9,7 @@
         <text name="preview_label">
                 Prévisualiser comme :
         </text>
-        <combo_box label="Habits" name="clothing_type_combo">
+        <combo_box label="Habits" name="clothing_type_combo" left="126" >
                 <combo_item name="Image">
                         Image
                 </combo_item>
@@ -38,7 +38,7 @@
                         Jupe
                 </combo_item>
                 <combo_item name="SculptedPrim">
-                        Prim sculpté
+                        Sculptie
                 </combo_item>
         </combo_box>
         <text name="bad_image_text">
@@ -46,7 +46,7 @@
 
 Sauvegardez en Targa 24 bit (.tga).
         </text>
-        <check_box label="Utiliser une compression sans perte" name="lossless_check" />
-        <button label="Annuler" name="cancel_btn" />
-        <button label="Charger ([AMOUNT] $L)" name="ok_btn" />
+        <check_box label="Utiliser une compression sans perte" name="lossless_check"/>
+        <button label="Annuler" name="cancel_btn"/>
+        <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_import.xml b/linden/indra/newview/skins/default/xui/fr/floater_import.xml
index 2b0995c..4f106a6 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_import.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_import.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Import" title="">
         <text name="name_label">
                 Nom :
@@ -9,8 +9,8 @@
         <text name="preview_label">
                 Fichiers à charger :
         </text>
-        <button label="Annuler" name="cancel_btn" />
-        <button label="Charger (10 $L)" name="ok_btn" />
+        <button label="Annuler" name="cancel_btn"/>
+        <button label="Charger (10 L$)" name="ok_btn"/>
         <text name="preview_label2">
                 Prévisualisation de l&apos;image :
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index fb95ccd..b7e2f8d 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(inconnue)" name="im_floater" title="(inconnue)">
-        <button label="Profil..." label_selected="Profil..." name="profile_btn" />
-        <button label="Fermer" label_selected="Fermer" name="close_btn" />
+        <button label="Profil..." label_selected="Profil..." name="profile_btn"/>
+        <button label="Fermer" label_selected="Fermer" name="close_btn"/>
         <string name="ringing">
                 Appel en cours...
         </string>
@@ -26,14 +26,14 @@
         <string name="default_text_label">
                 Cliquez ici pour envoyer un message instantané.
         </string>
-        <button label="Profil..." name="profile_callee_btn" />
-        <button label="Appeler" name="start_call_btn" />
-        <button label="Raccrocher" name="end_call_btn" />
+        <button label="Profil..." name="profile_callee_btn"/>
+        <button label="Appeler" name="start_call_btn"/>
+        <button label="Raccrocher" name="end_call_btn"/>
         <panel name="speaker_controls">
-                <button name="mute_btn" tool_tip="Ignorer" />
+                <button name="mute_btn" tool_tip="Ignorez"/>
         </panel>
-        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor" />
-        <button label="Envoyer" name="send_btn" />
+        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
+        <button label="Envoyer" name="send_btn"/>
         <text name="live_help_dialog">
                 *** Bienvenue sur la page Demande d&apos;aide *** 
 Veuillez au préalable consulter les pages d&apos;aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
index 35a43d5..38119fa 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(inconnu)" name="im_floater" title="(inconnu)">
         <string name="ringing">
                 En train de rejoindre le chat vocal...
@@ -27,11 +27,10 @@
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
                         <button label="Appeler" name="start_call_btn" width="95"/>
-                        <button label="Raccrocher" name="end_call_btn" width="95" halign="right"/>
-                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn"
-                             tool_tip="Cliquez ici pour mettre la liste des intervenants actifs dans cette session IM en mode bascule." />
-                        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor" />
-                        <button label="Envoyer" name="send_btn" />
+                        <button halign="right" label="Raccrocher" name="end_call_btn" width="95"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affichez/masquez la liste des intervenants actifs dans cette session IM."/>
+                        <line_editor label="Cliquez ici pour envoyer un message instantané" name="chat_editor"/>
+                        <button label="Envoyer" name="send_btn"/>
                 </layout_panel>
         </layout_stack>
         <string name="live_help_dialog">
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
index d1e9888..e5057ee 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(inconnu)" name="im_floater" title="(inconnu)">
         <string name="ringing">
                 En train de rejoindre le chat vocal...
@@ -38,13 +38,11 @@
         </string>
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
-                        <button label="Infos sur le groupe" name="group_info_btn" width="120" />
-                        <button label="Participer à l&apos;appel" left_delta="125" name="start_call_btn"
-                             width="145" />
-                        <button halign="center" label="Raccrocher" name="end_call_btn" width="145" />
-                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn"
-                             tool_tip="Cliquez ici pour mettre la liste des intervenants actifs dans cette session IM en mode bascule." />
-                        <button label="Envoyer" name="send_btn" />
+                        <button label="Infos sur le groupe" name="group_info_btn" width="120"/>
+                        <button label="Participer à l&apos;appel" left_delta="125" name="start_call_btn" width="145"/>
+                        <button halign="center" label="Raccrocher" name="end_call_btn" width="145"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affichez/Masquez la liste des intervenants actifs dans cette session IM."/>
+                        <button label="Envoyer" name="send_btn"/>
                 </layout_panel>
         </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
index d522af9..071c0ae 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventaire">
-        <search_editor label="Saisissez votre recherche ici" name="inventory search editor" />
+        <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="Tous les objets" name="All Items" />
-                <inventory_panel label="Objets récents" name="Recent Items" />
+                <inventory_panel label="Tous les objets" name="All Items"/>
+                <inventory_panel label="Objets récents" name="Recent Items"/>
         </tab_container>
         <menu_bar name="Inventory Menu">
                 <menu label="Fichier" name="File">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="Ouvrir" name="Open" />
-                        <menu_item_call label="Nouvelle fenêtre" name="New Window" />
-                        <menu_item_call label="Afficher les filtres" name="Show Filters" />
-                        <menu_item_call label="Réinitialiser les filtres" name="Reset Current" />
-                        <menu_item_call label="Fermer tous les dossiers" name="Close All Folders" />
-                        <menu_item_call label="Vider la corbeille" name="Empty Trash" />
+                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                        <menu_item_call label="Ouvrir" name="Open"/>
+                        <menu_item_call label="Nouvelle fenêtre" name="New Window"/>
+                        <menu_item_call label="Afficher les filtres" name="Show Filters"/>
+                        <menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
+                        <menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
+                        <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
                 </menu>
                 <menu label="Créer" name="Create">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="Nouveau dossier" name="New Folder" />
-                        <menu_item_call label="Nouveau script" name="New Script" />
-                        <menu_item_call label="Nouvelle note" name="New Note" />
-                        <menu_item_call label="Nouveau geste" name="New Gesture" />
+                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                        <menu_item_call label="Nouveau dossier" name="New Folder"/>
+                        <menu_item_call label="Nouveau script" name="New Script"/>
+                        <menu_item_call label="Nouvelle note" name="New Note"/>
+                        <menu_item_call label="Nouveau geste" name="New Gesture"/>
                         <menu name="New Clothes">
-                                <menu_item_call label="Nouvelle jupe" name="New Shirt" />
-                                <menu_item_call label="Nouveau pantalon" name="New Pants" />
-                                <menu_item_call label="Nouvelles chaussures" name="New Shoes" />
-                                <menu_item_call label="Nouvelles chaussettes" name="New Socks" />
-                                <menu_item_call label="Nouvelle veste" name="New Jacket" />
-                                <menu_item_call label="Nouvelle jupe" name="New Skirt" />
-                                <menu_item_call label="Nouveaux gants" name="New Gloves" />
-                                <menu_item_call label="Nouveau tricot de peau" name="New Undershirt" />
-                                <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants" />
+                                <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+                                <menu_item_call label="Nouveau pantalon" name="New Pants"/>
+                                <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+                                <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+                                <menu_item_call label="Nouvelle veste" name="New Jacket"/>
+                                <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+                                <menu_item_call label="Nouveaux gants" name="New Gloves"/>
+                                <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
+                                <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
                         </menu>
                         <menu name="New Body Parts">
-                                <menu_item_call label="Nouvelle silhouette" name="New Shape" />
-                                <menu_item_call label="Nouvelle peau" name="New Skin" />
-                                <menu_item_call label="Nouveaux cheveux" name="New Hair" />
-                                <menu_item_call label="Nouveaux yeux" name="New Eyes" />
+                                <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+                                <menu_item_call label="Nouvelle peau" name="New Skin"/>
+                                <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+                                <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
                         </menu>
                 </menu>
                 <menu label="Trier" name="Sort">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="Par nom" name="By Name" />
-                        <menu_item_check label="Par date" name="By Date" />
-                        <menu_item_check label="Dossiers toujours par nom" name="Folders Always By Name" />
-                        <menu_item_check label="Dossiers système au dessus" name="System Folders To Top" />
+                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                        <menu_item_check label="Par nom" name="By Name"/>
+                        <menu_item_check label="Par date" name="By Date"/>
+                        <menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
+                        <menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
                 </menu>
                 <menu label="Filters" name="Filters">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="Modifier actuel" name="Modify Current" />
-                        <menu_item_call label="Réinitialiser actuel" name="Reset Current" />
+                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                        <menu_item_check label="Modifier actuel" name="Modify Current"/>
+                        <menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
                 </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 462692c..92dbc36 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties"
-     title="Propriétés de l&apos;objet de l&apos;inventaire">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriétés de l&apos;objet de l&apos;inventaire">
         <text name="LabelItemNameTitle">
                 Nom :
         </text>
@@ -13,14 +12,14 @@
         <text name="LabelCreatorName">
                 Nicole Linden
         </text>
-        <button label="Profil..." label_selected="" name="BtnCreator" />
+        <button label="Profil..." label_selected="" name="BtnCreator"/>
         <text name="LabelOwnerTitle">
                 Propriétaire :
         </text>
         <text name="LabelOwnerName">
                 Thrax Linden
         </text>
-        <button label="Profil..." label_selected="" name="BtnOwner" />
+        <button label="Profil..." label_selected="" name="BtnOwner"/>
         <text name="LabelAcquiredTitle">
                 Acquis :
         </text>
@@ -30,9 +29,9 @@
         <text name="OwnerLabel">
                 Vous pouvez :
         </text>
-        <check_box label="Modifier" name="CheckOwnerModify" />
-        <check_box label="Copier" name="CheckOwnerCopy" />
-        <check_box label="Revendre/Donner" name="CheckOwnerTransfer" />
+        <check_box label="Modifier" name="CheckOwnerModify"/>
+        <check_box label="Copier" name="CheckOwnerCopy"/>
+        <check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
         <text name="BaseMaskDebug">
                 B :
         </text>
@@ -48,18 +47,18 @@
         <text name="NextMaskDebug">
                 N :
         </text>
-        <check_box label="Partager avec le groupe" name="CheckShareWithGroup" />
-        <check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy" />
-        <text name="NextOwnerLabel">
+        <check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
+        <check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
+        <text name="NextOwnerLabel" width="192">
                 Le prochain propriétaire pourra :
         </text>
-        <check_box label="Modifier" name="CheckNextOwnerModify" />
-        <check_box label="Copier" name="CheckNextOwnerCopy" />
-        <check_box label="Revendre/Donner" name="CheckNextOwnerTransfer" />
+        <check_box label="Modifier" name="CheckNextOwnerModify"/>
+        <check_box label="Copier" name="CheckNextOwnerCopy"/>
+        <check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
         <text name="SaleLabel">
                 Marquer l&apos;objet :
         </text>
-        <check_box label="À vendre" name="CheckPurchase" />
+        <check_box label="À vendre" name="CheckPurchase"/>
         <radio_group name="RadioSaleType">
                 <radio_item name="radio">
                         Original
@@ -69,7 +68,7 @@
                 </radio_item>
         </radio_group>
         <text name="TextPrice">
-                Prix :  $L
+                Prix :  L$
         </text>
         <string name="unknown">
                 (inconnu)
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index d5cdba4..090f5f6 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory Finder" title="inventory_recent_items">
-        <check_box label="Animation" name="check_animation" />
-        <check_box label="Cartes de visite" name="check_calling_card" />
-        <check_box label="Habits" name="check_clothing" />
-        <check_box label="Gestes" name="check_gesture" />
-        <check_box label="Repères" name="check_landmark" />
-        <check_box label="Notes" name="check_notecard" />
-        <check_box label="Objets" name="check_object" />
-        <check_box label="Scripts" name="check_script" />
-        <check_box label="Sons" name="check_sound" />
-        <check_box label="Textures" name="check_texture" />
-        <check_box label="Photos" name="check_snapshot" />
-        <button label="Tout" label_selected="Tout" name="All" />
-        <button label="Aucun" label_selected="Aucun" name="None" />
-        <check_box label="Toujours montrer les dossiers" name="check_show_empty" />
-        <check_box label="Depuis la déconnexion" name="check_since_logoff" />
-        <text type="string" length="1" name="- OR -">
+        <check_box label="Animations" name="check_animation"/>
+        <check_box label="Cartes de visite" name="check_calling_card"/>
+        <check_box label="Habits" name="check_clothing"/>
+        <check_box label="Gestes" name="check_gesture"/>
+        <check_box label="Repères" name="check_landmark"/>
+        <check_box label="Notes" name="check_notecard"/>
+        <check_box label="Objets" name="check_object"/>
+        <check_box label="Scripts" name="check_script"/>
+        <check_box label="Sons" name="check_sound"/>
+        <check_box label="Textures" name="check_texture"/>
+        <check_box label="Photos" name="check_snapshot"/>
+        <button label="Tout" label_selected="Tout" name="All" width="70"/>
+        <button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
+        <check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom="-284"/>
+        <check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
+        <text length="1" name="- OR -" type="string">
                 Ou il y a...
         </text>
-        <spinner label="Heures" name="spin_hours_ago" />
-        <spinner label="Jours" name="spin_days_ago" />
-        <button label="Fermer" label_selected="Fermer" name="Close" />
+        <spinner label="Heures" name="spin_hours_ago"/>
+        <spinner label="Jours" name="spin_days_ago"/>
+        <button label="Fermer" label_selected="Fermer" name="Close"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_joystick.xml b/linden/indra/newview/skins/default/xui/fr/floater_joystick.xml
index eddbe19..ab841e4 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Joystick" title="Configuration du joystick">
         <check_box name="enable_joystick">
-                Activer le joystick :
+                Activer :
         </check_box>
         <spinner label="Mapping axe des X " name="JoystickAxis1" />
         <spinner label="Mapping axe des Y" name="JoystickAxis2" />
@@ -78,6 +78,6 @@
                 Axe [NUM]
         </string>
         <string name="NoDevice">
-                aucun dispositif détecté
+                aucun joystick détecté
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index 22f5ab4..54069c9 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="Calcul du lag">
-        <button name="client_lagmeter" tool_tip="Statut du lag client" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Mesure du lag">
+        <button name="client_lagmeter" tool_tip="Statut du lag client"/>
         <text name="client">
                 Client :
         </text>
         <text name="client_text">
                 Normal
         </text>
-        <button name="network_lagmeter" tool_tip="Statut du lag réseau" />
+        <button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
         <text name="network">
                 Réseau :
         </text>
         <text name="network_text">
                 Normal
         </text>
-        <button name="server_lagmeter" tool_tip="Statut du lag serveur" />
+        <button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
         <text name="server">
                 Serveur :
         </text>
         <text name="server_text">
                 Normal
         </text>
-        <button label="?" name="server_help" />
-        <button label="&gt;&gt;" name="minimize" />
+        <button label="?" name="server_help"/>
+        <button label="&gt;&gt;" name="minimize"/>
         <string name="max_title_msg">
-                Calcul du lag
+                Mesure du lag
         </string>
         <string name="max_width_px">
                 360
@@ -57,7 +57,7 @@
                 Normal
         </string>
         <string name="client_draw_distance_cause_msg">
-                Cause possible : la distance d&apos;affichage est trop élevée
+                Cause possible : la limite d&apos;affichage est trop élevée
         </string>
         <string name="client_texture_loading_cause_msg">
                 Cause possible : images en cours de chargement
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index c9489b8..4a63abf 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="land holdings floater" title="Mon terrain">
+<floater name="land holdings floater" title="Mes terrains">
         <scroll_list name="parcel list">
                 <column label="Nom" name="name" />
                 <column label="Emplacement" name="location" />
@@ -7,9 +7,9 @@
                 <column label="" name="hidden" />
         </scroll_list>
         <button label="Téléporter" label_selected="Téléporter" name="Teleport"
-             tool_tip="Téléporter au milieu de ce terrain." />
+             tool_tip="Téléportez-vous au milieu de ce terrain." />
         <button label="Voir sur la carte" label_selected="Voir sur la carte" name="Show on Map"
-             tool_tip="Afficher ce terrain sur la carte du monde." />
+             tool_tip="Affichez ce terrain sur la carte du monde." />
         <text name="contrib_label">
                 Vos contributions :
         </text>
@@ -18,7 +18,7 @@
                 <column label="Surface" name="area" />
         </scroll_list>
         <text name="allowed_label">
-                Surface de terrain autorisée avec votre compte actuel :
+                Surface de terrain autorisée avec votre compte :
         </text>
         <text name="allowed_text">
                 [AREA] m²
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 68b7d82..5dc0fa7 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="Wiki LSL">
         <check_box label="Suivre le curseur" name="lock_check" />
-        <combo_box label="Verrouiller" name="history_combo" />
-        <button label="Précédente" name="back_btn" />
+        <combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
+        <button label="Précédente" name="back_btn" left_delta="75"/>
         <button label="Suivante" name="fwd_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index 0ee7bab..b0b842a 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Navigateur média">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Navigateur">
         <layout_stack name="stack1">
                 <layout_panel name="nav_controls">
-                        <button label="Précédente" name="back" width="75" />
-                        <button label="Suivante" name="forward"  width="70" left_delta="75" />
-                        <button label="Recharger" name="reload" left_delta="75" />
-                        <combo_box left_delta="75" name="address" width="250" />
-                        <button label="Aller" name="go" left_delta="255"/>
+                        <button label="Précédente" name="back" width="75"/>
+                        <button label="Suivante" left_delta="75" name="forward" width="70"/>
+                        <button label="Rafraîchir" left_delta="75" name="reload"/>
+                        <combo_box left_delta="75" name="address" width="250"/>
+                        <button label="OK" left_delta="255" name="go"/>
                 </layout_panel>
                 <layout_panel name="parcel_owner_controls">
-                        <button label="Envoyer URL actuelle sur parcelle" name="assign" />
+                        <button label="Envoyer l&apos;URL sur la parcelle" name="assign"/>
                 </layout_panel>
                 <layout_panel name="external_controls">
-                        <button label="Ouvrir dans mon navigateur web" name="open_browser" width="190" />
-                        <check_box label="Toujours ouvrir dans mon navigateur web" name="open_always" left_delta="195"/>
-                        <button label="Fermer" name="close" />
+                        <button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
+                        <check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
+                        <button label="Fermer" name="close"/>
                 </layout_panel>
         </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml b/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 311f8be..55ea870 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="move floater" title="">
-        <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche" />
-        <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite" />
-        <button label="" label_selected="" name="move up btn"
-             tool_tip="Sauter ou voler vers le haut" />
-        <button label="" label_selected="" name="move down btn"
-             tool_tip="S&apos;accroupir ou voler vers le bas" />
-        <button label="Voler" label_selected="Voler" name="fly btn"
-             tool_tip="Démarrer/arrêter vol" />
-        <joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche" />
-        <joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite" />
-        <joystick_turn name="forward btn" tool_tip="Se déplacer vers l&apos;avant" />
-        <joystick_turn name="backward btn" tool_tip="Se déplacer vers l&apos;arrière" />
+        <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche"/>
+        <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite"/>
+        <button label="" label_selected="" name="move up btn" tool_tip="Sauter ou voler vers le haut"/>
+        <button label="" label_selected="" name="move down btn" tool_tip="S&apos;accroupir ou voler vers le bas"/>
+        <button label="Voler" label_selected="Voler" name="fly btn" tool_tip="Démarrer/arrêter le vol"/>
+        <joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche"/>
+        <joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite"/>
+        <joystick_turn name="forward btn" tool_tip="Se déplacer vers l&apos;avant"/>
+        <joystick_turn name="backward btn" tool_tip="Se déplacer vers l&apos;arrière"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_mute.xml b/linden/indra/newview/skins/default/xui/fr/floater_mute.xml
index aeed682..0a527c9 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_mute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Résidents et objets ignorés">
+<floater name="mute floater" title="Résidents et objets ignorés" short_title="Liste des ignorés">
         <scroll_list name="mutes" tool_tip="Liste des résidents ignorés actuellement" />
         <button label="Ignorer le résident..." label_selected="Ignorer le résident..."
              name="Mute resident..."
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index 441c527..23d351f 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="mute by name" title="Ignorer les objets par nom">
         <text name="message">
-                Ignorer par nom ne marche que pour les chats et IM, pas les sons.
-Vous devez saisir le nom exact de l&apos;objet.
+                Cette fonction ne marche que pour les chats et les IM,
+pas les sons. Saisissez le nom exact de l&apos;objet.
         </text>
         <line_editor name="object_name">
                 Nom de l&apos;objet
         </line_editor>
-        <button label="OK" name="OK" />
-        <button label="Annuler" name="Cancel" />
+        <button label="OK" name="OK"/>
+        <button label="Annuler" name="Cancel"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml b/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
index e1915bd..7ddc913 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Name/Description" title="">
         <text name="name_label">
                 Nom :
@@ -6,6 +6,6 @@
         <text name="description_label">
                 Description :
         </text>
-        <button label="Annuler" name="cancel_btn" />
-        <button label="Charger (10 $L)" name="ok_btn" />
+        <button label="Annuler" name="cancel_btn"/>
+        <button label="Charger (10 L$)" name="ok_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
index a716724..b3f329e 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
@@ -1,86 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" width="585">
-        <button label="Enregistrer" label_selected="Enregistrer" left="171" name="Save"
-             width="100" />
-        <button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100" />
-        <check_box label="Silhouette" name="checkbox_Shape" />
-        <check_box label="Peau" name="checkbox_Skin" />
-        <check_box label="Cheveux" name="checkbox_Hair" />
-        <check_box label="Yeux" name="checkbox_Eyes" />
-        <check_box label="Donner un nom de &#10;dossier à l&apos;ensemble" name="rename" />
-        <check_box label="Chemise" name="checkbox_Shirt" />
-        <check_box label="Pantalon" name="checkbox_Pants" />
-        <check_box label="Chaussures" name="checkbox_Shoes" />
-        <check_box label="Chaussettes" name="checkbox_Socks" />
-        <check_box label="Veste" name="checkbox_Jacket" />
-        <check_box label="Gants" name="checkbox_Gloves" />
-        <check_box label="Tricot de peau" name="checkbox_Undershirt" />
-        <check_box label="Sous-vêtements" name="checkbox_Underpants" />
-        <check_box label="Jupe" name="checkbox_Skirt" />
-        <check_box label="Poitrine" left="225" name="checkbox_Chest" />
-        <check_box label="Crâne" left="225" name="checkbox_Skull" />
-        <check_box label="Épaule gauche" left="225" name="checkbox_Left Shoulder" />
-        <check_box label="Épaule droite" left="225" name="checkbox_Right Shoulder" />
-        <check_box label="Main gauche" left="225" name="checkbox_Left Hand" />
-        <check_box label="Main droite" left="225" name="checkbox_Right Hand" />
-        <check_box label="Pied gauche" left="225" name="checkbox_Left Foot" />
-        <check_box label="Pied droit" left="225" name="checkbox_Right Foot" />
-        <check_box label="Colonne" left="225" name="checkbox_Spine" />
-        <check_box label="Bassin" left="225" name="checkbox_Pelvis" />
-        <check_box label="Bouche" left="225" name="checkbox_Mouth" />
-        <check_box label="Menton" left="225" name="checkbox_Chin" />
-        <check_box label="Oreille gauche" left="225" name="checkbox_Left Ear" />
-        <check_box label="Oreille droite" left="325" name="checkbox_Right Ear" />
-        <check_box label="Globe oculaire gauche" left="325" name="checkbox_Left Eyeball" />
-        <check_box label="Globe oculaire droit" left="325" name="checkbox_Right Eyeball" />
-        <check_box label="Nez" left="325" name="checkbox_Nose" />
-        <check_box label="Bras droit" left="325" name="checkbox_R Upper Arm" />
-        <check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm" />
-        <check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm" />
-        <check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm" />
-        <check_box label="Hanche droite" left="325" name="checkbox_Right Hip" />
-        <check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg" />
-        <check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg" />
-        <check_box label="Hanche gauche" left="325" name="checkbox_Left Hip" />
-        <check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg" />
-        <check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg" />
-        <check_box label="Estomac" left="460" name="checkbox_Stomach" />
-        <check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec" />
-        <check_box label="Pectoral droit" left="460" name="checkbox_Right Pec" />
-        <check_box label="Centre 2" left="460" name="checkbox_Center 2" />
-        <check_box label="En haut à droite" left="460" name="checkbox_Top Right" />
-        <check_box label="En haut" left="460" name="checkbox_Top" />
-        <check_box label="En haut à gauche" left="460" name="checkbox_Top Left" />
-        <check_box label="Centre" left="460" name="checkbox_Center" />
-        <check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left" />
-        <check_box label="En bas" left="460" name="checkbox_Bottom" />
-        <check_box label="En bas à droite" left="460" name="checkbox_Bottom Right" />
-        <text type="string" length="1" name="Make New Outfit">
+        <button label="Enregistrer" label_selected="Enregistrer" left="171" name="Save" width="100"/>
+        <button label="Annuler" label_selected="Annuler" left="280" name="Cancel" width="100"/>
+        <check_box label="Silhouette" name="checkbox_Shape"/>
+        <check_box label="Peau" name="checkbox_Skin"/>
+        <check_box label="Cheveux" name="checkbox_Hair"/>
+        <check_box label="Yeux" name="checkbox_Eyes"/>
+        <check_box label="Donner le nom du dossier &#10;à l&apos;ensemble" name="rename"/>
+        <check_box label="Chemise" name="checkbox_Shirt"/>
+        <check_box label="Pantalon" name="checkbox_Pants"/>
+        <check_box label="Chaussures" name="checkbox_Shoes"/>
+        <check_box label="Chaussettes" name="checkbox_Socks"/>
+        <check_box label="Veste" name="checkbox_Jacket"/>
+        <check_box label="Gants" name="checkbox_Gloves"/>
+        <check_box label="Tricot" name="checkbox_Undershirt"/>
+        <check_box label="Sous-vêtements" name="checkbox_Underpants"/>
+        <check_box label="Jupe" name="checkbox_Skirt"/>
+        <check_box label="Poitrine" left="225" name="checkbox_Chest"/>
+        <check_box label="Crâne" left="225" name="checkbox_Skull"/>
+        <check_box label="Épaule gauche" left="225" name="checkbox_Left Shoulder"/>
+        <check_box label="Épaule droite" left="225" name="checkbox_Right Shoulder"/>
+        <check_box label="Main gauche" left="225" name="checkbox_Left Hand"/>
+        <check_box label="Main droite" left="225" name="checkbox_Right Hand"/>
+        <check_box label="Pied gauche" left="225" name="checkbox_Left Foot"/>
+        <check_box label="Pied droit" left="225" name="checkbox_Right Foot"/>
+        <check_box label="Colonne" left="225" name="checkbox_Spine"/>
+        <check_box label="Bassin" left="225" name="checkbox_Pelvis"/>
+        <check_box label="Bouche" left="225" name="checkbox_Mouth"/>
+        <check_box label="Menton" left="225" name="checkbox_Chin"/>
+        <check_box label="Oreille gauche" left="225" name="checkbox_Left Ear"/>
+        <check_box label="Oreille droite" left="325" name="checkbox_Right Ear"/>
+        <check_box label="Å’il gauche" left="325" name="checkbox_Left Eyeball"/>
+        <check_box label="Å’il droit" left="325" name="checkbox_Right Eyeball"/>
+        <check_box label="Nez" left="325" name="checkbox_Nose"/>
+        <check_box label="Bras droit" left="325" name="checkbox_R Upper Arm"/>
+        <check_box label="Avant-bras droit" left="325" name="checkbox_R Forearm"/>
+        <check_box label="Bras gauche" left="325" name="checkbox_L Upper Arm"/>
+        <check_box label="Avant-bras gauche" left="325" name="checkbox_L Forearm"/>
+        <check_box label="Hanche droite" left="325" name="checkbox_Right Hip"/>
+        <check_box label="Cuisse droite" left="325" name="checkbox_R Upper Leg"/>
+        <check_box label="Jambe droite" left="325" name="checkbox_R Lower Leg"/>
+        <check_box label="Hanche gauche" left="325" name="checkbox_Left Hip"/>
+        <check_box label="Cuisse gauche" left="325" name="checkbox_L Upper Leg"/>
+        <check_box label="Jambe gauche" left="460" name="checkbox_L Lower Leg"/>
+        <check_box label="Estomac" left="460" name="checkbox_Stomach"/>
+        <check_box label="Pectoral gauche" left="460" name="checkbox_Left Pec"/>
+        <check_box label="Pectoral droit" left="460" name="checkbox_Right Pec"/>
+        <check_box label="Centre 2" left="460" name="checkbox_Center 2"/>
+        <check_box label="En haut à droite" left="460" name="checkbox_Top Right"/>
+        <check_box label="En haut" left="460" name="checkbox_Top"/>
+        <check_box label="En haut à gauche" left="460" name="checkbox_Top Left"/>
+        <check_box label="Centre" left="460" name="checkbox_Center"/>
+        <check_box label="En bas à gauche" left="460" name="checkbox_Bottom Left"/>
+        <check_box label="En bas" left="460" name="checkbox_Bottom"/>
+        <check_box label="En bas à droite" left="460" name="checkbox_Bottom Right"/>
+        <text length="1" name="Make New Outfit" type="string">
                 Créer un ensemble
         </text>
-        <text type="string" length="1"
-             name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
+        <text length="1" name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it." type="string">
                 Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
 Faites glisser le dossier contenant un ensemble vers votre avatar pour lui faire porter.
  
-Le bouton Créer un ensemble vous permet de créer un dossier et d&apos;y sauvegarder les copies des articles que vous portez maintenant.
+Le bouton Créer un ensemble vous permet de créer un dossier et d&apos;y sauvegarder les copies
+des articles que vous portez maintenant.
         </text>
-        <text type="string" length="1" name="Folder name:">
+        <text length="1" name="Folder name:" type="string">
                 Nom du dossier :
         </text>
-        <text type="string" length="1" name="Items to include in outfit:">
+        <text length="1" name="Items to include in outfit:" type="string">
                 Articles à inclure à l&apos;ensemble :
         </text>
-        <text type="string" length="1" name="Body Parts:">
+        <text length="1" name="Body Parts:" type="string">
                 Parties du corps :
         </text>
-        <text type="string" length="1" left="115" name="Clothes:">
+        <text left="115" length="1" name="Clothes:" type="string">
                 Habits :
         </text>
-        <text type="string" length="1" left="227" name="Attachments:">
+        <text left="227" length="1" name="Attachments:" type="string">
                 Attachements :
         </text>
-        <text type="string" length="1" name="Options:">
+        <text length="1" name="Options:" type="string">
                 Options :
         </text>
         <line_editor name="name ed">
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml b/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 65c73ef..36c712e 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -3,9 +3,6 @@
         <text type="string" length="1" name="object_name">
                 [DESC]:
         </text>
-        <button label="Copier vers l&apos;inventaire"
-             label_selected="Copier vers l&apos;inventaire"
-             name="copy_to_inventory_button" />
-        <button label="Copier et porter" label_selected="Copier et porter"
-             name="copy_and_wear_button" />
+        <button label="Copier vers l&apos;inventaire" label_selected="Copier vers l&apos;inventaire" name="copy_to_inventory_button" width="132" />
+        <button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_pay.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
index af573bf..c5b689e 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-        <button label="1 $L" label_selected="1 $L" name="fastpay 1" />
-        <button label="5 $L" label_selected="5 $L" name="fastpay 5" />
-        <button label="10 $L" label_selected="10 $L" name="fastpay 10" />
-        <button label="20 $L" label_selected="20 $L" name="fastpay 20" />
-        <button label="Payer" label_selected="Payer" name="pay btn" />
-        <button label="Annuler" label_selected="Annuler" name="cancel btn" />
-        <text type="string" length="1" name="payee_label">
+        <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+        <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+        <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+        <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+        <button label="Payer" label_selected="Payer" name="pay btn"/>
+        <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+        <text length="1" name="payee_label" type="string" left="5">
                 Payer :
         </text>
-        <text type="string" length="1" name="payee_name">
+        <text length="1" name="payee_name" type="string">
                 [FIRST] [LAST]
         </text>
-        <text type="string" length="1" name="fastpay text">
+        <text length="1" name="fastpay text" type="string" width="100" halign="left">
                 Paiement rapide :
         </text>
-        <text type="string" length="1" name="amount text" left="4">
+        <text left="4" length="1" name="amount text" type="string">
                 Montant :
         </text>
-        <line_editor left="60" name="amount" width="55" />
+        <line_editor left="60" name="amount" width="55"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 7b33668..3dc0af7 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+        <text length="1" name="payee_group" type="string" width="95">
                 Payer le groupe :
         </text>
-        <text type="string" length="1" name="payee_resident">
+        <text length="1" name="payee_resident" type="string" width="100" halign="left" >
                 Payer le résident :
         </text>
-        <text type="string" length="1" name="payee_name">
+        <text length="1" name="payee_name" type="string" left="105">
                 [FIRST] [LAST]
         </text>
-        <text type="string" length="1" name="object_name_label">
+        <text length="1" name="object_name_label" type="string" left="25">
                 Via un objet :
         </text>
-        <text type="string" length="1" name="object_name_text">
+        <text length="1" name="object_name_text" type="string" left="105">
                 ...
         </text>
-        <text type="string" length="1" name="fastpay text">
+        <text length="1" name="fastpay text" type="string" width="95">
                 Paiement rapide :
         </text>
-        <text type="string" length="1" name="amount text">
+        <text length="1" name="amount text" type="string" left="5" halign="left">
                 Montant :
         </text>
-        <button label="1 $L" label_selected="1 $L" name="fastpay 1" />
-        <button label="5 $L" label_selected="5 $L" name="fastpay 5" />
-        <button label="10 $L" label_selected="10 $L" name="fastpay 10" />
-        <button label="20 $L" label_selected="20 $L" name="fastpay 20" />
-        <button label="Payer" label_selected="Payer" name="pay btn" />
-        <button label="Annuler" label_selected="Annuler" name="cancel btn" />
+        <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+        <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
+        <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+        <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
+        <button label="Payer" label_selected="Payer" name="pay btn"/>
+        <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+        <line_editor left="65" name="amount" width="50" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml b/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
index b35fe38..9dab4d6 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Préférences">
+<floater name="Preferences" title="Préférences" min_width="330" width="626">
         <button label="À propos" label_selected="À propos" name="About..." />
         <button label="OK" label_selected="OK" name="OK" />
         <button label="Annuler" label_selected="Annuler" name="Cancel" />
         <button label="Appliquer" label_selected="Appliquer" name="Apply" />
         <button label="Aide" label_selected="Aide" name="Help" />
+        <tab_container name="pref core" tab_width="126" width="626" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index ebb2420..0ee4ea1 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -4,7 +4,7 @@
                 Description :
         </text>
         <button label="Jouer dans le Monde" label_selected="Stop" name="Anim play btn"
-             tool_tip="Jouer cette animation et partagez-la avec d&apos;autres." width="125" left="20"/>
+             tool_tip="Jouer cette animation et partagez-la avec d&apos;autres." width="131" left="20"/>
         <button label="Jouer localement" label_selected="Stop" name="Anim audition btn"
-             tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="160"/>
+             tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="162"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 1def967..e43805b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -33,12 +33,14 @@
         <text name="steps_label">
                 Étapes :
         </text>
+        <!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
         <scroll_list name="library_list">
                 Animation
 Son
 Chat
 Attendre
         </scroll_list>
+        -->
         <button label="Ajouter &gt;&gt;" name="add_btn" />
         <button label="Monter" name="up_btn" />
         <button label="Descendre" name="down_btn" />
@@ -60,6 +62,6 @@ ajoutez des pauses.
         <check_box label="temps en secondes" name="wait_time_check" />
         <check_box label="Actifs" name="active_check"
              tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu&apos;il y a un conflit entre les raccourcis." />
-        <button label="Prévisualiser" name="preview_btn" />
-        <button label="Enregistrer" name="save_btn" />
+        <button label="Prévisualiser" name="preview_btn" width="86" />
+        <button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 90cadba..5e7d7b8 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -5,7 +5,7 @@
                 Description :
         </text>
         <text_editor type="string" length="1" name="Notecard Editor">
-                Chargement en cours...
+                Chargement...
         </text_editor>
         <string name="no_object">
                 Impossible de trouver l&apos;objet contenant cette note.
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
index 55ed5a9..f7c8646 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview_notecard">
         <text_editor type="string" length="1" name="Notecard Editor">
-                Chargement en cours...
+                Chargement..
         </text_editor>
         <text type="string" length="1" name="desc txt">
                 Description :
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 71b5a24..e55ca1a 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -5,7 +5,7 @@
         </text>
         <button label="Jouer dans le Monde" label_selected="Jouer dans le Monde"
              name="Sound play btn"
-             tool_tip="Jouer ce son et partagez-le avec d&apos;autres." width="125" left_delta="-136"/>
+             tool_tip="Jouer ce son et partagez-le avec d&apos;autres." width="131" left_delta="-142"/>
         <button label="Jouer localement" label_selected="Jouer localement"
              name="Sound audition btn"
              tool_tip="Jouer ce son et soyez le seul à l&apos;entendre." width="125" left="162"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
index ad8bdf9..d8668dc 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
@@ -1,14 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="price_for_listing" title="Publier la petite annonce">
         <text name="explanation_text">
-                Votre petite annonce restera en ligne pendant une semaine à compter de sa date de publication. 
- 
-La position de votre annonce dans les listes dépend du montant que vous décidez de payer.
-Les annonces les plus chères paraissent en tête de liste et sont plus visibles dans les résultats de recherche.
+                Votre petite annonce restera en ligne pendant une
+semaine à compter de sa date de publication. 
+
+La position de votre annonce dans les listes
+dépend du montant que vous décidez de payer.
+Les annonces les plus chères paraissent en tête de
+liste et sont plus visibles dans les résultats de
+recherche.
         </text>
-        <text name="price_text">
-                Coût de l&apos;annonce ($L) :
+        <text name="price_text" width="133">
+                Coût de l&apos;annonce (L$) :
         </text>
-        <button label="Fixer le prix" name="set_price_btn" />
-        <button label="Annuler" name="cancel_btn" />
+        <line_editor left="155" name="price_edit" />
+        <button label="Fixer le prix" name="set_price_btn"/>
+        <button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_region_info.xml b/linden/indra/newview/skins/default/xui/fr/floater_region_info.xml
index d60ebed..d69f212 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="Région/Domaine" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Région et domaine"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 0afaa0d..aee7f9c 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Signaler une infraction">
+        <texture_picker label="" name="screenshot"/>
+        <check_box label="Inclure une capture d&apos;écran" name="screen_check"/>
         <text name="reporter_title" width="60">
                 Déposant :
         </text>
@@ -15,19 +17,26 @@
         <text name="pos_title">
                 Position :
         </text>
-        <texture_picker name="screenshot" />
-        <check_box label="Inclure une capture d&apos;écran" name="screen_check" />
         <text name="pos_field">
                 {128.1, 128.1, 15.4}
         </text>
+        <text name="select_object_label">
+                Cliquez sur le bouton puis l&apos;objet :
+        </text>
+        <button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport."/>
+        <text name="object_name_label">
+                Nom :
+        </text>
         <text left_delta="70" name="object_name" width="105">
                 Consetetur Sadipscing
         </text>
+        <text name="owner_name_label" width="66">
+                Propriétaire :
+        </text>
         <text left_delta="70" name="owner_name" width="105">
                 Hendrerit Vulputate
         </text>
-        <combo_box name="category_combo"
-             tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
+        <combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
                 <combo_item name="Select_category">
                         Sélectionnez une catégorie
                 </combo_item>
@@ -49,14 +58,11 @@
                 <combo_item name="Assault__Weapons_testing_sandbox">
                         Assaut &gt; Bac à sable pour tests d&apos;armes à feu
                 </combo_item>
-                <combo_item name="Copyright_or_intellectual_property_violation">
-                        Violation de droits d&apos;auteur ou de propriété intellectuelle
-                </combo_item>
                 <combo_item name="Commerce__Failure_to_deliver_product_or_service">
                         Commerce &gt; Incapacité à fournir un produit ou service
                 </combo_item>
-                <combo_item name="Disclosure__First_Life_information">
-                        Divulgation &gt; Informations sur la première vie (First Life)
+                <combo_item name="Disclosure__Real_world_information">
+                        Divulgation &gt; Informations sur la vie réelle
                 </combo_item>
                 <combo_item name="Disclosure__Remotely_monitoring chat">
                         Divulgation &gt; Écoute d&apos;un chat à distance
@@ -80,7 +86,7 @@
                         Trouble de la paix &gt; Spam à caractère commercial
                 </combo_item>
                 <combo_item name="Fraud__L$">
-                        Fraude &gt; $L
+                        Fraude &gt; L$
                 </combo_item>
                 <combo_item name="Fraud__Land">
                         Fraude &gt; Terrain
@@ -89,7 +95,7 @@
                         Fraude &gt; Vente pyramidale ou lettre-chaîne
                 </combo_item>
                 <combo_item name="Fraud__US$">
-                        Fraude &gt; $US
+                        Fraude &gt; US$
                 </combo_item>
                 <combo_item name="Harassment__Advert_farms___visual_spam">
                         Harcèlement &gt; Spam visuel
@@ -119,10 +125,16 @@
                         Indécence &gt; Nom d&apos;avatar inapproprié
                 </combo_item>
                 <combo_item name="Indecency__Mature_content_in_PG_region">
-                        Indécence &gt; Contenu Adulte dans une région où l&apos;accompagnement parental est requis
+                        Indécence &gt; Contenu Adultes dans une région Tout public
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_Content_Removal">
+                        Violation de droits de propriété intellectuelle &gt; Suppression de contenu
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+                        Violation de droits de propriété intellectuelle &gt; CopyBot ou exploitation abusive des permissions
                 </combo_item>
                 <combo_item name="Intolerance">
-                        Intolerance
+                        Intolérance
                 </combo_item>
                 <combo_item name="Land__Abuse_of_sandbox_resources">
                         Terrain &gt; Utilisation abusive des ressources du bac à sable
@@ -136,9 +148,6 @@
                 <combo_item name="Land__Encroachment__Trees_plants">
                         Terrain &gt; Empiètement &gt; Arbres/plantes
                 </combo_item>
-                <combo_item name="Trademark_violation">
-                        Violation des droits de marque
-                </combo_item>
                 <combo_item name="Wagering_gambling">
                         Paris/jeux d&apos;argent
                 </combo_item>
@@ -146,26 +155,13 @@
                         Autre
                 </combo_item>
         </combo_box>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport." />
-        <text name="select_object_label">
-                Cliquez sur le bouton puis l&apos;objet :
-        </text>
-        <text name="object_name_label">
-                Nom :
-        </text>
-        <text name="owner_name_label" width="66">
-                Propriétaire :
-        </text>
         <text name="abuser_name_title">
                 Nom du contrevenant :
         </text>
-        <button label="Choisir le résident" label_selected="" name="select_abuser"
-             tool_tip="Sélectionnez le nom du résident dans une liste" />
-        <check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name"
-             tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant" />
+        <button label="Choisir le résident" label_selected="" name="select_abuser" tool_tip="Sélectionnez le nom du résident dans une liste"/>
+        <check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name" tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant"/>
         <text name="abuser_name_title2">
-                Lieu où l&apos;infraction a eu lieu :
+                Indiquez où l&apos;infraction a eu lieu :
         </text>
         <text name="sum_title">
                 Récapitulatif :
@@ -176,13 +172,12 @@
         <text name="bug_aviso">
                 Indiquez la date, le lieu, la nature de l&apos;infraction, ainsi que
 tout chat ou IM relatif à l&apos;infraction, en étant aussi précis
-que possible. Essayez aussi d&apos;indiquer un sujet.
+que possible. Pensez à indiquer un objet si possible.
         </text>
         <text bottom_delta="-16" name="incomplete_title">
                 Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une
 enquête.
         </text>
-        <button label="Signaler une infraction" label_selected="Signaler une infraction"
-             name="send_btn" />
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+        <button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
index bf4300e..80a42f1 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="bug_reporter" title="Signaler un bug">
         <text name="reporter_title">
                 Signalant :
@@ -12,8 +12,7 @@
         <text name="select_object_label">
                 Cliquez sur le bouton puis l&apos;objet :
         </text>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport." />
+        <button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d&apos;objet vous permet d&apos;identifier un objet comme sujet du rapport."/>
         <text name="object_name_label">
                 Nom :
         </text>
@@ -23,16 +22,15 @@
         <text name="owner_name_label">
                 Propriétaire :
         </text>
-        <check_box label="Inclure une capture d&apos;écran" name="screen_check" />
-        <texture_picker label="Instantané en cours..." name="screenshot" />
+        <check_box label="Inclure une capture d&apos;écran" name="screen_check"/>
+        <texture_picker label="Instantané en cours..." name="screenshot"/>
         <text name="category_label">
                 Catégorie :
         </text>
         <text name="owner_name">
                 Hendrerit Vulputate
         </text>
-        <combo_box name="category_combo"
-             tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
+        <combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
                 <combo_item name="Selectcategory">
                         Sélectionnez une catégorie
                 </combo_item>
@@ -64,7 +62,7 @@
                         Contenu manquant
                 </combo_item>
                 <combo_item name="LindenDollars(L$)">
-                        Dollar Linden ($L)
+                        Dollar Linden (L$)
                 </combo_item>
                 <combo_item name="Permissions">
                         Autorisations
@@ -92,7 +90,7 @@
                 Récapitulatif :
         </text>
         <text name="dscr_title">
-                Détails : (Soyez aussi précis que possible)
+                Détails (soyez aussi précis que possible) :
         </text>
         <text_editor name="details_edit">
                 Étapes pour reproduire le bug :
@@ -105,6 +103,6 @@ Résultats attendus :
                 Remarque : les rapports incomplets ne feront pas l&apos;objet d&apos;une enquête.
 Si ce bug vous permet de faire quelque chose que vous ne devriez pas pouvoir faire, surtout s&apos;il a des conséquences sur la sécurité et la performance, veuillez sélectionner la catégorie Exploit. Merci !
         </text>
-        <button label="Signaler un bug" label_selected="Signaler un bug" name="send_btn" />
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
+        <button label="Signaler un bug" label_selected="Signaler un bug" name="send_btn"/>
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
index 0507360..3f9c4b8 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
@@ -2,7 +2,7 @@
 <panel name="script panel">
         <button label="Enregistrer" label_selected="Enregistrer" name="Save_btn" />
         <text_editor type="string" length="1" name="Script Editor">
-                Chargement en cours...
+                Chargement...
         </text_editor>
         <combo_box label="Insérer..." name="Insert..." />
         <menu_bar name="script_menu">
@@ -29,7 +29,7 @@
                 </menu>
         </menu_bar>
         <string name="loading">
-                Chargement en cours...
+                Chargement...
         </string>
         <string name="can_not_view">
                 Vous n&apos;êtes pas autorisé à afficher ce script.
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index f8c0c6d..9ba1d56 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,20 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="sell land" title="Vendre terrain">
-        <text name="info_parcel_label">
+        <text name="info_parcel_label" width="48">
                 Parcelle :
         </text>
-        <text name="info_parcel">
-                Nom de la parcelle
+        <text name="info_parcel" left="66">
+                PARCEL NAME
         </text>
         <text name="info_size_label">
                 Taille :
         </text>
-        <text name="info_size">
+        <text name="info_size"  left="66">
                 [AREA] m²
         </text>
-        <text name="info_action">
-                Pour vendre cette parcelle :
+        <text name="info_action" bottom_delta="-60">
+                Pour vendre cette
+parcelle :
         </text>
+        <icon bottom_delta="-86" name="step_price" />
         <text name="price_label">
                 Votre prix de vente :
         </text>
@@ -22,18 +24,19 @@
                 Fixez un prix convenable pour ce terrain.
         </text>
         <text name="price_ld">
-                $L
+                L$
         </text>
         <text name="price_per_m">
-                ([PER_METER] $L par mètre carré)
+                ([PER_METER] L$ par mètre carré)
         </text>
         <text name="sell_to_label">
                 Vos acheteurs :
         </text>
         <text name="sell_to_text">
-                Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur spécifique.
+                Vendez votre terrain à n&apos;importe qui ou uniquement à un acheteur
+spécifique.
         </text>
-        <combo_box name="sell_to">
+        <combo_box name="sell_to" bottom_delta="-32">
                 <combo_item name="--selectone--">
                         -- Sélectionnez --
                 </combo_item>
@@ -44,14 +47,15 @@
                         Acheteur spécifique :
                 </combo_item>
         </combo_box>
-        <button label="Sélectionner..." name="sell_to_select_agent" />
+        <button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
         <text name="sell_objects_label">
                 Vendez-vous des objets avec ce terrain ?
         </text>
         <text name="sell_objects_text">
-                Les objets transférables se trouvant sur la parcelle changeront de propriétaire.
+                Les objets transférables se trouvant sur la parcelle changeront
+de propriétaire.
         </text>
-        <radio_group name="sell_objects">
+        <radio_group name="sell_objects" right="430" bottom_delta="-54">
                 <radio_item name="no">
                         Non, rester le propriétaire des objets
                 </radio_item>
@@ -59,10 +63,10 @@
                         Oui, vendre les objets avec le terrain
                 </radio_item>
         </radio_group>
-        <button label="Afficher les objets" name="show_objects" />
-        <text name="nag_message_label">
-                Rappel : toute vente est définitive.
+        <button label="Afficher les objets" name="show_objects" right="420" width="120"/>
+        <text name="nag_message_label" bottom_delta="-30">
+                Rappel : Toute vente est définitive.
         </text>
-        <button label="Mettre le terrain en vente" name="sell_btn" />
-        <button label="Annuler" name="cancel_btn" />
+        <button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
+        <button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 41c03df..3018334 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -8,7 +8,7 @@
                         FALSE
                 </combo_item>
         </combo_box>
-        <color_swatch label="Couleur" name="color_swatch" />
+        <color_swatch label="Couleur" name="color_swatch" width="43" />
         <spinner label="x" name="val_spinner_1" />
         <spinner label="x" name="val_spinner_2" />
         <spinner label="x" name="val_spinner_3" />
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml b/linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
index 293e00e..4439745 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="floater_chatterbox">
-        <icon label="Voler" label_selected="Atterrir" name=""
-             tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas." />
+        <icon label="Voler" label_selected="Atterrir" name="" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas."/>
         <panel name="panel_littletoolbar">
-                <button name="chat_btn" tool_tip="Afficher la barre de chat. (Entrée)" />
-                <flyout_button label="Communiquer" name="communicate_btn"
-                     tool_tip="Communiquer avec vos amis et vos groupes." />
-                <button label="Voler" label_selected="Atterrir" name="fly_btn"
-                     tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas." />
+                <button name="chat_btn" tool_tip="Affichez la barre de chat. (Entrée)"/>
+                <flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez avec vos amis et vos groupes."/>
+                <button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas."/>
         </panel>
         <panel name="panel_unfocused_floater">
                 <text name="titlebar_focused">
                         Pas de mise au point
                 </text>
-                <combo_box label="Zone combinée" name="combo_box_1" />
+                <combo_box label="Zone combinée" name="combo_box_1"/>
                 <text_editor name="Chat History Editor">
                         Texte
                 </text_editor>
@@ -24,14 +21,14 @@
                 </text>
                 <tab_container name="chatterbox_tabs">
                         <panel label="Mise au point" name="test_1">
-                                <slider label="Curseur" name="SliderTestName" />
-                                <check_box label="Vrai" name="check_box_test_1" />
-                                <check_box label="Faux" name="check_box_test_2" />
+                                <slider label="Curseur" name="SliderTestName"/>
+                                <check_box label="Vrai" name="check_box_test_1"/>
+                                <check_box label="Faux" name="check_box_test_2"/>
                                 <text_editor name="Chat History Editor">
                                         Texte du chat
                                 </text_editor>
                         </panel>
-                        <panel label="Pas de mise au point" name="test_2" />
+                        <panel label="Pas de mise au point" name="test_2"/>
                 </tab_container>
         </panel>
 </multi_floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 7177ddc..cd30291 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater height="536" name="Snapshot" title="Prévisualiser la photo" width="245">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Prévisualiser la photo" width="247">
         <text name="type_label">
                 Destination de la photo
         </text>
@@ -8,14 +8,14 @@
                         Envoyer par e-mail
                 </radio_item>
                 <radio_item name="texture">
-                        Enregistrer dans votre inventaire (10 $L)
+                        Enregistrer dans votre inventaire (10 L$)
                 </radio_item>
                 <radio_item name="local">
                         Enregistrer sur votre disque dur
                 </radio_item>
         </radio_group>
-        <button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées" />
-        <button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées" />
+        <button label="Plus &gt;&gt;" name="more_btn" tool_tip="Options avancées"/>
+        <button label="&lt;&lt; Moins" name="less_btn" tool_tip="Options avancées"/>
         <text name="type_label2">
                 Taille
         </text>
@@ -93,9 +93,9 @@
                         BMP
                 </combo_item>
         </combo_box>
-        <spinner label="Largeur" label_width="41" name="snapshot_width" width="101" />
-        <spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101" />
-        <slider label="Qualité de l&apos;image" name="image_quality_slider" />
+        <spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
+        <spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
+        <slider label="Qualité de l&apos;image" name="image_quality_slider"/>
         <text name="layer_type_label">
                 Capturer :
         </text>
@@ -113,20 +113,16 @@
         <text name="file_size_label">
                 Taille du fichier : [SIZE] Ko
         </text>
-        <check_box bottom_delta="-20" label="Voir l&apos;interface sur la photo" name="ui_check" />
-        <check_box bottom_delta="-18" label="Voir les éléments HUD sur la photo"
-             name="hud_check" />
-        <check_box bottom_delta="-18" label="Garder ouvert après enregistrement"
-             name="keep_open_check" />
-        <check_box label="Imposer les proportions" name="keep_aspect_check" />
-        <check_box bottom_delta="-18" label="Geler le cadre (prévisualisation &#10;plein écran)"
-             name="freeze_frame_check" />
-        <button bottom_delta="-18" label="Rafraîchir" name="new_snapshot_btn" />
-        <check_box bottom_delta="-30" label="Auto-rafraîchir" name="auto_snapshot_check" />
-        <button label="Enregistrer (10 $L)" name="upload_btn" />
-        <button label="Envoyer" name="send_btn" />
-        <flyout_button label="Enregistrer" name="save_btn"
-             tool_tip="Enregistrer l&apos;image dans un fichier">
+        <check_box label="Voir l&apos;interface sur la photo" name="ui_check"/>
+        <check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
+        <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
+        <check_box label="Imposer les proportions" name="keep_aspect_check"/>
+        <check_box label="Prévisualisation plein écran (geler l&apos;écran)" name="freeze_frame_check"/>
+        <button label="Rafraîchir" name="new_snapshot_btn"/>
+        <check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
+        <button label="Enregistrer (10 L$)" name="upload_btn" width="118"/>
+        <button label="Envoyer" name="send_btn" width="118"/>
+        <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l&apos;image dans un fichier" width="118">
                 <flyout_button_item name="save_item">
                         Enregistrer
                 </flyout_button_item>
@@ -134,7 +130,7 @@
                         Enregistrer sous...
                 </flyout_button_item>
         </flyout_button>
-        <button label="Annuler" name="discard_btn" />
+        <button label="Annuler" name="discard_btn" left="133" width="72" />
         <string name="unknown">
                 inconnu
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index b0d63d4..8c47034 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Name/Description" title="sound.wav">
         <text name="name_label">
                 Nom :
@@ -6,8 +6,8 @@
         <text name="description_label">
                 Description :
         </text>
-        <button label="Annuler" label_selected="Annuler" name="cancel_btn" />
-        <button label="Charger (10 $L)" label_selected="Charger (10 $L)" name="ok_btn" />
+        <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+        <button label="Charger (10 L$)" label_selected="Charger (10 L$)" name="ok_btn"/>
         <text name="text">
                 Débit (kbps) :
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml b/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
index f53f447..e620178 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Téléhub">
+<floater name="telehub" title="Téléhub" min_height="310" height="310" >
         <text name="status_text_connected">
                 Téléhub connecté à l&apos;objet [OBJECT]
         </text>
@@ -9,20 +9,23 @@
         <text name="help_text_connected">
                 Pour supprimer, cliquez sur Déconnecter.
         </text>
-        <text name="help_text_not_connected">
-                Sélectionner l&apos;objet et cliquez sur Connecter le téléhub.
+        <text name="help_text_not_connected" height="38" bottom_delta="-18">
+                Sélectionner l&apos;objet et cliquez sur Connecter
+le téléhub.
         </text>
-        <button label="Connecter le téléhub" name="connect_btn" />
-        <button label="Déconnecter" name="disconnect_btn" />
-        <text name="spawn_points_text">
-                Points d&apos;apparition (positions, pas objets):
+        <button label="Connecter le téléhub" name="connect_btn" width="122"/>
+        <button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+        <text name="spawn_points_text" width="230">
+                Points d&apos;apparition (positions, pas objets) :
         </text>
         <button label="Ajouter point" name="add_spawn_point_btn" />
         <button label="Supprimer point" name="remove_spawn_point_btn" />
         <text name="spawn_point_help">
-                Sélectionnez l&apos;objet et cliquez sur Ajouter pour indiquer la position.
-Vous pourrez ensuite déplacer ou supprimer l&apos;objet.
+                Sélectionnez l&apos;objet et cliquez sur Ajouter pour
+indiquer la position. Vous pourrez ensuite
+déplacer ou supprimer l&apos;objet.
 Les positions sont relatives au centre du téléhub.
-Sélectionnez l&apos;élément dans la liste pour afficher sa position dans le Monde.
+Sélectionnez l&apos;élément dans la liste pour afficher
+sa position dans le Monde.
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 94b4258..2a234a3 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="texture picker" title="Choisir : Texture">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Texture">
         <string name="choose_picture">
                 Cliquez pour sélectionner une image
         </string>
-        <text type="string" length="1" name="Multiple">
+        <text length="1" name="Multiple" type="string">
                 Multiple
         </text>
-        <text type="string" length="1" name="unknown">
+        <text length="1" name="unknown" type="string">
                 Dimensions : [DIMENSIONS]
         </text>
-        <button label="Défaut" label_selected="Défaut" name="Default" />
-        <button label="Aucune" label_selected="Aucune" name="None" />
-        <button label="Vierge" label_selected="Vierge" name="Blank" />
-        <check_box label="Afficher les dossiers" name="show_folders_check" />
-        <search_editor label="Saisissez votre recherche ici" name="inventory search editor" />
+        <button label="Défaut" label_selected="Défaut" name="Default" width="60" />
+        <button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
+        <button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
+        <check_box label="Afficher les dossiers" name="show_folders_check"/>
+        <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
         <check_box label="Appliquer immédiatement" name="apply_immediate_check" />
-        <button label="" label_selected="" name="Pipette" />
-        <button label="Annuler" label_selected="Annuler" name="Cancel" />
-        <button label="Sélectionner" label_selected="Sélectionner" name="Select" />
+        <button label="" label_selected="" name="Pipette" bottom="-240" />
+        <button label="Annuler" label_selected="Annuler" name="Cancel"/>
+        <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
         <string name="pick title">
                 Choisir :
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
index 0fb1681..b4e63a1 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,45 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" title="">
-        <button label="" label_selected="" name="button focus" tool_tip="Mise au point" />
+        <button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
         <text name="tool label">
-                Faire le point
+                Mise au point
         </text>
-        <button label="" label_selected="" name="button move" tool_tip="Déplacer" />
+        <button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
         <text name="tool label2">
                 Se déplacer
         </text>
-        <button label="" label_selected="" name="button edit" tool_tip="Modifier" />
+        <button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
         <text name="tool label3">
                 Edition
         </text>
-        <button label="" label_selected="" name="button create" tool_tip="Créer" />
+        <button label="" label_selected="" name="button create" tool_tip="Créer"/>
         <text name="tool label4">
                 Créer
         </text>
-        <button label="" label_selected="" name="button land" tool_tip="Terrain" />
+        <button label="" label_selected="" name="button land" tool_tip="Terrain"/>
         <text name="tool label5">
                 Terrain
         </text>
-        <check_box label="Zoom" name="radio zoom" />
-        <check_box label="Orbite (Ctrl)" name="radio orbit" />
-        <check_box label="Panoramique (Ctrl-Maj)" name="radio pan" />
-        <check_box label="Déplacer" name="radio move" />
-        <check_box label="Orbite (Ctrl)" name="radio lift" />
-        <check_box label="Faire tourner (Ctrl-Maj)" name="radio spin" />
-        <check_box label="Position" name="radio position" />
-        <check_box label="Faire pivoter (Ctrl)" name="radio rotate" />
-        <check_box label="Étirer (Ctrl-Maj)" name="radio stretch" />
-        <check_box label="Sélectionner une texture" name="radio select face" />
-        <check_box label="Modifier les parties liées" name="checkbox edit linked parts" />
-        <check_box label="Utiliser la grille" name="checkbox snap to grid" />
-        <button label="Options..." label_selected="Options..." name="Options..." />
-        <check_box label="Étirer les deux côtés" name="checkbox uniform" />
-        <check_box label="Étirer les textures" name="checkbox stretch textures" />
+        <check_box label="Zoom" name="radio zoom"/>
+        <check_box label="Orbite (Ctrl)" name="radio orbit"/>
+        <check_box label="Panoramique (Ctrl-Maj)" name="radio pan"/>
+        <check_box label="Déplacer" name="radio move"/>
+        <check_box label="Orbite (Ctrl)" name="radio lift"/>
+        <check_box label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
+        <check_box label="Positionner" name="radio position"/>
+        <check_box label="Pivoter (Ctrl)" name="radio rotate"/>
+        <check_box label="Étirer (Ctrl-Maj)" name="radio stretch"/>
+        <check_box label="Sélectionner une face" name="radio select face"/>
+        <check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
+        <check_box label="Utiliser la grille" name="checkbox snap to grid"/>
+        <button label="Options..." label_selected="Options..." name="Options..."/>
+        <check_box label="Étirer les deux côtés" name="checkbox uniform"/>
+        <check_box label="Étirer les textures" name="checkbox stretch textures"/>
         <text name="text ruler mode">
-                Règle :
+                Axe :
         </text>
         <text name="text status">
-                Faîtes glisser pour déplacer, Maj-faire glisser pour copier.
+                Faîtes glisser pour déplacer, Maj-faire glisser pour
+                copier.
         </text>
         <combo_box name="combobox grid mode">
                 <combo_item name="World">
@@ -52,32 +53,32 @@
                         Référence
                 </combo_item>
         </combo_box>
-        <button label="" label_selected="" name="ToolCube" tool_tip="Cube" />
-        <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
-        <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
-        <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre" />
-        <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre" />
-        <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre" />
-        <button label="" label_selected="" name="ToolCone" tool_tip="Cône" />
-        <button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône" />
-        <button label="" label_selected="" name="ToolSphere" tool_tip="Sphère" />
-        <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère" />
-        <check_box label="Copier la sélection" name="checkbox copy selection" />
-        <button label="" label_selected="" name="ToolTorus" tool_tip="Tore" />
-        <button label="" label_selected="" name="ToolTube" tool_tip="Tube" />
-        <button label="" label_selected="" name="ToolRing" tool_tip="Anneau" />
-        <button label="" label_selected="" name="ToolTree" tool_tip="Arbre" />
-        <button label="" label_selected="" name="ToolGrass" tool_tip="Herbe" />
-        <check_box label="Maintenir l&apos;outil sélectionné" name="checkbox sticky" />
-        <check_box label="Centrer la copie" name="checkbox copy centers" />
-        <check_box label="Faire pivoter la copie" name="checkbox copy rotates" />
-        <check_box label="Sélectionner le terrain" name="radio select land" />
-        <check_box label="Aplatir le terrain" name="radio flatten" />
-        <check_box label="Surélever le terrain" name="radio raise" />
-        <check_box label="Abaisser le terrain" name="radio lower" />
-        <check_box label="Lisser le terrain" name="radio smooth" />
-        <check_box label="Bosseler le terrain" name="radio noise" />
-        <check_box label="Rétablir le terrain" name="radio revert" />
+        <button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
+        <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme"/>
+        <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+        <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre"/>
+        <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre"/>
+        <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre"/>
+        <button label="" label_selected="" name="ToolCone" tool_tip="Cône"/>
+        <button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône"/>
+        <button label="" label_selected="" name="ToolSphere" tool_tip="Sphère"/>
+        <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère"/>
+        <check_box label="Copier la sélection" name="checkbox copy selection"/>
+        <button label="" label_selected="" name="ToolTorus" tool_tip="Tore"/>
+        <button label="" label_selected="" name="ToolTube" tool_tip="Tube"/>
+        <button label="" label_selected="" name="ToolRing" tool_tip="Anneau"/>
+        <button label="" label_selected="" name="ToolTree" tool_tip="Arbre"/>
+        <button label="" label_selected="" name="ToolGrass" tool_tip="Herbe"/>
+        <check_box label="Maintenir l&apos;outil sélectionné" name="checkbox sticky"/>
+        <check_box label="Centrer la copie" name="checkbox copy centers"/>
+        <check_box label="Pivoter la copie" name="checkbox copy rotates"/>
+        <check_box label="Sélectionner le terrain" name="radio select land"/>
+        <check_box label="Aplatir le terrain" name="radio flatten"/>
+        <check_box label="Élever le terrain" name="radio raise"/>
+        <check_box label="Abaisser le terrain" name="radio lower"/>
+        <check_box label="Lisser le terrain" name="radio smooth"/>
+        <check_box label="Bosseler le terrain" name="radio noise"/>
+        <check_box label="Annuler modification" name="radio revert"/>
         <combo_box name="combobox brush size">
                 <combo_item name="Small">
                         Petit
@@ -92,12 +93,10 @@
         <text name="Strength:">
                 Force :
         </text>
-        <button label="Appliquer à la sélection" label_selected="Appliquer à la sélection"
-             name="button apply to selection"
-             tool_tip="Modifier le terrain sélectionné" />
-        <check_box label="Afficher les propriétaires" name="checkbox show owners" />
-        <button label="Plus &gt;&gt;" name="button more" tool_tip="Options avancées" />
-        <button label="&lt;&lt; Moins" name="button less" tool_tip="Options avancées" />
+        <button label="Appliquer à la sélection" label_selected="Appliquer à la sélection" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
+        <check_box label="Afficher les limites" name="checkbox show owners"/>
+        <button label="Plus &gt;&gt;" name="button more" tool_tip="Options avancées"/>
+        <button label="&lt;&lt; Moins" name="button less" tool_tip="Options avancées"/>
         <tab_container name="Object Info Tabs">
                 <panel label="Général" name="General">
                         <text name="Name:">
@@ -112,21 +111,21 @@
                         <text name="Creator Name">
                                 Thrax Linden
                         </text>
-                        <button label="Profil..." label_selected="Profil..." name="button creator profile" />
+                        <button label="Profil..." label_selected="Profil..." name="button creator profile"/>
                         <text name="Owner:">
                                 Propriétaire :
                         </text>
                         <text name="Owner Name">
                                 Thrax Linden
                         </text>
-                        <button label="Profil..." label_selected="Profil..." name="button owner profile" />
+                        <button label="Profil..." label_selected="Profil..." name="button owner profile"/>
                         <text name="Group:">
                                 Groupe :
                         </text>
                         <text name="Group Name Proxy">
-                                Les Linden
+                                Les Lindens
                         </text>
-                        <button label="Définir..." label_selected="Définir..." name="button set group" />
+                        <button label="Définir..." label_selected="Définir..." name="button set group"/>
                         <text name="prim info">
                                 1 objet, 1 prim
                         </text>
@@ -136,34 +135,30 @@
                         <text name="perm_modify">
                                 Vous pouvez modifier cet objet.
                         </text>
-                        <check_box label="Partager avec le groupe" name="checkbox share with group"
-                             tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer." />
+                        <check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer."/>
                         <text name="text deed continued">
                                 Transférer...
                         </text>
                         <text name="text deed">
                                 Transférer
                         </text>
-                        <button label="Transférer..." label_selected="Transférer..." name="button deed"
-                             tool_tip="Les objets partagés par un groupe peuvent être transférés par un officier." />
-                        <check_box label="Autoriser tout le monde à déplacer"
-                             name="checkbox allow everyone move" />
-                        <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy" />
-                        <check_box label="Afficher dans la recherche" name="search_check"
-                             tool_tip="Afficher l&apos;objet dans les résultats de recherche" />
-                        <check_box label="À vendre" name="checkbox for sale" />
+                        <button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
+                        <check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
+                        <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
+                        <check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
+                        <check_box label="À vendre" name="checkbox for sale"/>
                         <text name="Price:  L$">
-                                Prix :  L$
+                                Prix : L$
                         </text>
                         <text name="Cost">
-                                Prix :  $L
+                                Prix : L$
                         </text>
                         <radio_group name="sale type">
                                 <radio_item name="Original">
                                         Original
                                 </radio_item>
                                 <radio_item name="Copy">
-                                        Copier
+                                        Copie
                                 </radio_item>
                                 <radio_item name="Contents">
                                         Contenus
@@ -172,18 +167,18 @@
                         <text name="Next owner can:">
                                 Le prochain propriétaire pourra :
                         </text>
-                        <check_box label="Modifier" name="checkbox next owner can modify" />
-                        <check_box label="Copier" name="checkbox next owner can copy" />
-                        <check_box label="Revendre/Donner" name="checkbox next owner can transfer" />
+                        <check_box label="Modifier" name="checkbox next owner can modify"/>
+                        <check_box label="Copier" name="checkbox next owner can copy" left_delta="66" />
+                        <check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
                         <text name="label click action">
-                                Action clic-gauche :
+                                Action du clic-gauche :
                         </text>
-                        <combo_box name="clickaction">
+                        <combo_box name="clickaction" width="178">
                                 <combo_item name="Touch/grab(default)">
                                         Toucher/attraper (défaut)
                                 </combo_item>
                                 <combo_item name="Sitonobject">
-                                        M&apos;asseoir sur l&apos;objet
+                                        S&apos;asseoir sur l&apos;objet
                                 </combo_item>
                                 <combo_item name="Buyobject">
                                         Acheter l&apos;objet
@@ -195,10 +190,10 @@
                                         Ouvrir
                                 </combo_item>
                                 <combo_item name="Play">
-                                        Jouer le média sur la parcelle
+                                        Jouer le média de la parcelle
                                 </combo_item>
                                 <combo_item name="Opemmedia">
-                                        Ouvrir le média sur la parcelle
+                                        Ouvrir le média de la parcelle
                                 </combo_item>
                         </combo_box>
                         <text name="B:">
@@ -232,16 +227,16 @@
                                 Vous ne pouvez pas modifier ces objets.
                         </text>
                         <text name="text modify warning">
-                                Pour définir les permissions, vous devez sélectionner l&apos;objet en entier.
+                                Sélectionnez l&apos;objet en entier.
                         </text>
                         <string name="Cost Default">
-                                Prix :           $L
+                                Prix :           L$
                         </string>
                         <string name="Cost Total">
-                                Prix total :  $L
+                                Prix total :  L$
                         </string>
                         <string name="Cost Per Unit">
-                                Prix par :     $L
+                                Prix par :     L$
                         </string>
                         <string name="Cost Mixed">
                                 Prix mixte
@@ -252,37 +247,33 @@
                 </panel>
                 <panel label="Objet" name="Object">
                         <text name="select_single">
-                                Sélectionnez un seul prim pour modifier les paramètres.
+                                Sélectionnez un prim pour modifier les paramètres.
                         </text>
                         <text name="edit_object">
                                 Modifier les paramètres de l&apos;objet :
                         </text>
-                        <check_box label="Verrouillé" name="checkbox locked"
-                             tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires." />
-                        <check_box label="Physique" name="Physical Checkbox Ctrl"
-                             tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité" />
-                        <check_box label="Temporaire" name="Temporary Checkbox Ctrl"
-                             tool_tip="L&apos;objet est supprimé 1 mn après sa création." />
-                        <check_box label="Fantôme" name="Phantom Checkbox Ctrl"
-                             tool_tip="Permet à l&apos;objet de ne pas entrer en collision avec d&apos;autres objets ou avatars." />
+                        <check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
+                        <check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l&apos;objet d&apos;être poussé et affecté par la gravité"/>
+                        <check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L&apos;objet est supprimé 1 mn après sa création."/>
+                        <check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l&apos;objet de ne pas entrer en collision avec d&apos;autres objets ou avatars."/>
                         <text name="label position">
                                 Position (mètres)
                         </text>
-                        <spinner label="X" name="Pos X" />
-                        <spinner label="Y" name="Pos Y" />
-                        <spinner label="Z" name="Pos Z" />
+                        <spinner label="X" name="Pos X"/>
+                        <spinner label="Y" name="Pos Y"/>
+                        <spinner label="Z" name="Pos Z"/>
                         <text name="label size">
                                 Taille (mètres)
                         </text>
-                        <spinner label="X" name="Scale X" />
-                        <spinner label="Y" name="Scale Y" />
-                        <spinner label="Z" name="Scale Z" />
+                        <spinner label="X" name="Scale X"/>
+                        <spinner label="Y" name="Scale Y"/>
+                        <spinner label="Z" name="Scale Z"/>
                         <text name="label rotation">
                                 Rotation (degrés)
                         </text>
-                        <spinner label="X" name="Rot X" />
-                        <spinner label="Y" name="Rot Y" />
-                        <spinner label="Z" name="Rot Z" />
+                        <spinner label="X" name="Rot X"/>
+                        <spinner label="Y" name="Rot Y"/>
+                        <spinner label="Z" name="Rot Z"/>
                         <text name="label material">
                                 Matériau
                         </text>
@@ -335,19 +326,19 @@
                                         Anneau
                                 </combo_item>
                                 <combo_item name="Sculpted">
-                                        Sculpté
+                                        Sculptie
                                 </combo_item>
                         </combo_box>
                         <text name="text cut">
-                                Début et fin de la découpe du tracé
+                                Début et fin de découpe du tracé
                         </text>
-                        <spinner label="D" name="cut begin" />
-                        <spinner label="F" name="cut end" />
+                        <spinner label="D" name="cut begin"/>
+                        <spinner label="F" name="cut end"/>
                         <text name="text hollow">
                                 Creux
                         </text>
                         <text name="text skew">
-                                Biaiser
+                                Biais
                         </text>
                         <text name="Hollow Shape">
                                 Forme du creux
@@ -367,50 +358,47 @@
                                 </combo_item>
                         </combo_box>
                         <text name="text twist">
-                                Début et fin de la vrille
+                                Début et fin de vrille
                         </text>
-                        <spinner label="D" name="Twist Begin" />
-                        <spinner label="F" name="Twist End" />
+                        <spinner label="D" name="Twist Begin"/>
+                        <spinner label="F" name="Twist End"/>
                         <text name="scale_taper">
-                                Biseauter
+                                Biseautage
                         </text>
                         <text name="scale_hole">
                                 Taille du trou
                         </text>
-                        <spinner label="X" name="Taper Scale X" />
-                        <spinner label="Y" name="Taper Scale Y" />
+                        <spinner label="X" name="Taper Scale X"/>
+                        <spinner label="Y" name="Taper Scale Y"/>
                         <text name="text topshear">
                                 Inclinaison
                         </text>
-                        <spinner label="X" name="Shear X" />
-                        <spinner label="Y" name="Shear Y" />
+                        <spinner label="X" name="Shear X"/>
+                        <spinner label="Y" name="Shear Y"/>
                         <text name="advanced_cut">
-                                Début et fin de la découpe du profilé
+                                Début et fin de découpe du profilé
                         </text>
                         <text name="advanced_dimple">
                                 Début et fin du creux
                         </text>
-                        <spinner label="D" name="Path Limit Begin" />
-                        <spinner label="F" name="Path Limit End" />
+                        <spinner label="D" name="Path Limit Begin"/>
+                        <spinner label="F" name="Path Limit End"/>
                         <text name="text taper2">
-                                Biseauter
+                                Biseautage
                         </text>
-                        <spinner label="X" name="Taper X" />
-                        <spinner label="Y" name="Taper Y" />
+                        <spinner label="X" name="Taper X"/>
+                        <spinner label="Y" name="Taper Y"/>
                         <text name="text radius delta">
                                 Rayon
                         </text>
                         <text name="text revolutions">
                                 Révolutions
                         </text>
-                        <texture_picker label="Sculpter la texture" name="sculpt texture control"
-                             tool_tip="Cliquez pour sélectionner une image" />
-                        <check_box label="Mirroir" name="sculpt mirror control"
-                             tool_tip="Retourne le prim sculpté le long de l&apos;axe des X." />
-                        <check_box label="A l&apos;envers" name="sculpt invert control"
-                             tool_tip="Inverse les valeurs normales d&apos;un prim sculpté et le fait apparaître à l&apos;envers." />
+                        <texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+                        <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l&apos;axe des X."/>
+                        <check_box label="A l&apos;envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d&apos;un sculptie et le fait apparaître à l&apos;envers."/>
                         <text name="label sculpt type">
-                                Type de couture
+                                Type de raccord
                         </text>
                         <combo_box name="sculpt type control">
                                 <combo_item name="None">
@@ -432,44 +420,39 @@
                 </panel>
                 <panel label="Attributs" name="Features">
                         <text name="select_single">
-                                Sélectionnez un seul prim pour modifier les attributs.
+                                Sélectionnez un prim pour modifier les attributs.
                         </text>
                         <text name="edit_object">
                                 Modifier les attributs de l&apos;objet :
                         </text>
-                        <check_box label="Tracé flexible" name="Flexible1D Checkbox Ctrl"
-                             tool_tip="Donne à l&apos;objet de la souplesse sur l&apos;axe des Z.  (côté client uniquement)" />
-                        <spinner label="Souplesse" name="FlexNumSections" />
-                        <spinner label="Gravité" name="FlexGravity" />
-                        <spinner label="Faire glisser" name="FlexFriction" />
-                        <spinner label="Vent" name="FlexWind" />
-                        <spinner label="Tension" name="FlexTension" />
-                        <spinner label="Force X" name="FlexForceX" />
-                        <spinner label="Force Y" name="FlexForceY" />
-                        <spinner label="Force Z" name="FlexForceZ" />
-                        <check_box label="Lumière" name="Light Checkbox Ctrl"
-                             tool_tip="Permet aux objets d&apos;émettre de la lumière" />
+                        <check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l&apos;objet de la souplesse sur l&apos;axe des Z (côté client uniquement)."/>
+                        <spinner label="Souplesse" name="FlexNumSections"/>
+                        <spinner label="Gravité" name="FlexGravity"/>
+                        <spinner label="Élasticité" name="FlexFriction"/>
+                        <spinner label="Vent" name="FlexWind"/>
+                        <spinner label="Tension" name="FlexTension"/>
+                        <spinner label="Force X" name="FlexForceX"/>
+                        <spinner label="Force Y" name="FlexForceY"/>
+                        <spinner label="Force Z" name="FlexForceZ"/>
+                        <check_box label="Lumière" name="Light Checkbox Ctrl" tool_tip="Permet aux objets d&apos;émettre de la lumière"/>
                         <text name="label color">
                                 Couleur
                         </text>
-                        <color_swatch label="" name="colorswatch"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
-                        <spinner label="Intensité" name="Light Intensity" />
-                        <spinner label="Rayon" name="Light Radius" />
-                        <spinner label="Atténuation" name="Light Falloff" />
+                        <color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+                        <spinner label="Intensité" name="Light Intensity"/>
+                        <spinner label="Portée" name="Light Radius"/>
+                        <spinner label="Atténuation" name="Light Falloff"/>
                 </panel>
                 <panel label="Texture" name="Texture">
-                        <texture_picker label="Texture" name="texture control"
-                             tool_tip="Cliquez pour sélectionner une image" />
-                        <color_swatch label="Couleur" name="colorswatch"
-                             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+                        <texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
+                        <color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
                         <text name="color trans" width="88">
-                                Transparence (%)
+                                Transparence
                         </text>
                         <text name="glow label">
                                 Rayonnement
                         </text>
-                        <check_box label="Luminosité &#10;maximale" name="checkbox fullbright" />
+                        <check_box label="Lumineux" name="checkbox fullbright"/>
                         <text name="tex gen">
                                 Application
                         </text>
@@ -478,7 +461,7 @@
                                         Défaut
                                 </combo_item>
                                 <combo_item name="Planar">
-                                        Planaire
+                                        Planar
                                 </combo_item>
                         </combo_box>
                         <text name="label shininess">
@@ -512,108 +495,106 @@
                                         Obscurité
                                 </combo_item>
                                 <combo_item name="woodgrain">
-                                        aggloméré
+                                        Aggloméré
                                 </combo_item>
                                 <combo_item name="bark">
-                                        écorce
+                                        Écorce
                                 </combo_item>
                                 <combo_item name="bricks">
-                                        briques
+                                        Briques
                                 </combo_item>
                                 <combo_item name="checker">
-                                        damier
+                                        Damier
                                 </combo_item>
                                 <combo_item name="concrete">
-                                        béton
+                                        Béton
                                 </combo_item>
                                 <combo_item name="crustytile">
-                                        carrelage
+                                        Carrelage
                                 </combo_item>
                                 <combo_item name="cutstone">
-                                        pierre de taille
+                                        Pierre de taille
                                 </combo_item>
                                 <combo_item name="discs">
-                                        rondelles
+                                        Disques
                                 </combo_item>
                                 <combo_item name="gravel">
-                                        gravier
+                                        Gravier
                                 </combo_item>
                                 <combo_item name="petridish">
-                                        boîte de Petri
+                                        Boîte de Petri
                                 </combo_item>
                                 <combo_item name="siding">
-                                        bardage
+                                        Lattes
                                 </combo_item>
                                 <combo_item name="stonetile">
-                                        carreau
+                                        Carreaux
                                 </combo_item>
                                 <combo_item name="stucco">
-                                        stuc
+                                        Stuc
                                 </combo_item>
                                 <combo_item name="suction">
-                                        ventouses
+                                        Ventouses
                                 </combo_item>
                                 <combo_item name="weave">
-                                        tissage
+                                        Tissage
                                 </combo_item>
                         </combo_box>
                         <text name="tex scale">
                                 Répétitions par face
                         </text>
-                        <spinner label="Horizontal (U)" name="TexScaleU" />
-                        <check_box label="Retourner" name="checkbox flip s" />
-                        <spinner label="Vertical (V)" name="TexScaleV" />
-                        <check_box label="Retourner" name="checkbox flip t" />
+                        <spinner label="Horizontal (U)" name="TexScaleU"/>
+                        <check_box label="Inverser" name="checkbox flip s"/>
+                        <spinner label="Vertical (V)" name="TexScaleV"/>
+                        <check_box label="Inverser" name="checkbox flip t"/>
                         <text name="tex rotate">
                                 Rotation (degrés)
                         </text>
-                        <text name="string repeats per meter">
+                        <spinner left="122" name="TexRot" width="58" />
+                        <string name="string repeats per meter">
                                 Répétitions au mètre
-                        </text>
-                        <text name="string repeats per face">
+                        </string>
+                        <string name="string repeats per face">
                                 Répétitions par face
-                        </text>
-                        <text name="rpt">
+                        </string>
+                        <text name="rpt" width="160">
                                 Répétitions au mètre
                         </text>
-                        <button label="Appliquer" label_selected="Appliquer" name="button apply" />
+                        <spinner left="122" name="rptctrl" width="58" />
+                        <button label="Appliquer" label_selected="Appliquer" name="button apply" left_delta="68" width="75"/>
                         <text name="tex offset">
-                                Décaler
+                                Décalage
                         </text>
-                        <spinner label="Horizontal (U)" name="TexOffsetU" />
-                        <spinner label="Vertical (V)" name="TexOffsetV" />
+                        <spinner label="Horizontal (U)" name="TexOffsetU"/>
+                        <spinner label="Vertical (V)" name="TexOffsetV"/>
                         <text name="textbox autofix">
                                 Ajuster la texture du média
 (chargement préalable)
                         </text>
-                        <button label="Ajuster" label_selected="Ajuster" name="button align" />
+                        <button left="150" label="Ajuster" label_selected="Ajuster" name="button align"/>
                 </panel>
                 <panel label="Contenu" name="Contents">
-                        <button label="Nouveau script..." label_selected="Nouveau script..."
-                             name="button new script" />
+                        <button label="Nouveau script..." label_selected="Nouveau script..." name="button new script"/>
                 </panel>
         </tab_container>
         <panel name="land info panel">
                 <text name="label_area_price">
-                        Prix : [PRICE] $L pour [AREA] m².
+                        Prix : [PRICE] L$ pour [AREA] m².
                 </text>
                 <text name="label_area">
                         Surface : [AREA] m²
                 </text>
-                <button label="Acheter le terrain..." label_selected="Acheter le terrain..."
-                     name="button buy land" width="132" />
-                <button label="Céder le terrain..." label_selected="Céder le terrain..."
-                     name="button abandon land" width="132" />
-                <button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132" />
-                <button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132" />
-                <button label="À propos du terrain..." label_selected="À propos du terrain..."
-                     name="button about land"  width="132" />
+                <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="132"/>
+                <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="132"/>
+                <button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132"/>
+                <button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132"/>
+                <button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="132"/>
         </panel>
         <string name="status_rotate">
                 Pour faire tourner l&apos;objet, faîtes glisser les bandes de couleur.
         </string>
         <string name="status_scale">
-                Pour étirer le côté sélectionné, cliquez et faîtes glisser
+                Pour étirer le côté sélectionné, cliquez et faites glisser
         </string>
         <string name="status_move">
                 Faîtes glisser pour déplacer, Maj-faire glisser pour copier.
@@ -622,7 +603,7 @@
                 Cliquez et maintenez pour modifier le terrain
         </string>
         <string name="status_camera">
-                Cliquez et faîtes glisser pour changer l&apos;affichage
+                Cliquez et faites glisser pour changer l&apos;affichage
         </string>
         <string name="status_grab">
                 Faîtes glisser pour déplacer les objets, appuyez sur Ctrl pour soulever, Crtl-Maj pour faire tourner
@@ -631,10 +612,10 @@
                 Cliquez dans le Monde pour créer, Maj-clic pour sélectionner
         </string>
         <string name="status_selectland">
-                Cliquez et faîtes glisser pour sélectionner le terrain
+                Cliquez et faites glisser pour sélectionner le terrain
         </string>
         <string name="grid_screen_text">
-                Ecran
+                Écran
         </string>
         <string name="grid_local_text">
                 Local
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index acf84c4..3be281b 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -1,51 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="en cours de chargement...">
         <text name="title_text">
-                Chargement en cours...
+                Chargement...
         </text>
         <scroll_list name="objects_list">
-                <column label="Score" name="score" />
-                <column label="Nom" name="name" />
-                <column label="Propriétaire" name="owner" />
-                <column label="Emplacement" name="location" />
-                <column label="Heure" name="time" />
+                <column label="Score" name="score"/>
+                <column label="Nom" name="name"/>
+                <column label="Propriétaire" name="owner"/>
+                <column label="Lieu" name="location"/>
+                <column label="Heure" name="time"/>
+                <column label="Heure Mono" name="mono_time"/>
         </scroll_list>
         <text name="id_text">
                 ID de l&apos;objet :
         </text>
-        <button label="Afficher balise" name="show_beacon_btn" />
+        <button label="Afficher balise" name="show_beacon_btn"/>
         <text name="obj_name_text">
                 Nom :
         </text>
-        <button label="Filtre" name="filter_object_btn" />
+        <button label="Filtre" name="filter_object_btn"/>
         <text name="owner_name_text">
                 Nom :
         </text>
-        <button label="Filtre" name="filter_owner_btn" />
-        <button label="Renvoyer" name="return_selected_btn" />
-        <button label="Renvoyer tous" name="return_all_btn" />
-        <button label="Désactiver" name="disable_selected_btn" />
-        <button label="Désactiver tous" name="disable_all_btn" />
-        <button label="Rafraîchir" name="refresh_btn" />
-        <text name="top_scripts_title">
+        <button label="Filtre" name="filter_owner_btn"/>
+        <button label="Renvoyer" name="return_selected_btn"/>
+        <button label="Renvoyer tous" name="return_all_btn"/>
+        <button label="Désactiver" name="disable_selected_btn"/>
+        <button label="Désactiver tous" name="disable_all_btn"/>
+        <button label="Rafraîchir" name="refresh_btn"/>
+        <string name="top_scripts_title">
                 Scripts principaux
-        </text>
-        <text name="top_scripts_text">
+        </string>
+        <string name="top_scripts_text">
                 [COUNT] scripts prenant un total de [TIME] ms
-        </text>
-        <text name="scripts_score_label">
+        </string>
+        <string name="scripts_score_label">
                 Heure
-        </text>
-        <text name="top_colliders_title">
+        </string>
+        <string name="scripts_mono_time_label">
+                Heure Mono
+        </string>
+        <string name="top_colliders_title">
                 Objets souvent responsables de collision
-        </text>
-        <text name="top_colliders_text">
-                [COUNT] objets le plus souvent responsables de collisions
-        </text>
-        <text name="colliders_score_label">
+        </string>
+        <string name="top_colliders_text">
+                [COUNT] objets souvent responsables de collisions
+        </string>
+        <string name="colliders_score_label">
                 Score
-        </text>
-        <text name="none_descriptor">
+        </string>
+        <string name="none_descriptor">
                 Aucun résultat.
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index b8de210..6a90731 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -3,10 +3,11 @@
         <text name="media_label">
                 URL du média :
         </text>
+        <combo_box left="100" name="media_entry" width="360" />
         <button label="OK" name="ok_btn" />
         <button label="Annuler" name="cancel_btn" />
         <button label="Effacer" name="clear_btn" />
         <text name="loading_label">
-                Chargement en cours...
+                Chargement...
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index bc3fda3..d1a62dc 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Éditeur de ciel avancé">
+<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
         <text name="KeyFramePresetsText">
                 Préréglages ciel :
         </text>
@@ -8,7 +8,7 @@
         <button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
         <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
              name="WLDayCycleMenuButton" width="150" left_delta="95" />
-        <tab_container name="WindLight Tabs">
+        <tab_container name="WindLight Tabs" width="706">
                 <panel label="Atmosphère" name="Atmosphere">
                         <text name="BHText">
                                 Bleu de l&apos;horizon
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml b/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 99ef292..6c5854d 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,107 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="worldmap" title="Carte du monde">
         <tab_container name="maptab" width="955">
-                <panel label="Objets" name="objects_mapview" width="953" />
-                <panel label="Terrain" name="terrain_mapview" width="953" />
+                <panel label="Objets" name="objects_mapview" width="953"/>
+                <panel label="Terrain" name="terrain_mapview" width="953"/>
         </tab_container>
-        <icon left="973" name="square" />
+        <icon left="973" name="square"/>
         <text name="land_for_sale_label">
                 Terrain à vendre
         </text>
-        <icon left="1113" name="square2" />
+        <icon left="1113" name="square2"/>
         <text name="auction_label">
-                Enchère
+                Terrain aux enchères
         </text>
-        <icon left="973" name="self" />
+        <icon left="973" name="self"/>
         <text name="you_label">
                 Vous
         </text>
-        <icon left="1033" name="home" />
+        <icon left="1033" name="home"/>
         <text name="home_label">
                 Domicile
         </text>
-        <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home"
-             tool_tip="Vous téléporte à votre domicile" />
-        <icon left="977" name="person" />
+        <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+        <icon left="977" name="person"/>
         <text name="person_label">
-                Personne
+                Résident
         </text>
-        <icon left="973" name="infohub" />
-        <check_box label=" " left_delta="60" name="people_chk" />
+        <icon left="973" name="infohub"/>
+        <check_box label=" " left_delta="60" name="people_chk"/>
         <text name="infohub_label">
                 Infohub
         </text>
-        <icon left="973" name="telehub" />
-        <check_box label=" " left_delta="60" name="infohub_chk" />
+        <icon left="973" name="telehub"/>
+        <check_box label=" " left_delta="60" name="infohub_chk"/>
         <text name="telehub_label">
                 Téléhub
         </text>
-        <check_box label=" " left_delta="60" name="telehubchk" />
-        <icon left="1113" name="landforsale" />
+        <check_box label=" " left_delta="60" name="telehubchk"/>
+        <icon left="1113" name="landforsale"/>
         <text name="land_for_sale_label2">
                 Terrain à vendre
         </text>
-        <check_box label=" " name="land_for_sale_chk" />
-        <icon left="1113" name="event" />
+        <check_box label=" " name="land_for_sale_chk"/>
+        <icon left="1113" name="event"/>
         <text name="events_label">
                 Événements
         </text>
-        <check_box label=" " name="event_chk" />
-        <icon left="1113" name="events_mature_icon" />
+        <check_box label=" " name="event_chk"/>
+        <icon left="1113" name="events_mature_icon"/>
         <text name="events_mature_label">
                 Événements (A)
         </text>
-        <check_box label=" " name="event_mature_chk" />
-        <icon left="973" name="avatar_icon" />
-        <combo_box label="Amis connectés" name="friend combo"
-             tool_tip="Ami à afficher sur la carte" width="232">
+        <check_box label=" " name="event_mature_chk"/>
+        <icon left="973" name="avatar_icon"/>
+        <combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
                 <combo_item name="none_selected">
                         Amis connectés
                 </combo_item>
         </combo_box>
-        <icon left="973" name="landmark_icon" />
-        <combo_box label="Repères" name="landmark combo"
-             tool_tip="Repère à afficher sur la carte" width="232">
+        <icon left="973" name="landmark_icon"/>
+        <combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
                 <combo_item name="none_selected">
                         Repères
                 </combo_item>
         </combo_box>
-        <icon left="973" name="location_icon" />
-        <line_editor label="Rechercher par nom de région" name="location"
-             tool_tip="Saisissez le nom d&apos;une région" width="155">
+        <icon left="973" name="location_icon"/>
+        <line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155">
                 Recherche par nom de région
         </line_editor>
-        <button label="Rechercher" label_selected="&gt;" left_delta="160" name="DoSearch"
-             tool_tip="Rechercher dans la région" width="75" />
+        <button label="Rechercher" label_selected="&gt;" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
         <text left="973" name="search_label">
                 Résultats de la recherche :
         </text>
         <scroll_list left="973" name="search_results" width="252">
-                <column label="" name="icon" />
-                <column label="" name="sim_name" />
+                <column label="" name="icon"/>
+                <column label="" name="sim_name"/>
         </scroll_list>
         <text left="973" name="location_label">
                 Emplacement :
         </text>
-        <spinner left="993" name="spin x"
-             tool_tip="Coordonnées des X du lieu à afficher sur la carte" />
-        <spinner left="993" name="spin y"
-             tool_tip="Coordonnées des Y du lieu à afficher sur la carte" />
-        <spinner left="993" name="spin z"
-             tool_tip="Coordonnées des Z du lieu à afficher sur la carte" />
-        <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport"
-             tool_tip="Téléporter à l&apos;endroit sélectionné" />
-        <button label="Afficher la destination" label_selected="Afficher la destination"
-             name="Show Destination"
-             tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165" />
-        <button label="Effacer" label_selected="Effacer" left="-270" name="Clear"
-             tool_tip="Arrêter de suivre" />
-        <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement"
-             name="Show My Location"
-             tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar"
-             width="165" />
-        <button label="Copier la SLURL sur le presse-papier" left="-270" name="copy_slurl"
-             tool_tip="Copier l&apos;emplacement actuel comme SLURL pour l&apos;utiliser sur le Web."
-             width="262" />
-        <slider label="Zoom" left="-270" name="zoom slider" />
+        <spinner left="993" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
+        <spinner left="993" name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
+        <spinner left="993" name="spin z" tool_tip="Coordonnées des Z du lieu à afficher sur la carte"/>
+        <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
+        <button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/>
+        <button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
+        <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de votre avatar" width="165"/>
+        <button label="Copier la SLURL dans le presse-papier" left="-270" name="copy_slurl" tool_tip="Copier l&apos;emplacement actuel comme SLURL pour l&apos;utiliser sur le Web." width="262"/>
+        <slider label="Zoom" left="-270" name="zoom slider"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml b/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
index e6db0c5..d1cc928 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,70 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-        <menu_item_call label="Acheter" name="Task Buy" />
-        <menu_item_call label="Ouvrir" name="Task Open" />
-        <menu_item_call label="Jouer" name="Task Play" />
-        <menu_item_call label="Propriétés" name="Task Properties" />
-        <menu_item_call label="Renommer" name="Task Rename" />
-        <menu_item_call label="Supprimer" name="Task Remove" />
-        <menu_item_call label="Vider la corbeille" name="Empty Trash" />
-        <menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found" />
-        <menu_item_call label="Nouveau dossier" name="New Folder" />
-        <menu_item_call label="Nouveau script" name="New Script" />
-        <menu_item_call label="Nouvelle note" name="New Note" />
-        <menu_item_call label="Nouveau geste" name="New Gesture" />
+        <menu_item_call label="Acheter" name="Task Buy"/>
+        <menu_item_call label="Ouvrir" name="Task Open"/>
+        <menu_item_call label="Jouer" name="Task Play"/>
+        <menu_item_call label="Propriétés" name="Task Properties"/>
+        <menu_item_call label="Renommer" name="Task Rename"/>
+        <menu_item_call label="Supprimer" name="Task Remove"/>
+        <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
+        <menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found"/>
+        <menu_item_call label="Nouveau dossier" name="New Folder"/>
+        <menu_item_call label="Nouveau script" name="New Script"/>
+        <menu_item_call label="Nouvelle note" name="New Note"/>
+        <menu_item_call label="Nouveau geste" name="New Gesture"/>
         <menu name="New Clothes">
-                <menu_item_call label="Nouvelle jupe" name="New Shirt" />
-                <menu_item_call label="Nouveau pantalon" name="New Pants" />
-                <menu_item_call label="Nouvelles chaussures" name="New Shoes" />
-                <menu_item_call label="Nouvelles chaussettes" name="New Socks" />
-                <menu_item_call label="Nouvelle veste" name="New Jacket" />
-                <menu_item_call label="Nouvelle jupe" name="New Skirt" />
-                <menu_item_call label="Nouveaux gants" name="New Gloves" />
-                <menu_item_call label="Nouveau tricot de peau" name="New Undershirt" />
-                <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants" />
+                <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+                <menu_item_call label="Nouveau pantalon" name="New Pants"/>
+                <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+                <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+                <menu_item_call label="Nouvelle veste" name="New Jacket"/>
+                <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+                <menu_item_call label="Nouveaux gants" name="New Gloves"/>
+                <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
+                <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
         </menu>
         <menu name="New Body Parts">
-                <menu_item_call label="Nouvelle silhouette" name="New Shape" />
-                <menu_item_call label="Nouvelle peau" name="New Skin" />
-                <menu_item_call label="Nouveaux cheveux" name="New Hair" />
-                <menu_item_call label="Nouveaux yeux" name="New Eyes" />
+                <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+                <menu_item_call label="Nouvelle peau" name="New Skin"/>
+                <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+                <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
         </menu>
-        <menu_item_call label="Téléporter" name="Landmark Open" />
-        <menu_item_call label="Ouvrir" name="Animation Open" />
-        <menu_item_call label="Ouvrir" name="Sound Open" />
-        <menu_item_call label="Purger l&apos;objet" name="Purge Item" />
-        <menu_item_call label="Restaurer l&apos;objet" name="Restore Item" />
-        <menu_item_call label="Ouvrir" name="Open" />
-        <menu_item_call label="Propriétés" name="Properties" />
-        <menu_item_call label="Renommer" name="Rename" />
-        <menu_item_call label="Copier l&apos;identifiant universel unique (UUID) de l&apos;actif"
-             name="Copy Asset UUID" />
-        <menu_item_call label="Copier" name="Copy" />
-        <menu_item_call label="Coller" name="Paste" />
-        <menu_item_call label="Supprimer" name="Delete" />
-        <menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit" />
-        <menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit" />
-        <menu_item_call label="Enlever les objets" name="Take Off Items" />
-        <menu_item_call label="Envoyer un IM aux contacts en ligne dans le dossier"
-             name="IM Online Contacts In Folder" />
-        <menu_item_call label="Envoyer un IM à tous les contacts dans le dossier"
-             name="IM All Contacts In Folder" />
-        <menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder" />
-        <menu_item_call label="Jouer" name="Sound Play" />
-        <menu_item_call label="Au sujet du repère" name="Teleport To Landmark" />
-        <menu_item_call label="Jouer dans le Monde" name="Animation Play" />
-        <menu_item_call label="Jouer localement" name="Animation Audition" />
-        <menu_item_call label="Envoyer un message instantané" name="Send Instant Message" />
-        <menu_item_call label="Offrir de téléporter..." name="Offer Teleport..." />
-        <menu_item_call label="Démarrer le chat conférence" name="Conference Chat" />
-        <menu_item_call label="Activer" name="Activate" />
-        <menu_item_call label="Désactiver" name="Deactivate" />
-        <menu_item_call label="Détacher de vous" name="Detach From Yourself" />
-        <menu_item_call label="Porter" name="Object Wear" />
-        <menu label="Attacher à" name="Attach To" />
-        <menu label="Attacher au HUD " name="Attach To HUD" />
-        <menu_item_call label="Porter" name="Wearable Wear" />
-        <menu_item_call label="Éditer" name="Wearable Edit" />
-        <menu_item_call label="Enlever" name="Take Off" />
-        <menu_item_call label="--aucune option--" name="--no options--" />
+        <menu_item_call label="Téléporter" name="Landmark Open"/>
+        <menu_item_call label="Ouvrir" name="Animation Open"/>
+        <menu_item_call label="Ouvrir" name="Sound Open"/>
+        <menu_item_call label="Purger l&apos;objet" name="Purge Item"/>
+        <menu_item_call label="Restaurer l&apos;objet" name="Restore Item"/>
+        <menu_item_call label="Ouvrir" name="Open"/>
+        <menu_item_call label="Propriétés" name="Properties"/>
+        <menu_item_call label="Renommer" name="Rename"/>
+        <menu_item_call label="Copier l&apos;UUID (identifiant universel unique)" name="Copy Asset UUID"/>
+        <menu_item_call label="Copier" name="Copy"/>
+        <menu_item_call label="Coller" name="Paste"/>
+        <menu_item_call label="Supprimer" name="Delete"/>
+        <menu_item_call label="Ajouter à l&apos;ensemble" name="Add To Outfit"/>
+        <menu_item_call label="Remplacer l&apos;ensemble" name="Replace Outfit"/>
+        <menu_item_call label="Enlever les objets" name="Take Off Items"/>
+        <menu_item_call label="Envoyer un IM aux contacts en ligne dans le dossier" name="IM Online Contacts In Folder"/>
+        <menu_item_call label="Envoyer un IM à tous les contacts dans le dossier" name="IM All Contacts In Folder"/>
+        <menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
+        <menu_item_call label="Jouer" name="Sound Play"/>
+        <menu_item_call label="Au sujet du repère" name="Teleport To Landmark"/>
+        <menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
+        <menu_item_call label="Jouer localement" name="Animation Audition"/>
+        <menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
+        <menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/>
+        <menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
+        <menu_item_call label="Activer" name="Activate"/>
+        <menu_item_call label="Désactiver" name="Deactivate"/>
+        <menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
+        <menu_item_call label="Porter" name="Object Wear"/>
+        <menu label="Attacher à" name="Attach To"/>
+        <menu label="Attacher au HUD " name="Attach To HUD"/>
+        <menu_item_call label="Porter" name="Wearable Wear"/>
+        <menu_item_call label="Éditer" name="Wearable Edit"/>
+        <menu_item_call label="Enlever" name="Take Off"/>
+        <menu_item_call label="--aucune option--" name="--no options--"/>
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
index 9e0a93f..1dcc2fc 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <pie_menu name="Avatar Pie">
-        <menu_item_call label="Profil..." name="Profile..." />
-        <menu_item_call label="Ignorer" name="Avatar Mute" />
-        <menu_item_call label="Aller" name="Go To" />
-        <menu_item_call label="Ajouter comme ami..." name="Add Friend" />
-        <menu_item_call label="Payer..." name="Pay..." />
+        <menu_item_call label="Profil..." name="Profile..."/>
+        <menu_item_call label="Ignorer" name="Avatar Mute"/>
+        <menu_item_call label="Aller" name="Go To"/>
+        <menu_item_call label="Devenir amis..." name="Add Friend"/>
+        <menu_item_call label="Payer..." name="Pay..."/>
         <pie_menu label="Plus &gt;" name="More &gt;">
-                <menu_item_call label="Geler..." name="Freeze..." />
-                <menu_item_call label="Donner une carte" name="Give Card" />
-                <menu_item_call label="Invitation de groupe..." name="Invite..." />
-                <menu_item_call label="Expulser..." name="Eject..." />
-                <menu_item_call label="Débugger..." name="Debug..." />
-                <menu_item_call label="Inspecter" name="Object Inspect" />
+                <menu_item_call label="Geler..." name="Freeze..."/>
+                <menu_item_call label="Donner une carte" name="Give Card"/>
+                <menu_item_call label="Inviter dans le groupe..." name="Invite..."/>
+                <menu_item_call label="Expulser..." name="Eject..."/>
+                <menu_item_call label="Débugger..." name="Debug..."/>
+                <menu_item_call label="Inspecter" name="Object Inspect"/>
         </pie_menu>
-        <menu_item_call label="Envoyer IM..." name="Send IM..." />
+        <menu_item_call label="Envoyer IM..." name="Send IM..."/>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
index e594172..798cea0 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <pie_menu name="Land Pie">
-        <menu_item_call label="À propos du terrain..." name="About Land..." />
-        <menu_item_call label="Créer" name="Create" />
-        <menu_item_call label="Aller ici" name="Go Here" />
-        <menu_item_call label="M&apos;asseoir ici" name="Sit Here" />
-        <menu_item_call label="Acheter laissez-passer..." name="Land Buy Pass" />
-        <menu_item_call label="Modifier le terrain" name="Edit Terrain" />
-        <menu_item_call label="Acheter le terrain..." name="Land Buy" />
+        <menu_item_call label="À propos du terrain..." name="About Land..."/>
+        <menu_item_call label="Créer" name="Create"/>
+        <menu_item_call label="Aller ici" name="Go Here"/>
+        <menu_item_call label="M&apos;asseoir ici" name="Sit Here"/>
+        <menu_item_call label="Acheter pass..." name="Land Buy Pass"/>
+        <menu_item_call label="Modifier le terrain" name="Edit Terrain"/>
+        <menu_item_call label="Acheter le terrain..." name="Land Buy"/>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
index 2be82ce..c26581f 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Self Pie">
         <menu_item_call label="Profil..." name="Profile..." />
         <menu_item_call label="Groupes..." name="Groups..." />
@@ -15,7 +15,7 @@
                         <menu_item_call label="Veste" name="Jacket" />
                         <menu_item_call label="Gants" name="Gloves" />
                         <pie_menu label="Plus &gt;" name="More &gt;">
-                                <menu_item_call label="Tricot de peau" name="Self Undershirt" />
+                                <menu_item_call label="Tricot" name="Self Undershirt" />
                                 <menu_item_call label="Tous les habits" name="All Clothes" />
                                 <menu_item_call label="Sous-vêtements" name="Self Underpants" />
                         </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 776f8fd..165d1fb 100644
--- a/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,279 +1,207 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
         <menu label="Fichier" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Charger une image ([COST] $L)..." name="Upload Image" />
-                <menu_item_call label="Charger un son ([COST] $L)..." name="Upload Sound" />
-                <menu_item_call label="Charger une animation ([COST] $L)..." name="Upload Animation" />
-                <menu_item_call label="Charger un lot de fichiers ([COST] $L par fichier)..."
-                     name="Bulk Upload" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Fermer la fenêtre" name="Close Window" />
-                <menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Prendre une photo" name="Take Snapshot" />
-                <menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk"
-                     shortcut="control|shift|X" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Définir taille de la fenêtre" name="Set Window Size">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="320x240" name="320x240" />
-                        <menu_item_call label="640x480" name="640x480" />
-                        <menu_item_call label="800x600" name="800x600" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-                        <menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Quitter" name="Quit" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Charger une image ([COST] L$)..." name="Upload Image"/>
+                <menu_item_call label="Charger un son ([COST] L$)..." name="Upload Sound"/>
+                <menu_item_call label="Charger une animation ([COST] L$)..." name="Upload Animation"/>
+                <menu_item_call label="Charger un lot de fichiers ([COST] L$ par fichier)..." name="Bulk Upload"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Fermer la fenêtre" name="Close Window"/>
+                <menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Prendre une photo" name="Take Snapshot"/>
+                <menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk" shortcut="control|shift|X"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Quitter" name="Quit"/>
         </menu>
         <menu label="Édition" name="Edit">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Annuler" name="Undo" />
-                <menu_item_call label="Recommencer" name="Redo" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Couper" name="Cut" />
-                <menu_item_call label="Copier" name="Copy" />
-                <menu_item_call label="Coller" name="Paste" />
-                <menu_item_call label="Supprimer" name="Delete" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Rechercher..." name="Search..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Tout sélectionner" name="Select All" />
-                <menu_item_call label="Désélectionner" name="Deselect" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Dupliquer" name="Duplicate" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu label="Attacher objet" name="Attach Object" />
-                <menu label="Détacher objet" name="Detach Object" />
+                <menu_item_call label="Annuler" name="Undo"/>
+                <menu_item_call label="Recommencer" name="Redo"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Couper" name="Cut"/>
+                <menu_item_call label="Copier" name="Copy"/>
+                <menu_item_call label="Coller" name="Paste"/>
+                <menu_item_call label="Supprimer" name="Delete"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Rechercher..." name="Search..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Tout sélectionner" name="Select All"/>
+                <menu_item_call label="Désélectionner" name="Deselect"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Dupliquer" name="Duplicate"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu label="Attacher l&apos;objet" name="Attach Object"/>
+                <menu label="Détacher l&apos;objet" name="Detach Object"/>
                 <menu label="Enlever mes habits" name="Take Off Clothing">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="Chemise" name="Shirt" />
-                        <menu_item_call label="Pantalon" name="Pants" />
-                        <menu_item_call label="Chaussures" name="Shoes" />
-                        <menu_item_call label="Chaussettes" name="Socks" />
-                        <menu_item_call label="Veste" name="Jacket" />
-                        <menu_item_call label="Gants" name="Gloves" />
-                        <menu_item_call label="Tricot de peau" name="Menu Undershirt" />
-                        <menu_item_call label="Sous-vêtements" name="Menu Underpants" />
-                        <menu_item_call label="Jupe" name="Skirt" />
-                        <menu_item_call label="Tous les habits" name="All Clothes" />
+                        <menu_item_call label="Chemise" name="Shirt"/>
+                        <menu_item_call label="Pantalon" name="Pants"/>
+                        <menu_item_call label="Chaussures" name="Shoes"/>
+                        <menu_item_call label="Chaussettes" name="Socks"/>
+                        <menu_item_call label="Veste" name="Jacket"/>
+                        <menu_item_call label="Gants" name="Gloves"/>
+                        <menu_item_call label="Tricot" name="Menu Undershirt"/>
+                        <menu_item_call label="Sous-vêtements" name="Menu Underpants"/>
+                        <menu_item_call label="Jupe" name="Skirt"/>
+                        <menu_item_call label="Tous les habits" name="All Clothes"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Gestes..." name="Gestures..." />
-                <menu_item_call label="Profil..." name="Profile..." />
-                <menu_item_call label="Apparence..." name="Appearance..." />
-                <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="Amis..." name="Friends..." />
-                <menu_item_call label="Groupes..." name="Groups..." />
-                <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="Préférences..." name="Preferences..." />
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Gestes..." name="Gestures..."/>
+                <menu_item_call label="Profil..." name="Profile..."/>
+                <menu_item_call label="Apparence..." name="Appearance..."/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_check label="Amis..." name="Friends..."/>
+                <menu_item_call label="Groupes..." name="Groups..."/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_call label="Préférences..." name="Preferences..."/>
         </menu>
         <menu label="Affichage" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Vue subjective" name="Mouselook" />
-                <menu_item_check label="Construire" name="Build" />
-                <menu_item_check label="Joystick Flycam" name="Joystick Flycam" />
-                <menu_item_call label="Réinitialiser l&apos;affichage" name="Reset View" />
-                <menu_item_call label="Regarder la dernière personne qui a parlé" name="Look at Last Chatter"
-                     shortcut="alt|V" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Barre d&apos;outils" name="Toolbar" />
-                <menu_item_check label="Chat local" name="Chat History" />
-                <menu_item_check label="Communiquer" name="Instant Message" />
-                <menu_item_call label="Inventaire" name="Inventory" />
-                <menu_item_check label="Intervenants actifs" name="Active Speakers" />
-                <menu_item_check label="Liste des ignorés" name="Mute List" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="Contrôles de la caméra" name="Camera Controls" />
-                <menu_item_check label="Contrôle des déplacements" name="Movement Controls" />
-                <menu_item_check label="Carte du monde" name="World Map" />
-                <menu_item_check label="Mini-carte" name="Mini-Map" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="Barre de statistiques" name="Statistics Bar" />
-                <menu_item_check label="Limites de la propriété" name="Property Lines" />
-                <menu_item_check label="Propriétaires fonciers" name="Land Owners" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Astuces en survol" name="Hover Tips">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="Afficher les astuces" name="Show Tips" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="Astuces sur les terrains" name="Land Tips" />
-                        <menu_item_check label="Astuces sur tous les objets" name="Tips On All Objects" />
-                </menu>
-                <menu_item_check label="Alt affiche les propriétés physiques" name="Alt Shows Physical" />
-                <menu_item_check label="Voir les objets invisibles" name="Highlight Transparent" />
-                <menu_item_check label="Balises toujours activées" name="Beacons Always On" />
-                <menu label="Balises" name="Beacons">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="Objets scriptés avec Toucher uniquement"
-                             name="Scripted Objects With Touch Only" />
-                        <menu_item_check label="Objets scriptés" name="Scripted Objects" />
-                        <menu_item_check label="Objets physiques" name="Physical Objects" />
-                        <menu_item_check label="Sources sonores" name="Sound Sources" />
-                        <menu_item_check label="Sources des particules" name="Particle Sources" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="Montrer les surbrillances" name="Render Highlights" />
-                        <menu_item_check label="Montrer les balises" name="Render Beacons" />
-                        <menu_item_separator label="-----------" name="separator2" />
-                        <menu_item_check label="Masquer les particules" name="Hide Particles" />
-                        <menu_item_separator label="-----------" name="separator3" />
-                        <menu label="Largeur de la balise" name="Beacon Width">
-                                <menu_item_call label="1" name="Beacon Width 1" />
-                                <menu_item_call label="4" name="Beacon Width 4" />
-                                <menu_item_call label="16" name="Beacon Width 16" />
-                                <menu_item_call label="32" name="Beacon Width 32" />
-                        </menu>
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Vue subjective" name="Mouselook"/>
+                <menu_item_check label="Construire" name="Build"/>
+                <menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
+                <menu_item_call label="Réinitialiser l&apos;affichage" name="Reset View"/>
+                <menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Barre d&apos;outils" name="Toolbar"/>
+                <menu_item_check label="Chat local" name="Chat History"/>
+                <menu_item_check label="Communiquer" name="Instant Message"/>
+                <menu_item_call label="Inventaire" name="Inventory"/>
+                <menu_item_check label="Intervenants actifs" name="Active Speakers"/>
+                <menu_item_check label="Liste des ignorés" name="Mute List"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
+                <menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
+                <menu_item_check label="Carte du monde" name="World Map"/>
+                <menu_item_check label="Mini-carte" name="Mini-Map"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Statistiques" name="Statistics Bar"/>
+                <menu_item_check label="Limites des parcelles" name="Property Lines"/>
+                <menu_item_check label="Propriétaires fonciers" name="Land Owners"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu label="Infobulles" name="Hover Tips">
+                        <menu_item_check label="Affichez les infobulles" name="Show Tips"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="Infobulles des terrains" name="Land Tips"/>
+                        <menu_item_check label="Infobulles de tous les objets" name="Tips On All Objects"/>
                 </menu>
-                <menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Zoomer" name="Zoom In" />
-                <menu_item_call label="Zoom par défaut" name="Zoom Default" />
-                <menu_item_call label="Zoomer en arrière" name="Zoom Out" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Plus" name="More">
-                        <menu_item_call label="Passer en plein écran" name="Toggle Fullscreen" />
-                        <menu_item_call label="Définir la taille de l&apos;IU à sa valeur par défaut"
-                             name="Set UI Size to Default" />
-                </menu>
-                <menu_item_call label="Plein écran en mode bascule" name="Toggle Fullscreen" />
-                <menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default" />
+                <menu_item_check label="Voir les objets invisibles" name="Highlight Transparent"/>
+                <menu_item_check label="Balises" name="beacons"/>
+                <menu_item_check label="Masquer les particules" name="Hide Particles"/>
+                <menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Zoomer" name="Zoom In"/>
+                <menu_item_call label="Zoom par défaut" name="Zoom Default"/>
+                <menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
+                <menu_item_call label="Taille de l&apos;interface par défaut" name="Set UI Size to Default"/>
         </menu>
         <menu label="Monde" name="World">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Chat" name="Chat" />
-                <menu_item_call label="Démarrer geste" name="Start Gesture" />
-                <menu_item_check label="Toujours courir" name="Always Run" />
-                <menu_item_check label="Voler" name="Fly" shortcut="F" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Créer un repère ici" name="Create Landmark Here" />
-                <menu_item_call label="Définir comme domicile" name="Set Home to Here" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Téléporter chez moi" name="Teleport Home" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Définir comme absent(e)" name="Set Away" />
-                <menu_item_call label="Définir comme occupé(e)" name="Set Busy" />
-                <menu_item_call label="Arrêter toutes les animations" name="Stop All Animations" />
-                <menu_item_call label="Libérer les touches" name="Release Keys" />
-                <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..." />
-                <menu_item_call label="Acheter des $L..." name="Buy and Sell L$..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Mon terrain..." name="My Land..." />
-                <menu_item_call label="À propos du terrain..." name="About Land..." />
-                <menu_item_call label="Acheter le terrain..." name="Buy Land..." />
-                <menu_item_call label="Région/Domaine..." name="Region/Estate..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Forcer le soleil" name="Force Sun">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="Soleil Levant" name="Sunrise" />
-                        <menu_item_call label="Midi" name="Noon" />
-                        <menu_item_call label="Soleil Couchant" name="Sunset" />
-                        <menu_item_call label="Minuit" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="Revenir aux valeurs par défaut de la région"
-                             name="Revert to Region Default" />
-                </menu>
-                <menu label="Paramètres de l&apos;environnement" name="Environment Settings">
-                        <menu_item_call label="Lever de soleil" name="Sunrise" />
-                        <menu_item_call label="Milieu de journée" name="Noon" />
-                        <menu_item_call label="Coucher de soleil" name="Sunset" />
-                        <menu_item_call label="Minuit" name="Midnight" />
-                        <menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor" />
+                <menu_item_call label="Chat" name="Chat"/>
+                <menu_item_check label="Toujours courir" name="Always Run"/>
+                <menu_item_check label="Voler" name="Fly" shortcut="F"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
+                <menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Me mettre absent(e)" name="Set Away"/>
+                <menu_item_call label="Me mettre occupé(e)" name="Set Busy"/>
+                <menu_item_call label="Arrêter mes animations" name="Stop All Animations"/>
+                <menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Historique de mon compte..." name="Account History...">
+                        <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr" />
+                </menu_item_call>
+                <menu_item_call label="Gérer mon compte..." name="Manage My Account...">
+                        <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr" />
+                </menu_item_call>
+                <menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Mes terrains..." name="My Land..."/>
+                <menu_item_call label="À propos du terrain..." name="About Land..."/>
+                <menu_item_call label="Acheter le terrain..." name="Buy Land..."/>
+                <menu_item_call label="Région et domaine..." name="Region/Estate..."/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu label="Environnement" name="Environment Settings">
+                        <menu_item_call label="Aube" name="Sunrise"/>
+                        <menu_item_call label="Milieu de journée" name="Noon"/>
+                        <menu_item_call label="Coucher de soleil" name="Sunset"/>
+                        <menu_item_call label="Minuit" name="Midnight"/>
+                        <menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Éditeur d&apos;environnement" name="Environment Editor"/>
                 </menu>
         </menu>
         <menu label="Outils" name="Tools">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu label="Sélectionner un outil" name="Select Tool">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="Mise au point" name="Focus" />
-                        <menu_item_call label="Déplacer" name="Move" />
-                        <menu_item_call label="Éditer" name="Edit" />
-                        <menu_item_call label="Créer" name="Create" />
-                        <menu_item_call label="Terrain" name="Land" />
+                        <menu_item_call label="Mise au point" name="Focus"/>
+                        <menu_item_call label="Déplacer" name="Move"/>
+                        <menu_item_call label="Éditer" name="Edit"/>
+                        <menu_item_call label="Créer" name="Create"/>
+                        <menu_item_call label="Terrain" name="Land"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects" />
-                <menu_item_check label="Sélectionner les objets déplaçables uniquement"
-                     name="Select Only Movable Objects" />
-                <menu_item_check label="Sélectionner mes alentours" name="Select By Surrounding" />
-                <menu_item_check label="Afficher la sélection cachée" name="Show Hidden Selection" />
-                <menu_item_check label="Afficher le marquage lumineux de la sélection"
-                     name="Show Light Radius for Selection" />
-                <menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="Fixer sur la grille" name="Snap to Grid" />
-                <menu_item_call label="Fixer sur les axes XY de la grille" name="Snap Object XY to Grid" />
-                <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid" />
-                <menu_item_call label="Options de la grille..." name="Grid Options..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts" />
-                <menu_item_call label="Lier" name="Link" />
-                <menu_item_call label="Délier" name="Unlink" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Mise au point sur la sélection" name="Focus on Selection" />
-                <menu_item_call label="Zoom sur la sélection" name="Zoom to Selection" />
-                <menu_item_call label="Acheter l&apos;objet" name="Menu Object Take" />
-                <menu_item_call label="Prendre une copie" name="Take Copy" />
-                <menu_item_call label="Remettre et enregistrer l&apos;objet dans mon inventaire"
-                     name="Save Object Back to My Inventory" />
-                <menu_item_call label="Remettre et enregistrer l&apos;objet dans les Contenus de l&apos;objet"
-                     name="Save Object Back to Object Contents" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Afficher fenêtre d&apos;alertes/erreurs de script"
-                     name="Show Script Warning/Error Window" />
-                <menu_item_call label="Recompiler les scripts dans la sélection"
-                     name="Recompile Scripts in Selection">
-                        <menu_item_call label="Mono" name="Mono" />
-                        <menu_item_call label="LSL" name="LSL" />
-                </menu_item_call>
-                <menu_item_call label="Réinitialiser les scripts dans la sélection"
-                     name="Reset Scripts in Selection" />
-                <menu_item_call label="Activer les scripts dans la sélection"
-                     name="Set Scripts to Running in Selection" />
-                <menu_item_call label="Désactiver les scripts dans la sélection"
-                     name="Set Scripts to Not Running in Selection" />
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
+                <menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
+                <menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
+                <menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
+                <menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
+                <menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
+                <menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
+                <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
+                <menu_item_call label="Options de la grille..." name="Grid Options..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
+                <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="Mise au point sur la sélection" name="Focus on Selection"/>
+                <menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
+                <menu_item_call label="Acheter l&apos;objet" name="Menu Object Take"/>
+                <menu_item_call label="Prendre une copie" name="Take Copy"/>
+                <menu_item_call label="Remplacer l&apos;objet dans mon inventaire" name="Save Object Back to My Inventory"/>
+                <menu_item_call label="Remplacer l&apos;objet dans le contenu de l&apos;objet" name="Save Object Back to Object Contents"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Afficher la fenêtre d&apos;alertes/erreurs de script" name="Show Script Warning/Error Window"/>
+                <menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
+                        <menu_item_call label="Mono" name="Mono"/>
+                        <menu_item_call label="LSL" name="LSL"/>
+                </menu>
+                <menu_item_call label="Réinitialiser les scripts dans la sélection" name="Reset Scripts in Selection"/>
+                <menu_item_call label="Activer les scripts dans la sélection" name="Set Scripts to Running in Selection"/>
+                <menu_item_call label="Désactiver les scripts dans la sélection" name="Set Scripts to Not Running in Selection"/>
         </menu>
         <menu label="Aide" name="Help">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Aide Second Life" name="Second Life Help" />
-                <menu_item_call label="Base de connaissances…" name="Knowledge Base..." />
-                <menu_item_call label="Aide en ligne" name="Live Help..." />
-                <menu_item_call label="Didacticiel" name="Tutorial" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Blog officiel des Linden..." name="Official Linden Blog..." />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Guide de scripting..." name="Scripting Guide..." />
-                <menu_item_call label="Scripting Wiki..." name="Scripting Wiki..." />
-                <menu_item_call label="Portail de scripting..." name="Scripting Portal..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Message du jour..." name="Message of the Day..." />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Signaler une infraction..." name="Report Abuse..." />
-                <menu_item_call label="Collisions, coups et bousculades…"
-                     name="Bumps, Pushes &amp;amp; Hits..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Signaler un bug..." name="Report Bug..." />
-                <menu_item_call label="Notes de version…" name="Release Notes..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Calcul du lag" name="Lag Meter" />
-                <menu_item_separator label="-----------" name="separator7" />
+                <menu_item_call label="Aide Second Life" name="Second Life Help"/>
+                <menu_item_call label="Didacticiel" name="Tutorial"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Blog officiel..." name="Official Linden Blog..."/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Aide sur le LSL..." name="Scripting Portal..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
+                <menu_item_call label="Collisions, coups et bousculades…" name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="Mesure du lag" name="Lag Meter"/>
+                <menu_item_separator label="-----------" name="separator7"/>
                 <menu label="Signaler des bugs" name="Bug Reporting">
-                        <menu_item_call label="Suivi des problèmes..." name="Public Issue Tracker..." />
-                        <menu_item_call label="Aide au suivi des problèmes..." name="Publc Issue Tracker Help..." />
-                        <menu_item_separator label="-----------" name="separator7" />
-                        <menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..." />
-                        <menu_item_call label="Problèmes de sécurité..." name="Security Issues..." />
-                        <menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..." />
-                        <menu_item_separator label="-----------" name="separator9" />
-                        <menu_item_call label="Signaler un bug..." name="Report Bug..." />
+                        <menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
+                        <menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."/>
+                        <menu_item_separator label="-----------" name="separator7"/>
+                        <menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."/>
+                        <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
+                                <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr" />
+                        </menu_item_call>
+                        <menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
+                        <menu_item_separator label="-----------" name="separator9"/>
+                        <menu_item_call label="Signaler un bug..." name="Report Bug..."/>
                 </menu>
-                <menu_item_call label="À propos de Second Life..." name="About Second Life..." />
+                <menu_item_call label="À propos de Second Life..." name="About Second Life..."/>
         </menu>
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/fr/mime_types.xml b/linden/indra/newview/skins/default/xui/fr/mime_types.xml
index 01fcf4d..322887f 100644
--- a/linden/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <mimetypes name="default">
         <widgetset name="web">
                 <label name="web_label">
                         Contenu web
                 </label>
                 <tooltip name="web_tooltip">
-                        Il y a du contenu web à cet endroit
+                        Cette parcelle propose du contenu multimédia
                 </tooltip>
                 <playtip name="web_playtip">
                         Afficher le contenu web
@@ -35,7 +35,7 @@
                         Image
                 </label>
                 <tooltip name="image_tooltip">
-                        Il y a une image ici
+                        Cette parcelle contient une image
                 </tooltip>
                 <playtip name="image_playtip">
                         Afficher l&apos;image qui se trouve ici
@@ -46,7 +46,7 @@
                         Audio
                 </label>
                 <tooltip name="audio_tooltip">
-                        Il y a du contenu audio ici
+                        Cette parcelle propose du contenu audio
                 </tooltip>
                 <playtip name="audio_playtip">
                         Jouer le contenu audio qui se trouve ici
diff --git a/linden/indra/newview/skins/default/xui/fr/notify.xml b/linden/indra/newview/skins/default/xui/fr/notify.xml
index feaf15a..cee896c 100644
--- a/linden/indra/newview/skins/default/xui/fr/notify.xml
+++ b/linden/indra/newview/skins/default/xui/fr/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
         <notify name="SystemMessageTip">
                 <message name="message">
@@ -37,7 +37,7 @@
         </notify>
         <notify name="AddSelfFriend">
                 <message name="message">
-                        Vous ne pouvez pas vous ajouter comme ami.
+                        Vous ne pouvez pas devenir ami avec vous-même.
                 </message>
         </notify>
         <notify name="UploadingAuctionSnapshot">
@@ -48,7 +48,7 @@
         </notify>
         <notify name="UploadPayment">
                 <message name="message">
-                        Le chargement a coûté [AMOUNT] $L.
+                        Le chargement a coûté [AMOUNT] L$.
                 </message>
         </notify>
         <notify name="UploadingSnapshot">
@@ -100,7 +100,7 @@ Merci de réessayer.
         </notify>
         <notify name="UnableToLoadLandmark">
                 <message name="message">
-                        Impossible de charger le repère.  Merci de réessayer.
+                        Impossible de charger le repère. Merci de réessayer.
                 </message>
         </notify>
         <notify name="CapsKeyOn">
@@ -143,7 +143,7 @@ Merci de réessayer.
         </notify>
         <notify name="UnableToLoadScript">
                 <message name="message">
-                        Impossible de charger le script.  Merci de réessayer.
+                        Impossible de charger le script. Merci de réessayer.
                 </message>
         </notify>
         <notify name="IncompleteInventory">
@@ -198,12 +198,12 @@ propriétaires différents. Veuillez sélectionner un seul objet.
         </notify>
         <notify name="EnteringGodMode">
                 <message name="message">
-                        Activation du mode admin : niveau [LEVEL]
+                        Activation du mode divin : niveau [LEVEL]
                 </message>
         </notify>
         <notify name="LeavingGodMode">
                 <message name="message">
-                        Désactivation du mode admin : niveau [LEVEL]
+                        Désactivation du mode divin : niveau [LEVEL]
                 </message>
         </notify>
         <notify name="CopyFailed">
@@ -307,7 +307,7 @@ Veuillez sélectionner un terrain plus petit.
         </notify>
         <notify name="TransferObjectsHighlighted">
                 <message name="message">
-                        Tous les objets sur cette parcelle qui seront
+                        Tous les objets de cette parcelle qui seront
 transférés à l&apos;acheteur sont maintenant mis en surbrillance.
  
 * Les arbres et la pelouse qui seront transférés ne sont pas mis en surbrillance.
@@ -348,7 +348,7 @@ ont été renvoyés dans votre inventaire.
         </notify>
         <notify name="OtherObjectsReturned2">
                 <message name="message">
-                        Les objets sur la parcelle de terrain
+                        Les objets sur la parcelle
 appartenant à « [NAME] »
 ont étés renvoyés à leur propriétaire.
                 </message>
@@ -368,7 +368,7 @@ Les objets non transférables donnés au groupe ont étés supprimés.
         <notify name="NotSafe">
                 <message name="message">
                         Les dégâts sont autorisés sur ce terrain (« non sécurisé »).
-Vous pouvez être blessé ici.  Si vous décédez, vous serez téléporté à votre domicile.
+Vous pouvez être blessé ici. Si vous décédez, vous serez téléporté à votre domicile.
                 </message>
         </notify>
         <notify name="NoFly">
@@ -379,7 +379,7 @@ Vous ne pouvez pas voler ici.
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        Ce terrain est « llPushObject Restricted ».
+                        Les bousculades sont interdites sur ce terrain.
 Vous ne pouvez pas pousser les autres à moins que vous soyez propriétaire de ce terrain.
                 </message>
         </notify>
@@ -494,7 +494,7 @@ Aucun script n&apos;est exécuté à part ceux du propriétaire du terrain.
                 <message name="message">
                         [NAME] vous invite à
 rejoindre un groupe comme officier.
-L&apos;adhésion est gratuite.
+L&apos;inscription est gratuite.
  
 [MESSAGE]
                 </message>
@@ -512,7 +512,7 @@ L&apos;adhésion est gratuite.
                 <message name="message">
                         [NAME] vous invite à
 rejoindre un groupe.
-L&apos;adhésion coûte [COST] $L.
+L&apos;inscription coûte [COST] L$.
  
 [MESSAGE]
                 </message>
@@ -530,7 +530,7 @@ L&apos;adhésion coûte [COST] $L.
                 <message name="message">
                         [NAME] vous invite à
 rejoindre un groupe.
-L&apos;adhésion est gratuite.
+L&apos;inscription est gratuite.
  
 [MESSAGE]
                 </message>
@@ -576,7 +576,7 @@ le/la rejoindre par téléportation :
  
 [MESSAGE]
  
-(Par défaut, vous pourrez voir chacun si l&apos;autre est connecté.)
+(Par défaut, vous pourrez voir lorsque vous êtes tous deux connectés.)
                 </message>
                 <option name="Accept">
                         Accepter
@@ -625,13 +625,13 @@ vous permet d&apos;envoyer rapidement un IM à ce résident.
         <notify name="RegionRestartMinutes">
                 <message name="message">
                         La région va redémarrer dans [MINUTES] minutes.
-Si vous restez dans cette région, vous serez déconnecté.
+Si vous restez dans cette région, vous serez déconnecté(e).
                 </message>
         </notify>
         <notify name="RegionRestartSeconds">
                 <message name="message">
                         La région va redémarrer dans [SECONDS] secondes.
-Si vous restez dans cette région, vous serez déconnecté.
+Si vous restez dans cette région, vous serez déconnecté(e).
                 </message>
         </notify>
         <notify name="LoadWebPage">
@@ -640,7 +640,7 @@ Si vous restez dans cette région, vous serez déconnecté.
  
 [MESSAGE]
  
-Venant de l&apos;objet :  [OBJECTNAME], appartenant à :  [NAME]?
+Venant de l&apos;objet : [OBJECTNAME], appartenant à : [NAME]?
                 </message>
                 <option name="Gotopage">
                         Aller sur cette page
@@ -679,7 +679,7 @@ Réessayez dans une minute le temps de résoudre le problème.
         </notify>
         <notify name="ScriptTakeMoney">
                 <message name="message">
-                        Débite vos dollars Linden ($L)
+                        Débite vos dollars Linden (L$)
                 </message>
         </notify>
         <notify name="ActOnControlInputs">
@@ -751,22 +751,22 @@ Acceptez-vous ?
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
                 <message name="message">
-                        &apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[OWNERNAME]&apos;, situé dans [REGIONNAME] à [REGIONPOS], a reçu la permission de : [PERMISSIONS].
+                        &apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu la permission de : [PERMISSIONS].
                 </message>
         </notify>
         <notify name="ScriptQuestionCautionChatDenied">
                 <message name="message">
-                        &apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[OWNERNAME]&apos;, situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu la permission de : [PERMISSIONS].
+                        &apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu la permission de : [PERMISSIONS].
                 </message>
         </notify>
         <notify name="ScriptQuestionCautionWarn">
                 <message name="message">
-                        Un objet demande la permission de prélever des dollars Linden ($L) sur votre compte.
+                        Un objet demande la permission de prélever des dollars Linden (L$) sur votre compte.
                 </message>
         </notify>
         <notify name="ScriptQuestionCaution">
                 <message name="message">
-                        &apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[NAME]&apos;, aimerait :
+                        [OBJECTNAME], un objet appartenant à [NAME], aimerait :
  
 [QUESTIONS]
 Si vous n&apos;avez pas confiance en cet objet ni en son créateur, vous devriez refuser cette requête. Pour plus d&apos;informations, cliquez sur le bouton Détails.
@@ -803,14 +803,14 @@ Accepter cette requête ?
         </notify>
         <notify name="FirstBalanceIncrease">
                 <message name="message">
-                        Vous venez de recevoir [AMOUNT] $L.
-Des objets et des utilisateurs peuvent vous donner des $L.
+                        Vous venez de recevoir [AMOUNT] L$.
+Des objets et des utilisateurs peuvent vous donner des L$.
 Votre solde est affiché dans le coin en haut à droite de l&apos;écran.
                 </message>
         </notify>
         <notify name="FirstBalanceDecrease">
                 <message name="message">
-                        Vous venez de payer [AMOUNT] $L.
+                        Vous venez de payer [AMOUNT] L$.
 Votre solde est affiché dans le coin en haut à droite de l&apos;écran.
                 </message>
         </notify>
@@ -823,7 +823,7 @@ Pour vous lever, cliquez sur le bouton Me lever.
         </notify>
         <notify name="FirstMap">
                 <message name="message">
-                        Cliquez et faîtes glisser pour faire défiler la carte.
+                        Cliquez et faites glisser pour faire défiler la carte.
 Double-cliquez pour vous téléporter.
 Utilisez les contrôles à droite pour trouver des choses et afficher différents arrière-plans.
                 </message>
@@ -867,10 +867,10 @@ Vous pouvez modifier votre apparence aussi souvent que vous le souhaitez.
         </notify>
         <notify name="FirstInventory">
                 <message name="message">
-                        Il s&apos;agit de votre inventaire qui contient des objets, notes, vêtements, et autres choses que vous possédez. 
+                        Il s&apos;agit de votre inventaire qui contient des objets, notes, vêtements, et autres possessions. 
 * Pour porter un objet ou le dossier contenant un ensemble complet, faites-le glisser sur vous-même.
 * Pour mettre un objet dans le monde, faites-le glisser sur le sol.
-* Pour lire une notice, double-cliquez dessus.
+* Pour lire une note, double-cliquez dessus.
                 </message>
         </notify>
         <notify name="FirstSandbox">
@@ -896,9 +896,9 @@ Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Ma
         </notify>
         <notify name="FirstSculptedPrim">
                 <message name="message">
-                        Vous êtes en train d&apos;éditer un prim sculpté.  
-Pour spécifier la forme d&apos;un prim sculpté, vous devez utiliser une texture spécifique.  
-Vous trouverez des exemples de textures sculptées dans la bibliothèque de l&apos;inventaire.
+                        Vous êtes en train d&apos;éditer un sculptie.  
+Pour spécifier la forme d&apos;un sculptie, vous devez utiliser une texture spécifique.  
+Vous trouverez des textures dans la bibliothèque de votre inventaire.
                 </message>
         </notify>
         <notify name="FirstMedia">
@@ -944,7 +944,7 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
         </notify>
         <notify name="VoiceInviteGroup">
                 <message name="message">
-                        [NAME] a rejoint un chat oral avec le groupe [GROUP]. 
+                        [NAME] a rejoint un chat vocal avec le groupe [GROUP]. 
 Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
                 </message>
                 <option name="Accept">
@@ -994,7 +994,7 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
         </notify>
         <notify name="ProximalVoiceChannelFull">
                 <message name="message">
-                        Nous sommes désolés.  Le nombre maximum de conversations orales a été atteint dans cette zone.  Veuillez trouver un autre endroit pour discuter.
+                        Nous sommes désolés. Le nombre maximum de conversations vocales a été atteint dans cette zone. Veuillez trouver un autre endroit pour discuter.
                 </message>
         </notify>
         <notify name="VoiceChannelDisconnected">
@@ -1044,7 +1044,7 @@ Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignore
         </notify>
         <notify name="VoiceNotAllowed">
                 <message name="message">
-                        Vous n&apos;êtes pas autorisé à vous connecter au chat oral pour [VOICE_CHANNEL_NAME].
+                        Vous n&apos;êtes pas autorisé à vous connecter au chat vocal pour [VOICE_CHANNEL_NAME].
                 </message>
         </notify>
         <notify name="VoiceCallGenericError">
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_audio.xml b/linden/indra/newview/skins/default/xui/fr/panel_audio.xml
index 06b432e..1e4aedf 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_audio.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Audio et Vidéo" name="Media panel">
-        <slider label="Master" name="System Volume" label_width="65" />
-        <slider label="Musique" name="Music Volume" label_width="65" />
-        <slider label="Média" name="Media Volume" label_width="65" />
-        <slider label="Voix" name="Voice Volume" label_width="65" />
-        <slider label="Sons" name="SFX Volume" label_width="65"/>
-        <slider label="Son ambiant" name="Wind Volume" label_width="65"  />
-        <slider label="UI" name="UI Volume" label_width="65"/>
+        <slider label="Principal" label_width="65" name="System Volume"/>
+        <slider label="Musique" label_width="65" name="Music Volume"/>
+        <slider label="Média" label_width="65" name="Media Volume"/>
+        <slider label="Voix" label_width="65" name="Voice Volume"/>
+        <slider label="Sons" label_width="65" name="SFX Volume"/>
+        <slider label="Son ambiant" label_width="65" name="Wind Volume"/>
+        <slider label="Interface" label_width="65" name="UI Volume"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/fr/panel_audio_device.xml
index 7288cc3..a9540d8 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_audio_device.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_audio_device.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="device_settings">
         <text name="Audio Devices">
                 Matériel audio
@@ -7,16 +7,15 @@
                 Périphérique d&apos;entrée (micro) :
         </text>
         <text name="Output device (speakers):">
-                Périphérique de sortie (speakers) :
+                Périphérique de sortie (haut-parleurs) :
         </text>
         <text name="Input level:">
                 Volume d&apos;entrée
         </text>
         <text_editor name="voice_intro_text1">
-                Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume d&apos;entrée, il vous suffit de parler dans le micro.
+                Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume, parlez dans le micro.
         </text_editor>
-        <volume_slider name="mic_volume_slider"
-             tool_tip="Réglez le volume à l&apos;aide de ce curseur." />
+        <volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
         <text name="wait_text">
                 Veuillez patienter
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml b/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
index f09ff35..dccf88f 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
-                <panel label="2nd Life" name="2nd Life">
+                <panel label="2ème vie" name="2nd Life">
                         <string name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
@@ -28,16 +28,16 @@
                                 Aucune info de paiement enregistrée
                         </string>
                         <string name="AgeVerified">
-                                Personne dont l&apos;âge a été vérifié
+                                Âge vérifié
                         </string>
                         <string name="NotAgeVerified">
-                                Personne dont l&apos;âge n&apos;a pas été vérifié
+                                Âge non vérifié
                         </string>
                         <text name="Name:">
                                 Nom :
                         </text>
                         <text name="online_yes">
-                                Connecté actuellement
+                                Actuellement connecté(e)
                         </text>
                         <text name="label">
                                 Né(e) le :
@@ -45,21 +45,18 @@
                         <text name="label2">
                                 Compte :
                         </text>
-                        <text name="partner_label"
-                             tool_tip="Partenaire sur Second Life. Pour en savoir plus, allez sur www.secondlife.com/partner">
+                        <text name="partner_label" tool_tip="Partenaire sur Second Life. Pour en savoir plus, allez sur www.secondlife.com/partner">
                                 Partenaire :
                         </text>
-                        <button label="i" label_selected="i" left_delta="62" name="partner_info"
-                             tool_tip="Cliquez pour ouvrir le profil du partenaire" />
-                        <button label="?" label_selected="?" left_delta="24" name="partner_help" />
-                        <line_editor name="partner_edit"
-                             tool_tip="Partenaire sur Second Life. Pour en savoir plus, allez sur www.secondlife.com/partner">
+                        <button label="i" label_selected="i" left_delta="62" name="partner_info" tool_tip="Cliquez pour ouvrir le profil du partenaire"/>
+                        <button label="?" label_selected="?" left_delta="24" name="partner_help"/>
+                        <line_editor name="partner_edit" tool_tip="Partenaire sur Second Life. Pour en savoir plus, allez sur www.secondlife.com/partner">
                                 [FIRST] [LAST]
                         </line_editor>
                         <text name="Photo:">
                                 Photo :
                         </text>
-                        <texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une image" />
+                        <texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une image"/>
                         <text name="Groups:">
                                 Groupes :
                         </text>
@@ -69,91 +66,83 @@
                         <text name="(500 chars)">
                                 (500 car.)
                         </text>
-                        <text name="Give item:">
-                                Donner objet :
-                        </text>
-                        <text name="Give inventory"
-                             tool_tip="Mettez les objets de l&apos;inventaire ici pour les donner à cette personne.">
-                                Mettez les objets de l&apos;inventaire ici.
-                        </text>
-                        <check_box label="Afficher dans la recherche" name="allow_publish"
-                             tool_tip="Publiez des infos suplémentaires telles qu&apos;une description et une image dans la Recherche." />
-                        <button label="?" label_selected="?" left_delta="160" name="?" />
-                        <button label="Localiser" label_selected="Localiser" name="Find on Map" />
-                        <button label="Offrir téléportation..." label_selected="Offrir téléportation..."
-                             name="Offer Teleport..." />
-                        <button label="Ajouter comme ami..." label_selected="Ajouter comme ami..."
-                             name="Add Friend..." />
-                        <button label="Payer..." label_selected="Payer..." name="Pay..." />
-                        <button label="Message instantané..." label_selected="Message instantané..."
-                             name="Instant Message..." tool_tip="Message instantané (IM)" />
-                        <button label="Ignorer" label_selected="Ignorer" name="Mute" />
+                        <text name="Give item:" height="20" bottom="-397">
+                                Donner des 
+objets :</text>
+                        <text name="Give inventory" tool_tip="Mettez les objets de l&apos;inventaire ici pour les donner à cette personne.">
+                                Mettez les objets à transférer ici.
+                        </text>
+                        <check_box label="Afficher dans la recherche" name="allow_publish" tool_tip="Publiez des infos suplémentaires telles qu&apos;une description et une image dans la Recherche."/>
+                        <button label="?" label_selected="?" left_delta="160" name="?"/>
+                        <button label="Localiser" label_selected="Localiser" name="Find on Map"/>
+                        <button label="Proposer téléportation..." label_selected="Proposer téléportation..." name="Offer Teleport..."/>
+                        <button label="Devenir amis..." label_selected="Devenir amis..." name="Add Friend..."/>
+                        <button label="Payer..." label_selected="Payer..." name="Pay..."/>
+                        <button label="Message instantané..." label_selected="Message instantané..." name="Instant Message..." tool_tip="Message instantané (IM)"/>
+                        <button label="Ignorer" label_selected="Ignorer" name="Mute"/>
                 </panel>
                 <panel label="Web" name="WebProfile">
-                        <flyout_button label="Charger" label_selected="Charger" name="load"
-                             tool_tip="Charger cette page du profil avec le navigateur web incorporé.">
+                        <flyout_button label="Charger" label_selected="Charger" name="load" tool_tip="Charger cette page du profil avec le navigateur web incorporé.">
                                 <flyout_button_item name="open_item">
                                         Dans un navigateur externe
                                 </flyout_button_item>
                                 <flyout_button_item name="home_item">
-                                        URL du domicile
+                                        URL de la page d'accueil
                                 </flyout_button_item>
                         </flyout_button>
-                        <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="Charger automatiquement les profils du web" name="auto_load"
-                             tool_tip="Charger automatiquement toutes les pages web des profils sans demander au préalable." />
+                        <button label="?" label_selected="?" name="web_profile_help"/>
+                        <check_box label="Charger directement la page web" name="auto_load" tool_tip="Charger automatiquement toutes les pages web des profils sans demander au préalable."/>
                 </panel>
                 <panel label="Intérêts" name="Interests">
                         <text left="2" name="I Want To:">
                                 Je veux :
                         </text>
-                        <check_box label="Construire" name="chk0" />
-                        <check_box label="Explorer" left_delta="160" name="chk1" />
-                        <check_box label="Faire des rencontres" left_delta="-160" name="chk2" />
-                        <check_box label="Être engagé" left_delta="160" name="chk6" />
-                        <check_box label="Rejoindre un groupe" left_delta="-160" name="chk3" />
-                        <check_box label="Acheter" left_delta="160" name="chk4" />
-                        <check_box label="Vendre" left_delta="-160" name="chk5" />
-                        <check_box label="Recruter" left_delta="160" name="chk7" />
+                        <check_box label="Construire" name="chk0"/>
+                        <check_box label="Explorer" left_delta="160" name="chk1"/>
+                        <check_box label="Faire des rencontres" left_delta="-160" name="chk2"/>
+                        <check_box label="Être engagé" left_delta="160" name="chk6"/>
+                        <check_box label="Rejoindre un groupe" left_delta="-160" name="chk3"/>
+                        <check_box label="Acheter" left_delta="160" name="chk4"/>
+                        <check_box label="Vendre" left_delta="-160" name="chk5"/>
+                        <check_box label="Recruter" left_delta="160" name="chk7"/>
                         <text left="2" name="Skills:">
                                 Mes talents :
                         </text>
-                        <check_box label="Textures" name="schk0" />
-                        <check_box label="Architecture" left_delta="160" name="schk1" />
-                        <check_box label="Organisation d&apos;événements" name="schk2" />
-                        <check_box label="Modélisation" left_delta="-160" name="schk3" />
-                        <check_box label="Rédaction de scripts" name="schk4" />
-                        <check_box label="Customisation de personnages" left_delta="160" name="schk5" />
+                        <check_box label="Textures" name="schk0"/>
+                        <check_box label="Architecture" left_delta="160" name="schk1"/>
+                        <check_box label="Organisation d&apos;événements" name="schk2"/>
+                        <check_box label="Modélisation" left_delta="-160" name="schk3"/>
+                        <check_box label="Rédaction de scripts" name="schk4"/>
+                        <check_box label="Customisation de personnages" left_delta="160" name="schk5"/>
                         <text left="2" name="Languages:">
                                 Langues :
                         </text>
                 </panel>
                 <panel label="Favoris" name="Picks">
-                        <text left="10" name="Tell everyone about your favorite places in Second Life."
-                             width="412">
+                        <text left="10" name="Tell everyone about your favorite places in Second Life." width="412">
                                 Faites connaître aux autres résidents vos endroits favoris dans Second Life.
                         </text>
-                        <button label="Créer..." label_selected="Créer..." name="New..." />
-                        <button label="Supprimer..." label_selected="Supprimer..." name="Delete..." />
+                        <button label="Créer..." label_selected="Créer..." name="New..."/>
+                        <button label="Supprimer..." label_selected="Supprimer..." name="Delete..."/>
                         <text name="loading_text">
-                                Chargement en cours...
+                                Chargement...
                         </text>
                 </panel>
                 <panel label="Annonces" name="Classified">
                         <text name="Place an ad in Second Life&apos;s classified listings.">
                                 Passez une petite annonce sur Second Life.
                         </text>
-                        <button label="Créer..." label_selected="Créer..." name="New..." />
-                        <button label="Supprimer..." label_selected="Supprimer..." name="Delete..." />
+                        <button label="Créer..." label_selected="Créer..." name="New..."/>
+                        <button label="Supprimer..." label_selected="Supprimer..." name="Delete..."/>
                         <text name="loading_text">
-                                Chargement en cours...
+                                Chargement...
                         </text>
                 </panel>
-                <panel label="1st Life" name="1st Life">
+                <panel label="1ère vie" name="1st Life">
                         <text name="Photo:">
                                 Photo :
                         </text>
-                        <texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une photo" />
+                        <texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une photo"/>
                         <text name="Info:">
                                 Infos :
                         </text>
@@ -163,26 +152,23 @@
                 </panel>
                 <panel label="Mes notes" name="My Notes">
                         <string name="Loading">
-                                Chargement en cours...
+                                Chargement...
                         </string>
                         <text name="label">
                                 Dans cet espace, vous pouvez enregistrer vos remarques au sujet de ce
-résident. Vous pouvez aussi utiliser cet onglet pour prendre des notes sur
-certains projets. Vous êtes le seul à pouvoir y accéder.  Même le résident
-dont vous consultez le profil actuellement ne peut pas voir vos notes.
+résident ou prendre des notes sur certains projets. Vous êtes le seul à
+pouvoir accéder à cette page et même le résident dont vous consultez le profil
+ne pourra pas voir ce que vous avez écrit.
                         </text>
-                        <text_editor bottom_delta="-260" height="240" name="notes edit" />
+                        <text_editor bottom_delta="-260" height="240" name="notes edit"/>
                 </panel>
         </tab_container>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Annuler" label_selected="Annuler" name="Cancel" />
-        <button label="Vider" label_selected="Vider" name="Kick" />
-        <button label="Geler" label_selected="Geler" name="Freeze"
-             tool_tip="Empêcher ce résident de bouger et de chatter." />
-        <button label="Dégeler" label_selected="Dégeler" name="Unfreeze"
-             tool_tip="Dégeler le résident" />
-        <button label="Admin" label_selected="Admin" name="csr_btn"
-             tool_tip="Contacter le Service Clientèle pour ce résident" />
+        <button label="OK" label_selected="OK" name="OK"/>
+        <button label="Annuler" label_selected="Annuler" name="Cancel"/>
+        <button label="Éjecter" label_selected="Éjecter" name="Kick"/>
+        <button label="Geler" label_selected="Geler" name="Freeze" tool_tip="Empêcher ce résident de bouger et de chatter."/>
+        <button label="Dégeler" label_selected="Dégeler" name="Unfreeze" tool_tip="Dégeler le résident"/>
+        <button label="Admin" label_selected="Admin" name="csr_btn" tool_tip="Contacter le Service Clientèle pour ce résident"/>
         <string name="ShowOnMapNonFriend">
                 Voir sur la carte.
 Ceci n&apos;est pas possible car vous
@@ -200,13 +186,13 @@ n&apos;êtes pas ami avec cette personne.
                 Téléporter le résident là où vous êtes de force.
         </string>
         <string name="TeleportPrelude">
-                Offrir au résident d&apos;être téléporté là où vous êtes.
+                Proposer au résident d&apos;être téléporté là où vous êtes.
 Ceci n&apos;est pas possible tant que vous êtes sur l&apos;île d&apos;orientation.
         </string>
         <string name="TeleportNormal">
                 Offrir au résident d&apos;être téléporté là où vous êtes.
         </string>
         <string name="Loading">
-                Chargement en cours...
+                Chargement...
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
index 6ee30dc..f75ac67 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
@@ -1,36 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Classified" title="Annonces">
-        <line_editor name="given_name_editor"
-             tool_tip="Le nom doit commencer par une lettre ou un chiffre, et non un signe de ponctuation." />
-        <line_editor name="location_editor"
-             tool_tip="Définir votre position actuelle comme emplacement pour cette annonce." />
-        <button label="Définir position" name="set_location_btn" />
-        <button label="Téléporter" name="classified_teleport_btn" />
-        <button label="Carte" name="classified_map_btn" />
-        <combo_box label="" name="classified_category_combo" />
+        <line_editor name="given_name_editor" tool_tip="Le nom doit commencer par une lettre ou un chiffre, et non un signe de ponctuation."/>
+        <line_editor name="location_editor" tool_tip="Définir votre position actuelle comme emplacement pour cette annonce."/>
+        <button label="Définir position" name="set_location_btn"/>
+        <button label="Téléporter" name="classified_teleport_btn"/>
+        <button label="Carte" name="classified_map_btn"/>
+        <combo_box label="" name="classified_category_combo"/>
         <check_box label="Adulte" name="classified_mature_check">
                 <combo_item name="select_mature">
-                        - Pour adultes -
+                        - Type de public -
                 </combo_item>
                 <combo_item name="mature">
-                        Contenu réservé aux adultes
+                        Adulte
                 </combo_item>
                 <combo_item name="not_mature">
-                        Contenu non réservé aux adultes
+                        Tout public
                 </combo_item>
         </check_box>
-        <text name="classified_info_text"
-             tool_tip="Plus vous payez pour votre annonce, mieux elle est placée dans la liste.">
-                Annonce passée : pas encore publiée
+        <text name="classified_info_text" tool_tip="Plus vous payez cher pour votre annonce, mieux elle est placée dans la liste.">
+                Annonce passée, pas encore publiée
         </text>
-        <text name="click_through_text"
-             tool_tip="Nombre total de clics sur chaque bouton depuis la parution de l&apos;annonce.">
+        <text name="click_through_text" tool_tip="Nombre total de clics sur chaque bouton depuis la parution de l&apos;annonce.">
                 Clics :
         </text>
-        <button label="Publier..." name="classified_update_btn" />
-        <check_box label="Republier chaque semaine" name="auto_renew_check" />
+        <button label="Publier..." name="classified_update_btn"/>
+        <check_box label="Publier chaque semaine" name="auto_renew_check"/>
         <text name="ad_placed_paid">
-                Annonce passée : [DATE], a payé [AMT] $L pour l&apos;annonce.
+                Annonce passée le : [DATE]. Prix : [AMT] L$.
         </text>
         <string name="update_txt">
                 Mise à jour
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
index 0c5e32f..2ba8dde 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
@@ -4,11 +4,14 @@
         <button label="Chat local" name="History" tool_tip="Cliquez ici pour voir ce qui a été dit"/>
         <line_editor label="Cliquez ici pour chatter." name="Chat Editor" tool_tip="Appuyez sur Entrée pour dire quelque chose, Ctrl-Entrée pour crier."/>
         <flyout_button label="Dire" name="Say" tool_tip="(Entrée)">
+                <flyout_button_item name="shout_item">
+                        Crier
+                </flyout_button_item>
                 <flyout_button_item name="say_item">
                         Dire
                 </flyout_button_item>
-                <flyout_button_item name="shout_item">
-                        Crier
+                <flyout_button_item name="whisper_item">
+                        Chuchoter
                 </flyout_button_item>
         </flyout_button>
         <combo_box label="Gestes" name="Gesture"/>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_classified.xml b/linden/indra/newview/skins/default/xui/fr/panel_classified.xml
index 31aaf1c..0383532 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_classified.xml
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Classified" title="Annonces">
-        <line_editor name="given_name_editor"
-             tool_tip="Le nom doit commencer par une lettre ou un chiffre, et non un signe de ponctuation." />
-        <line_editor name="location_editor"
-             tool_tip="Définir votre position actuelle comme emplacement pour cette annonce." />
-        <button label="Définir" name="set_location_btn" />
-        <button label="Téléporter" name="classified_teleport_btn" />
-        <button label="Voir sur la carte" name="classified_map_btn" width="115" />
-        <button label="Profil" left="245" name="classified_profile_btn" />
-        <check_box label="Adulte" name="classified_mature_check">
+        <line_editor name="given_name_editor" tool_tip="Le nom doit commencer par une lettre ou un chiffre, et non un signe de ponctuation."/>
+        <line_editor name="location_editor" tool_tip="Définir votre position actuelle comme emplacement pour cette annonce."/>
+        <button label="Définir" name="set_location_btn"/>
+        <button label="Téléporter" name="classified_teleport_btn"/>
+        <button label="Voir sur la carte" name="classified_map_btn" width="115"/>
+        <button label="Profil" left="245" name="classified_profile_btn"/>
+        <check_box label="Adulte" name="classified_mature_check"  width="190">
                 <combo_item name="select_mature">
                         - Sélectionner Pour adultes -
                 </combo_item>
@@ -19,10 +17,10 @@
                         Contenu non réservé aux adultes
                 </combo_item>
         </check_box>
-        <combo_box label="" name="classified_category_combo" />
-        <button label="Mise à jour" name="classified_update_btn" />
+        <combo_box label="" name="classified_category_combo"/>
+        <button label="Mise à jour" name="classified_update_btn" width="80" />
         <string name="ad_placed_paid">
-                Annonce passée  : [DATE], a payé [AMT] $L pour l&apos;annonce.
+                Annonce passée le : [DATE]. Prix : [AMT] L$.
         </string>
         <string name="update_txt">
                 Mise à jour
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_event.xml b/linden/indra/newview/skins/default/xui/fr/panel_event.xml
index 0612569..20743ed 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_event.xml
@@ -43,7 +43,7 @@
                 (personne)
         </text>
         <text name="event_location_label">
-                Emplacement :
+                Lieu :
         </text>
         <text name="event_location">
                 (aucun)
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_friends.xml b/linden/indra/newview/skins/default/xui/fr/panel_friends.xml
index d80372b..fa0d08b 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="friends">
         <string name="Multiple">
                 Amis multiples...
         </string>
-        <scroll_list name="friend_list"
-             tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
-                <column name="icon_online_status" tool_tip="Statut en ligne" />
-                <column label="Nom" name="friend_name" tool_tip="Nom" />
-                <column name="icon_visible_online"
-                     tool_tip="Vos amis voient si vous êtes connecté(e)" />
-                <column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte" />
-                <column name="icon_edit_mine"
-                     tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets" />
-                <column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami" />
+        <scroll_list name="friend_list" tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
+                <column name="icon_online_status" tool_tip="Statut en ligne"/>
+                <column label="Nom" name="friend_name" tool_tip="Nom"/>
+                <column name="icon_visible_online" tool_tip="Vos amis voient si vous êtes connecté(e)"/>
+                <column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte"/>
+                <column name="icon_edit_mine" tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets"/>
+                <column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami"/>
         </scroll_list>
-        <button label="IM/Appel" name="im_btn"
-             tool_tip="Ouvrez une session de messagerie instantanée" />
-        <button label="Profil" name="profile_btn"
-             tool_tip="Affichez une photo, vos groupes et autres infos" />
-        <button label="Téléporter..." name="offer_teleport_btn"
-             tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes" />
-        <button label="Payer..." name="pay_btn"
-             tool_tip="Donnez des dollars Linden ($L) à cet ami" />
-        <button label="Supprimer..." name="remove_btn"
-             tool_tip="Supprimez cette personne de votre liste d&apos;amis" />
-        <button label="Ajouter..." name="add_btn"
-             tool_tip="Demandez à un résident de devenir votre ami" />
+        <button label="IM/Appel" name="im_btn" tool_tip="Ouvrez une session de messagerie instantanée"/>
+        <button label="Profil" name="profile_btn" tool_tip="Affichez une photo, vos groupes et autres infos"/>
+        <button label="Téléporter..." name="offer_teleport_btn" tool_tip="Proposez à cet ami d&apos;être téléporté là où vous êtes"/>
+        <button label="Payer..." name="pay_btn" tool_tip="Donnez des L$ à cet ami"/>
+        <button label="Supprimer..." name="remove_btn" tool_tip="Supprimez cette personne de votre liste d&apos;amis"/>
+        <button label="Ajouter..." name="add_btn" tool_tip="Demandez à un résident de devenir votre ami"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group.xml b/linden/indra/newview/skins/default/xui/fr/panel_group.xml
index c4f4dfa..697efed 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfo" title="Infos du groupe">
+<panel name="GroupInfo" title="Profil du groupe">
         <text name="default_needs_apply_text">
                 Certains changements n&apos;ont pas été appliqués sur cet onglet.
         </text>
         <text name="want_apply_text">
-                Voulez-vous les appliquer ?
+                Voulez-vous enregistrer les modifications ?
         </text>
         <button label="Appliquer" label_selected="Appliquer" name="btn_apply" />
         <button label="Annuler" label_selected="Annuler" name="btn_cancel" />
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
index 335179b..0d36bd8 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
@@ -4,6 +4,6 @@
                 Certains changements n&apos;ont pas été appliqués sur cet onglet.
         </text>
         <text name="want_apply_text">
-                Voulez-vous les appliquer ?
+                Voulez-vous enregistrer les modifications ?
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 6686f3d..82baee7 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -1,37 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_tab">
         <text name="help_text">
-                L&apos;onglet Général contient des infos générales sur le groupe, une liste des propriétaires et des membres visibles, les préférences relatives au groupe ainsi que différentes options concernant les membres.
+                L&apos;onglet Général contient les infos générales et les préférences du groupe ainsi que la liste des propriétaires et des membres visibles.
 
-Pour obtenir de l&apos;aide, survolez les options avec votre souris.
         </text>
         <string name="group_info_unchanged">
-                Les infos générales du groupe ont changé.
+                Le profil du groupe a changé.
         </string>
-        <button label="?" label_selected="?" name="help_button" />
+        <button label="?" label_selected="?" name="help_button"/>
         <line_editor label="Saisissez le nom du groupe ici" name="group_name_editor">
-                Entrez le nom de votre nouveau groupe ici
+                Saisissez le nom du groupe ici
         </line_editor>
         <text name="group_name">
                 Saisissez le nom du groupe ici
         </text>
         <text name="prepend_founded_by">
-                Fondé par
-        </text>
-        <text name="founder_name">
+                Fondé par </text>
+        <text name="founder_name" left_delta="54">
                 (en attente)
         </text>
         <text name="group_charter_label">
                 Charte du groupe
         </text>
-        <texture_picker label="Emblème du groupe" name="insignia"
-             tool_tip="Cliquez pour sélectionner une image" />
+        <texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
         <text_editor name="charter">
-                Charte du groupe
+                Indiquez ici la charte de votre groupe
         </text_editor>
-        <button label="Rejoindre (0$L)" label_selected="Rejoindre (0$L)" name="join_button" />
-        <button label="Affichage détaillé" label_selected="Affichage détaillé"
-             name="info_button" />
+        <button label="Rejoindre (0L$)" label_selected="Rejoindre (0L$)" name="join_button"/>
+        <button label="Affichage détaillé" label_selected="Affichage détaillé" name="info_button"/>
         <text>
                 Propriétaires et membres visibles
         </text>
@@ -50,54 +46,44 @@ Pour obtenir de l&apos;aide, survolez les options avec votre souris.
                 <column label="Dernière connexion" name="online" relwidth="0.35"/>
         </name_list>
         <text name="text_group_preferences">
-                Préférences du groupe
+                Préférences
         </text>
         <text name="incomplete_member_data_str">
                 Extraction des données du résident en cours
         </text>
         <text name="confirm_group_create_str">
-                La création de ce groupe coûte 100 $L. 
-Êtes-vous vraiment certain de vouloir dépenser 100 $L pour créer ce groupe ?
-Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé à l&apos;avenir.
+                La création de ce groupe coûte 100 L$. 
+Êtes-vous vraiment certain de vouloir dépenser 100 L$ pour créer ce groupe ?
+Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé.
         </text>
         <text>
-                Préférences du Groupe
+                Préférences
         </text>
         <panel name="preferences_container">
-                <check_box label="Afficher dans la recherche" name="show_in_group_list"
-                     tool_tip="Afficher ce groupe dans les résultats de recherche." />
-                <check_box label="Publier sur le web" name="publish_on_web"
-                     tool_tip="Cochez pour publier les informations de ce groupe sur le web." />
-                <check_box label="Inscription libre" name="open_enrollement"
-                     tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe." />
-                <check_box label="Frais d&apos;inscription : $L" name="check_enrollment_fee"
-                     tool_tip="Indique s&apos;il y a des frais d&apos;inscription pour devenir membre." />
-                <spinner name="spin_enrollment_fee"
-                     tool_tip="Lorsque la case Frais d&apos;inscription est cochée, cela signifie qu&apos;il faut payer des frais pour devenir membre." />
-                <check_box label="Adulte" name="mature"
-                     tool_tip="Cochez si les informations de votre groupe sont à caractère adulte." />
-                <combo_box width="195" name="group_mature_check"
-                     tool_tip="Indique si les informations de votre groupe sont considérées comme étant réservées aux adultes.">
-                        <combo_item name="select_mature" >
-                                - Sélectionner Pour adultes -
+                <check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/>
+                <check_box label="Publier sur le web" name="publish_on_web" tool_tip="Cochez pour publier les informations de ce groupe sur le web."/>
+                <check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/>
+                <check_box label="Frais d&apos;inscription : L$" name="check_enrollment_fee" tool_tip="Indique s&apos;il y a des frais d&apos;inscription pour devenir membre."/>
+                <spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d&apos;inscription est cochée, cela signifie qu&apos;il faut payer des frais pour devenir membre."/>
+                <check_box label="Adulte" name="mature" tool_tip="Cochez si les informations de votre groupe sont à caractère adulte."/>
+                <combo_box name="group_mature_check" tool_tip="Indique si les informations de votre groupe sont considérées comme étant réservées aux adultes." width="195">
+                        <combo_item name="select_mature">
+                                - Type de public -
                         </combo_item>
                         <combo_item name="mature">
-                                Contenu pour adultes
+                                Adulte
                         </combo_item>
                         <combo_item name="not_mature">
-                                Contenu non réservé aux adultes
+                                Tout public
                         </combo_item>
                 </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 Mon titre actuel
                         </text>
-                        <combo_box name="active_title"
-                             tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif." />
+                        <combo_box name="active_title" tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif."/>
                 </panel>
-                <check_box label="Recevoir des notes de groupe" name="receive_notices"
-                     tool_tip="Définit si vous souhaitez recevoir les notes envoyées au groupe.  Décochez si ce groupe vous envoie des spams." />
-                <check_box label="Afficher dans mon profil" name="list_groups_in_profile"
-                     tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil" />
+                <check_box label="Recevoir les notices" name="receive_notices" tool_tip="Cochez si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/>
+                <check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil"/>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index df13e89..f22918d 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -1,30 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Inviter un membre" name="invite_panel">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Inviter un résident" name="invite_panel">
         <text>
                 Vous pouvez sélectionner plusieurs résidents
 à inviter dans votre groupe. Cliquez sur &apos;Ouvrir 
 le Sélecteur de Personnes&apos; pour commencer.
         </text>
         <text name="help_text">
-                Vous pouvez inviter plusieurs résidents. 
-Cliquez sur Sélecteur 
-de personnes pour commencer.
+                Vous pouvez inviter plusieurs résidents.
+Pour commencer, cliquez sur
+Choisir un résident.
         </text>
-        <button label="Sélecteur de personnes" name="add_button" tool_tip="" />
-        <name_list name="invitee_list"
-             tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents." />
-        <button label="Supprimer de la liste" name="remove_button"
-             tool_tip="Supprime les résidents sélectionnés de la liste des invités." />
+        <button label="Choisir un résident" name="add_button" tool_tip=""/>
+        <name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents."/>
+        <button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés de la liste des invités."/>
         <text>
-                Choisissez le Rôle à leur attribuer :
+                Assignez-leur un rôle :
         </text>
         <text name="role_text">
                 Assignez-leur un rôle :
         </text>
-        <combo_box name="role_name"
-             tool_tip="Choisissez des rôles à assigner aux membres dans la liste." />
-        <button label="Envoyer des invitations" name="ok_button" />
-        <button label="Annuler" name="cancel_button" />
+        <combo_box name="role_name" tool_tip="Choisissez des rôles à assigner aux membres dans la liste."/>
+        <button label="Envoyer les invitations" name="ok_button"/>
+        <button label="Annuler" name="cancel_button"/>
         <string name="confirm_invite_owner_str">
                 Etes-vous certain de vouloir inviter un/de nouveau(x) propriétaire(s) ? Ce choix est permanent !
         </string>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 6e3d0f8..dfed082 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -1,42 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Terrain &amp; $L" name="land_money_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain et L$" name="land_money_tab">
         <text name="help_text">
-                Les parcelles appartenant au groupe apparaissent avec les détails des contributions.  Un avertissement apparaîtra tant que le Total du terrain utilisé sera inférieur ou égal aux Contributions totales.  Les onglets Planification, Détails et Ventes fournissent des détails sur les finances du groupe.
+                Les parcelles appartenant au groupe sont indiquées avec le détails des contributions. Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. Les onglets Détails et Ventes correspondent aux finances du groupe.
         </text>
-        <button label="?" name="help_button" />
+        <button label="?" name="help_button"/>
         <text name="cant_view_group_land_text">
                 Vous n&apos;avez pas la permission de voir quel terrain possède ce groupe.
         </text>
         <text name="cant_view_group_accounting_text">
-                Vous n&apos;avez pas la permission d&apos;accéder aux informations financières de ce groupe.
+                Vous n&apos;avez pas la permission d&apos;accéder aux informations
+financières de ce groupe.
         </text>
         <string name="loading_txt">
-                Chargement en cours...
+                Chargement...
         </string>
         <text name="group_land_heading">
                 Terrain du groupe
         </text>
         <scroll_list name="group_parcel_list">
-                <column label="Nom de la parcelle" name="name" />
-                <column label="Région" name="location" />
-                <column label="Surface" name="area" />
-                <column label="" name="hidden" />
+                <column label="Nom de la parcelle" name="name"/>
+                <column label="Région" name="location"/>
+                <column label="Surface" name="area"/>
+                <column label="" name="hidden"/>
         </scroll_list>
-        <button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button" />
+        <button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button"/>
         <text name="total_contributed_land_label">
-                Contributions totales :
+                Total des contributions :
         </text>
         <text name="total_contributed_land_value">
                 [AREA] m²
         </text>
         <text name="total_land_in_use_label">
-                Total du terrain utilisé :
+                Superficie déjà utilisée :
         </text>
         <text name="total_land_in_use_value">
                 [AREA] m²
         </text>
         <text name="land_available_label">
-                Terrain disponible :
+                Superficie disponible :
         </text>
         <text name="land_available_value">
                 [AREA] m²
@@ -58,7 +59,7 @@
 charge le terrain utilisé.
         </text>
         <text name="group_money_heading">
-                $L du groupe
+                Finances
         </text>
         <tab_container name="group_money_tab_container">
                 <panel label="Planification" name="group_money_planning_tab">
@@ -70,19 +71,15 @@ charge le terrain utilisé.
                         <text_editor name="group_money_details_text">
                                 Calcul en cours...
                         </text_editor>
-                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt"
-                             name="earlier_details_button" tool_tip="Reculer dans le temps" />
-                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;"
-                             name="later_details_button" tool_tip="Avancer dans le temps" />
+                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_details_button" tool_tip="Reculer dans le temps"/>
+                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_details_button" tool_tip="Avancer dans le temps"/>
                 </panel>
                 <panel label="Ventes" name="group_money_sales_tab">
                         <text_editor name="group_money_sales_text">
                                 Calcul en cours...
                         </text_editor>
-                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt"
-                             name="earlier_sales_button" tool_tip="Reculer dans le temps" />
-                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;"
-                             name="later_sales_button" tool_tip="Avancer dans le temps" />
+                        <button label="&lt; Plus tôt" label_selected="&lt; Plus tôt" name="earlier_sales_button" tool_tip="Reculer dans le temps"/>
+                        <button label="Plus tard &gt;" label_selected="Plus tard &gt;" name="later_sales_button" tool_tip="Avancer dans le temps"/>
                 </panel>
         </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 9ff1456..d824ae5 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -1,70 +1,64 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Notes" name="notices_tab">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notices" name="notices_tab">
         <text name="help_text">
-                Les notes vous permettent d&apos;envoyer des messages et pièces-jointes à tous les membres du groupe en même temps. Ces messages ne sont envoyés qu&apos;aux membres dont le rôle les autorise à recevoir des notes. Vous pouvez désactiver les notes à l&apos;onglet Général.
+                Les notices vous permettent d&apos;envoyer des messages et pièces-jointes aux membres du groupe autorisés à les recevoir. Vous pouvez désactiver la réception des notices à l&apos;onglet Général.
         </text>
         <text name="no_notices_text">
-                Aucune note précédemment envoyée.
+                Aucune notice
         </text>
-        <button label="?" label_selected="?" name="help_button" />
+        <button label="?" label_selected="?" name="help_button"/>
         <text name="lbl">
-                Archive des notes du groupe
+                Anciennes notices du groupe
         </text>
         <text name="lbl2">
-                Les notes sont conservées pendant 14 jours. Cliquez sur la note que vous
-voulez afficher. Pour voir si vous avez reçu de nouvelles notes, cliquez sur
-Rafraîchir. Chaque groupe a une limite quotidienne de 200 notes.
+                Double-cliquez sur une notice pour l'afficher. Les notices sont conservées
+pendant 14 jours et chaque groupe a une limite quotidienne de 200 notices.
         </text>
         <scroll_list name="notice_list">
-                <column label="" name="icon" />
-                <column label="Sujet" name="subject" />
-                <column label="De" name="from" />
-                <column label="Date" name="date" />
+                <column label="" name="icon"/>
+                <column label="Sujet" name="subject"/>
+                <column label="De" name="from"/>
+                <column label="Date" name="date"/>
         </scroll_list>
         <text name="notice_list_none_found">
                 Aucun résultat.
         </text>
-        <button label="Créer une note" label_selected="Créer une note"
-             name="create_new_notice" />
-        <button label="Rafraîchir" label_selected="Rafraîchir la liste"
-             name="refresh_notices" />
-        <panel label="Créer une note" name="panel_create_new_notice">
+        <button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice"/>
+        <button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices"/>
+        <panel label="Créer une notice" name="panel_create_new_notice">
                 <text name="lbl">
-                        Créer une note
+                        Créer une notice
                 </text>
                 <text name="lbl2">
-                        Pour envoyer une note, vous devez saisir un sujet. Pour joindre
-une pièce-jointe à cette note, faites-la glisser depuis votre 
+                        Pour envoyer une notice, saisissez un sujet. Pour joindre
+une pièce-jointe à cette notice, faites-la glisser depuis votre 
 inventaire vers cette fenêtre. Les pièces-jointes doivent être
 copiables et transférables. Il n&apos;est pas possible d&apos;envoyer de
 dossiers.
                 </text>
-                <text name="lbl3" bottom_delta="-79" >
+                <text bottom_delta="-79" name="lbl3" left="20">
                         Sujet :
                 </text>
-                <line_editor name="create_subject" width="346" />
-                <text name="lbl4">
+                <line_editor name="create_subject" width="331" left_delta="61"/>
+                <text name="lbl4" left="20">
                         Message :
                 </text>
-                <text_editor bottom_delta="-90" height="104" name="create_message" />
-                <text name="lbl5">
-                        Attacher :
+                <text_editor name="create_message" bottom_delta="-90" height="104" left_delta="61" width="330"/>
+                <text name="lbl5" width="68">
+                        Pièce-jointe :
                 </text>
-                <line_editor name="create_inventory_name" width="206" />
-                <button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe"
-                     name="remove_attachment" left="274" width="140"/>
-                <button label="Envoyer note" label_selected="Envoyer note" name="send_notice" left="274" width="140"/>
-                <panel name="drop_target2"
-                     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
-                <panel name="drop_target"
-                     tool_tip="Pour joindre un objet de l&apos;inventaire à la note, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la note, vous devez avoir la permission de le copier et de le transférer." />
+                <line_editor name="create_inventory_name" width="190" left_delta="74"/>
+                <button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
+                <button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="140"/>
+                <panel name="drop_target2" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
+                <panel name="drop_target" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l&apos;objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
         </panel>
-        <panel label="Voir ancienne note" name="panel_view_past_notice">
+        <panel label="Voir ancienne notice" name="panel_view_past_notice">
                 <text name="lbl">
-                        Note archivée
+                        Détails
                 </text>
                 <text name="lbl2">
-                        Pour envoyer une nouvelle note, cliquez sur Créer une note ci-dessus.
+                        Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
                 </text>
                 <text name="lbl3">
                         Sujet :
@@ -72,8 +66,7 @@ dossiers.
                 <text name="lbl4">
                         Message :
                 </text>
-                <button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe"
-                     name="open_attachment" width="118" />
-                <line_editor left="128" name="view_inventory_name" width="256" />
+                <button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
+                <line_editor left="128" name="view_inventory_name" width="256"/>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index c6553ea..255083f 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -1,23 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membres et rôles" name="roles_tab">
         <text name="default_needs_apply_text">
                 Certains changements n&apos;ont pas été appliqués sur ce sous-onglet.
         </text>
         <text name="want_apply_text">
-                Voulez-vous les appliquer ?
+                Voulez-vous enregistrer les modifications ?
         </text>
         <text name="cant_delete_role">
-                Les Rôles &apos;Tout le monde&apos; et &apos;Propriétaires&apos; sont particuliers, et ne peuvent être supprimés.
+                Les Rôles Tout le monde et Propriétaires sont spéciaux et ne peuvent être supprimés.
         </text>
-        <button label="?" name="help_button" />
+        <button label="?" name="help_button"/>
         <panel name="members_header">
                 <text name="static">
-                        Membres et rôles
+                        Membres
                 </text>
                 <text name="static2">
-                        Chaque membre reçoit un rôle auquel sont associés certains pouvoirs. Ces
-paramètres peuvent être facilement personnalisés, ce qui permet une
-meilleure organisation et plus de flexibilité.
+                        Les rôles de chaque membre peuvent être personnalisés, ce qui permet une
+meilleure organisation du groupe.
                 </text>
         </panel>
         <panel name="roles_header">
@@ -32,7 +31,7 @@ description et le titre du membre.
                         Sélectionnez un rôle ci-dessous pour en connaître les propriétés, les
 membres et les pouvoirs.
                 </text>
-                <text name="role_actions_modifiable" bottom_delta="-28">
+                <text bottom_delta="-28" name="role_actions_modifiable">
                         Vous pouvez aussi assigner des pouvoirs au rôle.
                 </text>
                 <text name="role_actions_not_modifiable">
@@ -48,52 +47,51 @@ membres et les pouvoirs.
 quels membres ces pouvoirs sont assignés.
                 </text>
         </panel>
-        <tab_container name="roles_tab_container" height="164">
-                <panel label="Membres" name="members_sub_tab" tool_tip="Membres" height="148">
-                        <line_editor bottom="127" name="search_text" />
-                        <button label="Rechercher" name="search_button" width="75" />
-                        <button label="Afficher tout" name="show_all_button" left_delta="80" />
-                        <name_list name="member_list" height="104" bottom_delta="-105">
-                                <column label="Nom du membre" name="name" />
-                                <column label="Terrain donné" name="donated" width="116"/>
+        <tab_container height="164" name="roles_tab_container">
+                <panel height="148" label="Membres" name="members_sub_tab" tool_tip="Membres">
+                        <line_editor bottom="127" name="search_text"/>
+                        <button label="Rechercher" name="search_button" width="75"/>
+                        <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+                        <name_list bottom_delta="-105" height="104" name="member_list">
+                                <column label="Nom du membre" name="name"/>
+                                <column label="Surface donnée" name="donated" width="116"/>
                                 <column label="Dernière connexion" name="online" width="136"/>
                         </name_list>
-                        <button label="Inviter nouvelle personne..." name="member_invite" width="165"/>
-                        <button label="Expulser du groupe" name="member_eject" />
+                        <button label="Inviter un nouveau membre" name="member_invite" width="165"/>
+                        <button label="Expulser un membre" name="member_eject"/>
                         <text name="help_text">
                                 Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
 Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
                         </text>
                 </panel>
-                <panel label="Rôles" name="roles_sub_tab" height="148">
-                <line_editor bottom="127" name="search_text" />
+                <panel height="148" label="Rôles" name="roles_sub_tab">
+                        <line_editor bottom="127" name="search_text"/>
                         <button label="Rechercher" name="search_button" width="75"/>
-                        <button label="Afficher tout" name="show_all_button" left_delta="80"/>
-                        <scroll_list name="role_list" height="104" bottom_delta="-104">
-                                <column label="Nom du rôle" name="name" />
-                                <column label="Titre" name="title" />
-                                <column label="Membres" name="members" />
+                        <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+                        <scroll_list bottom_delta="-104" height="104" name="role_list">
+                                <column label="Nom du rôle" name="name"/>
+                                <column label="Titre" name="title"/>
+                                <column label="Membres" name="members"/>
                         </scroll_list>
-                        <button label="Créer un rôle..." name="role_create" />
-                        <button label="Supprimer le rôle" name="role_delete" />
+                        <button label="Créer un rôle..." name="role_create"/>
+                        <button label="Supprimer le rôle" name="role_delete"/>
                         <text name="help_text">
-                                Chaque rôle a un titre et une liste des pouvoirs assignés aux membres. Chaque membre peut avoir un ou plusieurs rôles. Un groupe peut avoir jusqu&apos;à 10 rôles, y compris les rôles Tous et Propriétaires.
+                                Chaque rôle possède un titre et des pouvoirs. Un membre peut avoir plusieurs rôles mais il ne peut y avoir que 10 rôles dans un groupe, Visiteur et Propriétaire inclus.
                         </text>
                         <string name="cant_delete_role">
                                 Les rôles Tous et Propriétaires sont spéciaux et ne peuvent pas être supprimés.
                         </string>
                 </panel>
-                <panel label="Pouvoirs" name="actions_sub_tab" height="148">
-                        <line_editor bottom="127" name="search_text" />
+                <panel height="148" label="Pouvoirs" name="actions_sub_tab">
+                        <line_editor bottom="127" name="search_text"/>
                         <button label="Rechercher" name="search_button" width="75"/>
-                        <button label="Afficher tout" name="show_all_button" left_delta="80"/>
-                        <scroll_list name="action_list"
-                             tool_tip="Sélectionnez un pouvoir pour en afficher les détails." height="118" bottom_delta="-120">
-                                <column label="" name="icon" />
-                                <column label="" name="action" />
+                        <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+                        <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en afficher les détails.">
+                                <column label="" name="icon"/>
+                                <column label="" name="action"/>
                         </scroll_list>
                         <text name="help_text">
-                                Lorsqu&apos;un membre a des pouvoirs, il peut faire un certain nombre de choses dans le groupe. Il existe un grand nombre de pouvoirs.
+                                Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
                         </text>
                 </panel>
         </tab_container>
@@ -105,13 +103,12 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
                         Pouvoirs attribués
                 </text>
                 <scroll_list name="member_assigned_roles">
-                        <column label="" name="checkbox" />
-                        <column label="" name="role" />
+                        <column label="" name="checkbox"/>
+                        <column label="" name="role"/>
                 </scroll_list>
-                <scroll_list name="member_allowed_actions"
-                     tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-                        <column label="" name="icon" />
-                        <column label="" name="action" />
+                <scroll_list name="member_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
+                        <column label="" name="icon"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="roles_footer">
@@ -136,17 +133,14 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
                 <text name="static4">
                         Membres assignés
                 </text>
-                <text name="static5"
-                     tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
+                <text name="static5" tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
                         Pouvoirs attribués
                 </text>
-                <check_box label="Les membres sont &#10;visibles" name="role_visible_in_list"
-                     tool_tip="Définit si les membres de ce rôle sont visibles à partir de l&apos;onglet Général aux personnes en dehors du groupe." />
-                <scroll_list name="role_allowed_actions"
-                     tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
-                        <column label="" name="icon" />
-                        <column label="" name="checkbox" />
-                        <column label="" name="action" />
+                <check_box label="Membres visibles" name="role_visible_in_list" tool_tip="Définit si les membres de ce rôle sont visibles à partir de l&apos;onglet Général aux personnes en dehors du groupe."/>
+                <scroll_list name="role_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l&apos;onglet Pouvoirs.">
+                        <column label="" name="icon"/>
+                        <column label="" name="checkbox"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="actions_footer">
@@ -154,13 +148,13 @@ Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la to
                         Description
                 </text>
                 <text_editor name="action_description">
-                        Ce pouvoir permet d&apos; « expulser les membres de ce groupe ». Seul un propriétaire peut expulser un autre propriétaire.
+                        Ce pouvoir permet d&apos;expulser des membres du groupe. Seul un propriétaire peut expulser un autre propriétaire.
                 </text_editor>
                 <text name="static2">
-                        Rôles avec pouvoirs
+                        Rôles avec ce pouvoir
                 </text>
                 <text name="static3">
-                        Membres avec pouvoirs
+                        Membres avec ce pouvoir
                 </text>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
index 4db861a..a19ba53 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Propositions" name="voting_tab">
         <text name="help_text">
                 Les propositions de groupe permettent d&apos;en savoir plus sur les objectifs du groupe ou son avis sur un sujet donné. Si vous avez les pouvoirs requis, vous pouvez créer des propositions, voter et accéder à d&apos;anciennes propositions.
         </text>
-        <button label="?" name="help_button" />
+        <button label="?" name="help_button"/>
         <text name="proposal_header">
-                Propositions du groupe actives
+                Propositions du groupe en cours
         </text>
         <text name="proposal_voting_lbl">
                 Proposition                                                      Fin du vote                      Votée ?
         </text>
         <text name="proposals_header_view_txt">
-                Propositions du groupe actives
+                Propositions en cours
         </text>
         <string name="proposals_header_view_inst">
                 Double-cliquez sur la proposition pour laquelle vous aimeriez voter
@@ -38,66 +38,59 @@ ou abstenez-vous en cliquant sur M&apos;abstenir.
                 La proposition que vous essayez de créer est vide. Veuillez saisir une description avant de créer la proposition.
         </text>
         <text name="proposal_instructions">
-                Double-cliquez sur la proposition sur laquelle vous voulez voter ou cliquez sur Créer une nouvelle proposition pour en créer une nouvelle.
+                Double-cliquez sur la proposition sur laquelle vous voulez voter ou cliquez
+sur Créer une nouvelle proposition pour en créer une nouvelle.
         </text>
         <text name="proposal_lbl">
                 Description de la proposition
         </text>
-        <button label="Créer une proposition" label_selected="Créer une proposition"
-             name="btn_proposal" />
-        <button label="Afficher la proposition" label_selected="Afficher la proposition"
-             name="btn_view_proposal_item" />
-        <button label="Afficher la liste" label_selected="Afficher la liste"
-             name="btn_view_proposal_list" />
+        <button label="Créer une proposition" label_selected="Créer une proposition" name="btn_proposal"/>
+        <button label="Afficher la proposition" label_selected="Afficher la proposition" name="btn_view_proposal_item"/>
+        <button label="Afficher la liste" label_selected="Afficher la liste" name="btn_view_proposal_list"/>
         <text name="quorum_lbl">
                 Quorum :
         </text>
-        <spinner name="quorum"
-             tool_tip="Nombre total de votants nécessaires pour que les résultats de l&apos;élection soient valides." />
+        <spinner name="quorum" tool_tip="Nombre total de votants nécessaires pour que les résultats soient valides."/>
         <text name="quorum_text">
                 sur [MEMBERS] membres doivent voter.
         </text>
         <text name="duration_lbl">
                 Durée :
         </text>
-        <spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)." />
+        <spinner name="duration" tool_tip="Durée du vote (en nombre de jours)."/>
         <text name="duration_text">
                 jours
         </text>
-        <radio_group name="majority" left="296"
-             tool_tip="Majorité de tous les votes nécessaires pour remporter l&apos;élection.">
+        <radio_group left="296" name="majority" tool_tip="Majorité de tous les votes nécessaires pour remporter le vote.">
                 Majorité simple
                 Majorité des 2/3
                 Unanimité
         </radio_group>
         <text name="start_lbl">
-                Début du vote :
+                Début :
         </text>
         <text name="end_lbl">
-                Fin du vote :
-        </text>
-        <button label="Soumettre la proposition" label_selected="Soumettre la proposition"
-             name="btn_submit" width="150" left="170" />
-        <button label="Annuler" label_selected="Annuler" name="btn_cancel" left_delta="158"/>
-        <button label="Oui" label_selected="Oui" name="btn_yes" width="70" left="183" font="SansSerifSmall" />
-        <button label="Non" label_selected="Non" name="btn_no" width="70" left_delta="77" font="SansSerifSmall"/>
-        <button label="M&apos;abstenir" label_selected="M&apos;abstenir" name="btn_abstain" width="70" left_delta="77" font="SansSerifSmall"/>
-        <text name="txt" left="7">
-                Historique des votes du groupe
-        </text>
-        <text name="instructions" left="7" width="405">
+                Fin :
+        </text>
+        <button label="Soumettre" label_selected="Soumettre" left="170" name="btn_submit" width="100"/>
+        <button label="Annuler" label_selected="Annuler" left_delta="158" name="btn_cancel"/>
+        <button font="SansSerifSmall" label="Oui" label_selected="Oui" left="205" name="btn_yes" width="60"/>
+        <button font="SansSerifSmall" label="Non" label_selected="Non" left_delta="66" name="btn_no" width="60"/>
+        <button font="SansSerifSmall" label="M&apos;abstenir" label_selected="M&apos;abstenir" left_delta="66" name="btn_abstain" width="70"/>
+        <text left="7" name="txt">
+                Historique des votes
+        </text>
+        <text left="7" name="instructions" width="405">
                 Double-cliquez sur un ancien vote ou sélectionnez-en un pour voir les résultats.
         </text>
         <text name="history_list_lbl">
                 Ancien vote                                                      Fin du vote
         </text>
-        <button label="Afficher la proposition" label_selected="Afficher la proposition"
-             name="btn_view_history_item" width="160" left="247"/>
+        <button label="Afficher la proposition" label_selected="Afficher la proposition" left="247" name="btn_view_history_item" width="160"/>
         <text name="vote_text_lbl">
                 Résultats du vote :
         </text>
-        <button label="Afficher la liste" label_selected="Afficher la liste"
-             name="btn_view_history_list" />
+        <button label="Afficher la liste" label_selected="Afficher la liste" name="btn_view_history_list"/>
         <string name="proposals_submit_yes_txt">
                 Soumission du Oui en cours...
         </string>
@@ -111,9 +104,9 @@ ou abstenez-vous en cliquant sur M&apos;abstenir.
                 Soumission de la nouvelle proposition en cours...
         </string>
         <string name="vote_recorded">
-                Votre vote a été reçu.
+                Votre vote a bien été reçu.
         </string>
         <string name="vote_previously_recorded">
-                Vous avez déjà voté. Vous ne pouvez voter qu&apos;une fois au cours d&apos;une élection.
+                Vous avez déjà voté. Vous ne pouvez voter qu&apos;une seule fois sur une proposition.
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_groups.xml b/linden/indra/newview/skins/default/xui/fr/panel_groups.xml
index 641cedd..9832065 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_groups.xml
@@ -1,18 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="groups">
-        <scroll_list bottom="50" name="group list" />
-        <text name="groupdesc" bottom="16" height="32" width="268">
-                Le groupe dans lequel vous êtes actif en ce moment
-est en gras.
+        <scroll_list bottom="50" name="group list"/>
+        <text bottom="16" height="32" name="groupdesc" width="268">
+                Le groupe actif est en gras.
         </text>
-        <text name="groupcount" bottom="3" >
-                Vous appartenez à [COUNT] groupes (sur [MAX] maximum).
+        <text bottom="3" name="groupcount">
+                Vous appartenez à [COUNT] groupes ([MAX] max).
         </text>
-        <button label="IM/Appel" name="IM"
-             tool_tip="Ouvrir une session de messagerie instantanée" />
-        <button label="Infos" name="Info" />
-        <button label="Activer" name="Activate" />
-        <button label="Quitter" name="Leave" />
-        <button label="Créer..." name="Create" />
-        <button label="Rechercher..." name="Search..." />
+        <button label="IM/Appel" name="IM" tool_tip="Ouvrir une session de messagerie instantanée"/>
+        <button label="Infos" name="Info"/>
+        <button label="Activer" name="Activate"/>
+        <button label="Quitter" name="Leave"/>
+        <button label="Créer..." name="Create"/>
+        <button label="Rechercher..." name="Search..."/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_login.xml b/linden/indra/newview/skins/default/xui/fr/panel_login.xml
index c155e13..1769778 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
         <string name="forgot_password_url">
                 http://secondlife.com/account/request.php
@@ -17,7 +17,7 @@
         </text>
         <combo_box name="start_location_combo">
                 <combo_item name="MyHome">
-                        Mon domicile
+                        Domicile
                 </combo_item>
                 <combo_item name="MyLastLocation">
                         Dernier emplacement
@@ -29,16 +29,14 @@
                         &lt;Nom de la région&gt;
                 </combo_item>
         </combo_box>
-        <check_box label="Enregistrer le mot de passe" name="remember_check" />
+        <check_box label="Mémoriser" name="remember_check"/>
         <text name="full_screen_text">
                 Le plein écran sera activé après identification.
         </text>
-        <button label="Nouveau Compte..." label_selected="Nouveau Compte..."
-             name="new_account_btn" />
-        <button label="Me connecter" label_selected="Me connecter" name="connect_btn" />
-        <button label="Préférences..." label_selected="Préférences..."
-             name="preferences_btn" />
-        <button label="Quitter" label_selected="Quitter" name="quit_btn" />
+        <button label="Nouveau Compte..." label_selected="Nouveau Compte..." name="new_account_btn"/>
+        <button label="Me connecter" label_selected="Me connecter" name="connect_btn"/>
+        <button label="Préférences..." label_selected="Préférences..." name="preferences_btn"/>
+        <button label="Quitter" label_selected="Quitter" name="quit_btn"/>
         <text name="version_text">
                 1.23.4 (5)
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml b/linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml
index d8d7726..3cb8558 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="master_volume">
-        <button name="volume"
-             tool_tip="Contrôle du volume master, cliquez pour ouvrir les paramètres" />
-        <volume_slider name="volume_slider" tool_tip="Réglez le volume à l&apos;aide de ce curseur." />
+        <button name="volume" tool_tip="Contrôle du volume principal, cliquez pour ouvrir les paramètres"/>
+        <volume_slider name="volume_slider" tool_tip="Réglez le volume à l&apos;aide de ce curseur."/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
index 7b601b4..172aa65 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="media_controls">
-        <icon name="music_icon" tool_tip="Jouer/pauser le flux musical" />
-        <button name="music_play" tool_tip="Jouer/pauser le flux musical" />
-        <button name="music_stop" tool_tip="Arrêter le flux musical" />
-        <icon name="media_icon" tool_tip="Jouer/pauser le flux musical" />
-        <button name="media_play" tool_tip="Jouer/pauser le flux musical" />
-        <button name="media_pause" tool_tip="Pauser le flux de média" />
-        <button name="media_stop" tool_tip="Arrêter le flux de média" />
-        <volume_slider name="volume_slider" tool_tip="Volume master" />
-        <button name="mute_master" tool_tip="Master muet" />
-        <button name="expand" tool_tip="Ajuster les niveaux de volume individuels" />
+        <icon name="music_icon" tool_tip="Jouez le flux musical"/>
+        <button name="music_play" tool_tip="Jouez le flux musical"/>
+        <button name="music_pause" tool_tip="Mettez le flux musical en pause"/>
+        <button name="music_stop" tool_tip="Arrêtez le flux musical"/>
+        <icon name="media_icon" tool_tip="Jouez le flux musical"/>
+        <button name="media_play" tool_tip="Jouez le flux musical"/>
+        <button name="media_pause" tool_tip="Mettez le flux de média en pause"/>
+        <button name="media_stop" tool_tip="Arrêtez le flux de média"/>
+        <volume_slider name="volume_slider" tool_tip="Volume principal"/>
+        <button name="mute_master" tool_tip="Coupez le volume principal"/>
+        <button name="expand" tool_tip="Ajustez les niveaux de volume individuels"/>
         <string name="play_label">
                 Jouer
         </string>
@@ -17,7 +18,7 @@
                 Stop
         </string>
         <string name="pause_label">
-                Pauser
+                Mettre en pause
         </string>
         <string name="default_tooltip_label">
                 Aucun média spécifié
@@ -26,12 +27,12 @@
                 (URL cachée par le propriétaire de la parcelle)
         </string>
         <string name="media_icon_tooltip_web">
-                Il y a du contenu  web à cet endroit. Cliquez sur Jouer pour afficher le contenu web.
+                Cet endroit propose du contenu Web. Cliquez sur Jouer pour afficher le contenu web.
         </string>
         <string name="media_icon_tooltip_movie">
-                Il y a du contenu vidéo à cet endroit. Cliquez sur Jouer pour lire la vidéo.
+                Cet endroit propose du contenu vidéo. Cliquez sur Jouer pour lire la vidéo.
         </string>
         <string name="media_play_tooltip">
-                Afficher le contenu web qui se trouve ici.
+                Affichez le contenu web.
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
index 20174d9..d2ee33a 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="music_remote">
-        <text type="string" length="1" name="text">
+        <text length="1" name="text" type="string">
                 Vidéo
         </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" />
+        <button label="" label_selected="" name="stop_btn" tool_tip="Arrêter le média"/>
+        <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/default/xui/fr/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
index 17f5825..5a28237 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="media_remote">
-        <panel label="Audio et Vidéo" name="Volume Panel" />
+        <panel label="Audio et Vidéo" name="Volume Panel"/>
         <string name="play_label">
                 Jouer
         </string>
@@ -17,7 +17,7 @@
                 (URL cachée par le propriétaire de la parcelle)
         </string>
         <string name="media_icon_tooltip_web">
-                Il y a du contenu  web à cet endroit. Cliquez sur Jouer pour afficher le contenu web.
+                Il y a du contenu web à cet endroit. Cliquez sur Jouer pour afficher le contenu web.
         </string>
         <string name="media_icon_tooltip_movie">
                 Il y a du contenu vidéo à cet endroit. Cliquez sur Jouer pour lire la vidéo.
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
index 61ebfb2..66bfe95 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
@@ -1,20 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="overlay">
         <layout_stack name="overlay_layout_panel">
-                <layout_panel name="main_panel">
-                        <layout_stack name="chatbar_and_buttons">
-                                <layout_panel name="state_buttons">
-                                        <button label="IM reçus" label_selected="IM reçus" name="IM Received"
-                                             tool_tip="Vous avez reçu un message instantané. Cliquez pour afficher les IM." />
-                                        <button label="Disponible"
-                                             label_selected="Disponible" name="Set Not Busy"
-                                             tool_tip="Le chat et les IM ne s&apos;affichent pas. Cliquez ici pour ne pas apparaître occupé(e)." />
-                                        <button label="Vue subjective" label_selected="Vue subjective" name="Mouselook"
-                                             tool_tip="Utilisez la souris pour diriger votre vue. Si vous avez un pistolet, vous pouvez tirer en cliquant." />
-                                        <button label="Me lever" label_selected="Me lever" name="Stand Up"
-                                             tool_tip="Cliquez ici pour vous lever." />
+                <layout_panel name="main_panel" width="410" min_width="410">
+                        <layout_stack name="chatbar_and_buttons" right="410">
+                                <layout_panel name="padding" width="410" />
+                                <layout_panel name="state_buttons" width="410">
+                                        <button label="IM reçus" label_selected="IM reçus" name="IM Received" tool_tip="Vous avez reçu des messages instantanés. Cliquez pour afficher les IM."/>
+                                        <button label="Disponible" label_selected="Disponible" name="Set Not Busy" tool_tip="Le chat et les IM ne s&apos;affichent pas. Cliquez ici pour ne plus être en mode occupé(e)."/>
+                                        <button label="Vue subjective" label_selected="Vue subjective" name="Mouselook" tool_tip="Utilisez la souris pour diriger votre vue. Si vous avez un pistolet, vous pouvez tirer en cliquant."/>
+                                        <button label="Me lever" label_selected="Me lever" name="Stand Up" tool_tip="Cliquez ici pour vous lever."/>
                                 </layout_panel>
+                                <layout_panel name="chat_bar" />
                         </layout_stack>
                 </layout_panel>
+                <layout_panel name="media_remote_container" width="220" min_width="220" />
+                <layout_panel name="voice_remote_container" width="140" min_width="138" />
         </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_place.xml b/linden/indra/newview/skins/default/xui/fr/panel_place.xml
index af3378a..4669c71 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_place.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Place" title="Emplacement">
         <text name="name_label">
                 Nom :
@@ -9,14 +9,14 @@
         <text name="information_label">
                 Informations :
         </text>
-        <text left="103" name="info_editor" width="338" />
+        <text left="103" name="info_editor" width="338"/>
         <text name="location_label">
                 Emplacement :
         </text>
-        <text left="103" name="location_editor" width="338" />
-        <button label="Téléporter" name="teleport_btn" />
-        <button label="Voir sur la carte" name="map_btn" />
-        <button label="Enchères..." name="auction_btn" />
+        <text left="103" name="location_editor" width="338"/>
+        <button label="Téléporter" name="teleport_btn"/>
+        <button label="Voir sur la carte" name="map_btn"/>
+        <button label="Enchères..." name="auction_btn"/>
         <string name="traffic_text">
                 Trafic : [TRAFFIC]
         </string>
@@ -24,18 +24,18 @@
                 Surface : [AREA] m²
         </string>
         <string name="forsale_text">
-                En vente pour [PRICE] $L
+                En vente pour [PRICE] L$
         </string>
         <string name="auction_text">
                 Code de l&apos;enchère [ID].
         </string>
         <string name="server_update_text">
-                Les informations sur l&apos;emplacement ne sont pas disponibles sans mise à jour du serveur.
+                Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
         </string>
         <string name="server_error_text">
-                Aucune information sur cet emplacement n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
+                Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
         </string>
         <string name="server_forbidden_text">
-                Les informations sur cet emplacement ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos permissions avec le propriétaire de la parcelle.
+                Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos permissions avec le propriétaire de la parcelle.
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml b/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
index af3378a..aa89576 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Place" title="Emplacement">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Place" title="Lieu">
         <text name="name_label">
                 Nom :
         </text>
@@ -9,14 +9,14 @@
         <text name="information_label">
                 Informations :
         </text>
-        <text left="103" name="info_editor" width="338" />
+        <text left="103" name="info_editor" width="338"/>
         <text name="location_label">
-                Emplacement :
+                Lieu :
         </text>
-        <text left="103" name="location_editor" width="338" />
-        <button label="Téléporter" name="teleport_btn" />
-        <button label="Voir sur la carte" name="map_btn" />
-        <button label="Enchères..." name="auction_btn" />
+        <text left="103" name="location_editor" width="338"/>
+        <button label="Téléporter" name="teleport_btn"/>
+        <button label="Voir sur la carte" name="map_btn"/>
+        <button label="Enchères..." name="auction_btn"/>
         <string name="traffic_text">
                 Trafic : [TRAFFIC]
         </string>
@@ -24,18 +24,18 @@
                 Surface : [AREA] m²
         </string>
         <string name="forsale_text">
-                En vente pour [PRICE] $L
+                En vente pour [PRICE] L$
         </string>
         <string name="auction_text">
                 Code de l&apos;enchère [ID].
         </string>
         <string name="server_update_text">
-                Les informations sur l&apos;emplacement ne sont pas disponibles sans mise à jour du serveur.
+                Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
         </string>
         <string name="server_error_text">
-                Aucune information sur cet emplacement n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
+                Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
         </string>
         <string name="server_forbidden_text">
-                Les informations sur cet emplacement ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos permissions avec le propriétaire de la parcelle.
+                Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos permissions avec le propriétaire de la parcelle.
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
index dcfb518..925f404 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
@@ -1,29 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Audio et Vidéo" name="Media panel">
-        <text type="string" length="1" name="muting_text">
+        <text length="1" name="muting_text" type="string">
                 Volume :
         </text>
-        <panel left="159" name="Volume Panel" width="249" />
-        <check_box label="Désactiver le son" name="disable audio" />
-        <text name="streaming_prefs_text" width="145" bottom="-195" >
-                Préférences de flux continu :
+        <panel left="159" name="Volume Panel" width="249"/>
+        <check_box label="Couper le son" name="disable audio"/>
+        <text bottom="-195" name="streaming_prefs_text" width="145">
+                Média :
         </text>
         <text name="audio_prefs_text">
-                Préférences audio :
+                Audio :
         </text>
-        <panel label="Volume" name="Volume Panel" />
-        <check_box label="Désactiver le son lorsque la fenêtre est minimisée"
-             name="mute_when_minimized"  left="159" />
-        <check_box
-             label="Jouer des flux musicaux quand cela est possible&#10;(gourmand en bande passante)"
-             name="streaming_music" left="159" bottom="-200" height="32" />
-        <check_box
-             label="Jouer des flux médias quand cela est possible&#10;(gourmand en bande passante)"
-             name="streaming_video" left="159" bottom_delta="-32" height="32" />
-        <check_box label="Lire automatiquement le média" name="auto_streaming_video" left="179" bottom_delta="-32" />
-        <slider label="Effet Doppler" name="Doppler Effect" left="165" label_width="115" />
-        <slider label="Facteur d&apos;éloignement" name="Distance Factor" left="165" label_width="115" />
-        <slider label="Facteur d&apos;atténuation" name="Rolloff Factor" left="165" label_width="115" />
-        <spinner label="Alerte dépenses" name="L$ Change Threshold" left="165" />
-        <spinner label="Alerte santé" name="Health Change Threshold" left="165" />
+        <panel label="Volume" name="Volume Panel"/>
+        <check_box label="Couper le son lorsque la fenêtre est minimisée" left="159" name="mute_when_minimized"/>
+        <check_box bottom="-200" height="32" label="Jouer la musique disponible&#10;
+(consommateur en bande passante)" left="159" name="streaming_music"/>
+        <check_box bottom_delta="-32" height="32" label="Jouer le média disponible&#10;
+(consommateur en bande passante)" left="159" name="streaming_video"/>
+        <check_box bottom_delta="-32" label="Lire automatiquement le média" left="179" name="auto_streaming_video"/>
+        <slider label="Effet Doppler" label_width="115" left="165" name="Doppler Effect"/>
+        <slider label="Facteur d&apos;éloignement" label_width="115" left="165" name="Distance Factor"/>
+        <slider label="Facteur d&apos;atténuation" label_width="115" left="165" name="Rolloff Factor"/>
+        <spinner label="Alerte L$" left="165" name="L$ Change Threshold"/>
+        <spinner label="Alerte santé" left="165" name="Health Change Threshold"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index ceaa458..d29ec67 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,66 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-        <text type="string" length="1" name="text_box">
+        <text length="1" name="text_box" type="string">
                 Taille de la police 
 du chat :
         </text>
-        <radio_group name="chat font size">
-                <radio_item type="string" length="1" name="radio">
+        <radio_group name="chat_font_size">
+                <radio_item length="1" name="radio" type="string">
                         Petite
                 </radio_item>
-                <radio_item type="string" length="1" name="radio2">
+                <radio_item length="1" name="radio2" type="string">
                         Moyenne
                 </radio_item>
-                <radio_item type="string" length="1" name="radio3">
+                <radio_item length="1" name="radio3" type="string">
                         Grande
                 </radio_item>
         </radio_group>
-        <text type="string" length="1" name="text_box2">
+        <text length="1" name="text_box2" type="string">
                 Couleur du chat :
         </text>
-        <color_swatch label="Vous" name="user" />
-        <color_swatch label="Les autres" name="agent" width="60" />
-        <color_swatch label="IM" left_delta="64" name="im" />
-        <color_swatch label="Système" name="system" />
-        <color_swatch label="Erreurs" name="script_error" />
-        <color_swatch label="Objets" name="objects" />
-        <color_swatch label="Propriétaire" name="owner" width="60" />
-        <color_swatch label="Bulle" left_delta="64" name="background" />
-        <color_swatch label="URL" name="links" />
-        <text type="string" length="1" name="text_box3">
+        <color_swatch label="Vous" name="user"/>
+        <color_swatch label="Avatars" name="agent" width="60"/>
+        <color_swatch label="IM" left_delta="64" name="im"/>
+        <color_swatch label="Système" name="system"/>
+        <color_swatch label="Erreurs" name="script_error"/>
+        <color_swatch label="Objets" name="objects"/>
+        <color_swatch label="Propriétaire" name="owner" width="60"/>
+        <color_swatch label="Bulle" left_delta="64" name="background"/>
+        <color_swatch label="URL" name="links"/>
+        <text length="1" name="text_box3" type="string">
                 Console du chat :
         </text>
-        <spinner label="Effacer le texte après" label_width="112" name="fade_chat_time"
-             width="162" />
-        <text type="string" length="1" left="313" name="text_box4">
+        <spinner label="Effacer le texte après" label_width="112" name="fade_chat_time" width="162"/>
+        <text left="313" length="1" name="text_box4" type="string">
                 s
         </text>
-        <spinner left="335" name="max_chat_count" />
-        <text type="string" length="1" left="397" name="text_box5" width="74">
-                (nb de lignes)
+        <spinner left="335" name="max_chat_count"/>
+        <text left="397" length="1" name="text_box5" type="string" width="74">
+                lignes
         </text>
-        <slider label="Opacité" name="console_opacity" />
-        <text type="string" length="1" name="text_box6">
+        <slider label="Opacité" name="console_opacity"/>
+        <text length="1" name="text_box6" type="string">
                 Options du chat :
         </text>
-        <check_box label="Utiliser la largeur du plein écran (redémarrage requis)"
-             name="chat_full_width_check" />
-        <check_box label="Fermer le chat après avoir appuyé sur Entrée"
-             name="close_chat_on_return_check" />
-        <check_box label="Faire bouger l&apos;avatar avec les touches de direction"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Afficher les marques temporelles dans le chat local"
-             name="show_timestamps_check" />
-        <check_box label="Montrer lorsque vous écrivez pendant la discussion"
-             name="play_typing_animation" />
-        <text type="string" length="1" name="text_box7">
+        <check_box label="Utiliser la largeur de l&apos;écran (redémarrage requis)" name="chat_full_width_check"/>
+        <check_box label="Fermer le chat après avoir appuyé sur Entrée" name="close_chat_on_return_check"/>
+        <check_box label="Faire bouger l&apos;avatar avec les touches de direction" name="arrow_keys_move_avatar_check"/>
+        <check_box label="Afficher les heures dans le chat" name="show_timestamps_check"/>
+        <check_box label="Jouer l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+        <text length="1" name="text_box7" type="string">
                 Bulles de chat  :
         </text>
-        <check_box label="Afficher les bulles de chat" name="bubble_text_chat" />
-        <slider label="Opacité" name="bubble_chat_opacity" />
-        <text type="string" length="1" name="text_box8">
+        <check_box label="Afficher les bulles de chat" name="bubble_text_chat"/>
+        <slider label="Opacité" name="bubble_chat_opacity"/>
+        <text length="1" name="text_box8" type="string">
                 Erreurs de script :
         </text>
-        <check_box label="Afficher les erreurs et avertissements comme chat ordinaire"
-             name="script_errors_as_chat" />
+        <check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index cbcc7b0..b9d075b 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Général" name="general_panel">
-        <combo_box name="location_combobox" width="166">
-                <combo_item name="MyHome">
-                        Mon domicile
-                </combo_item>
-                <combo_item name="MyLastLocation">
-                        Mon dernier emplacement
-                </combo_item>
-        </combo_box>
-        <check_box label="Afficher le lieu de départ sur l&apos;écran de connexion"
-             name="show_location_checkbox" />
+        <radio_group name="default_start_location" width="166">
+                <radio_item name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ.">
+                        Domicile
+                </radio_item>
+                <radio_item name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ.">
+                        Dernier emplacement
+                </radio_item>
+        </radio_group>
+        <check_box label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
         <combo_box name="fade_out_combobox" width="166">
                 <combo_item name="Never">
                         Jamais
@@ -21,79 +20,56 @@
                         Toujours
                 </combo_item>
         </combo_box>
-        <check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox" />
+        <check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
+        <check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
         <text name="group_titles_textbox">
                 Titres de groupe :
         </text>
-        <check_box label="Masquer tous les titres de groupe"
-             name="show_all_title_checkbox" />
-        <check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox" />
-        <check_box label="Nom de l&apos;avatar en petit" name="small_avatar_names_checkbox" />
-        <check_box label="M&apos;avertir lorsque mes amis se connectent"
-             name="friends_online_notify_checkbox" />
+        <check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
+        <check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
+        <color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
         <text name="UI Size:">
                 Taille de l&apos;interface :
         </text>
-        <check_box label="Utiliser une échelle indépendante de la résolution"
-             name="ui_auto_scale" />
-        <check_box label="Faire pivoter la mini-carte" name="rotate_mini_map_checkbox" />
-        <check_box label="M&apos;avertir lorsque je dépense ou reçois des dollars Linden ($L)"
-             name="notify_money_change_checkbox" />
-        <check_box label="Détecter carte graphique au prochain démarrage"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life configure automatiquement certains réglages de la carte graphique d&apos;après votre configuration matérielle. Nous vous recommandons d&apos;effectuer la détection à chaque nouvelle installation de matériel." />
-        <check_box label="Utiliser le sélecteur de couleur par défaut"
-             name="use_system_color_picker_checkbox"
-             tool_tip="Utiliser le sélecteur de couleur par défaut au lieu de celui intégré à Second Life." />
-        <check_box label="Afficher la boîte de recherche en haut à droite de l&apos;écran"
-             name="show_search_panel"
-             tool_tip="Affiche la boîte de recherche incorporée." />
-        <text type="string" length="1" name="start_location_textbox">
+        <slider name="ui_scale_slider"/>
+        <check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
+        <spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
+        <check_box label="Pivoter la mini-carte" name="rotate_mini_map_checkbox"/>
+        <check_box label="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
+        <check_box label="Utiliser le sélecteur de couleur par défaut" name="use_system_color_picker_checkbox" tool_tip="Utiliser le sélecteur de couleur par défaut au lieu de celui intégré à Second Life."/>
+        <check_box label="Afficher la boîte de recherche en haut à droite de l&apos;écran" name="show_search_panel" tool_tip="Affiche la boîte de recherche incorporée."/>
+        <text length="1" name="start_location_textbox" type="string">
                 Lieu de départ :
         </text>
-        <text type="string" length="1" name="show_names_textbox">
+        <text length="1" name="show_names_textbox" type="string">
                 Afficher les noms :
         </text>
-        <text type="string" length="1" name="effects_color_textbox">
-                Couleur de mes effets :
+        <text bottom="-174" length="1" name="effects_color_textbox" type="string">
+                Couleur du faisceau &#10;de sélection :
         </text>
-        <text type="string" length="1" name="seconds_textbox">
+        <text length="1" name="seconds_textbox" type="string">
                 secondes
         </text>
-        <text type="string" length="1" name="crash_report_textbox">
+        <text length="1" name="crash_report_textbox" type="string">
                 Rapports de crash :
         </text>
-        <text type="string" length="1" name="language_textbox">
+        <text length="1" name="language_textbox" type="string">
                 Langue :
         </text>
-        <text type="string" length="1" left_delta="313" name="language_textbox2">
-                (nécessite un redémarrage)
+        <text left_delta="313" length="1" name="language_textbox2" type="string">
+                (redémarrage requis)
         </text>
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        Jamais
-                </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        Temporairement
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        Toujours
-                </radio_item>
-        </radio_group>
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
-        <spinner label="Absent(e) après :" name="afk_timeout_spinner" />
-        <text name="region_name_prompt">
+        <string name="region_name_prompt">
                 &lt;Saisissez le nom de la région&gt;
-        </text>
+        </string>
         <combo_box name="crash_behavior_combobox" width="166">
-                <combo_item type="string" length="1" name="Askbeforesending">
+                <combo_item length="1" name="Askbeforesending" type="string">
                         Demander avant d&apos;envoyer
                 </combo_item>
-                <combo_item type="string" length="1" name="Alwayssend">
+                <combo_item length="1" name="Alwayssend" type="string">
                         Toujours envoyer
                 </combo_item>
-                <combo_item type="string" length="1" name="Neversend">
+                <combo_item length="1" name="Neversend" type="string">
                         Ne jamais envoyer
                 </combo_item>
         </combo_box>
@@ -101,31 +77,39 @@
                 <combo_item name="System Default Language">
                         Choix par défaut
                 </combo_item>
-                <combo_item type="string" length="1" name="English">
-                        Anglais
+                <combo_item length="1" name="English" type="string">
+                        English (Anglais)
                 </combo_item>
-                <combo_item type="string" length="1" name="Deutsch(German)">
+                <combo_item length="1" name="Danish" type="string">
+                        Dansk (Danois) - Bêta
+                </combo_item>
+                <combo_item length="1" name="Deutsch(German)" type="string">
                         Deutsch (Allemand) - Bêta
                 </combo_item>
+                <combo_item name="Spanish">
+                        Español (Espagnol) - Bêta
+                </combo_item>
                 <combo_item name="French">
                         Français - Bêta
                 </combo_item>
-                <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japonais) - Bêta
-                </combo_item>
-                <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Coréen) - Bêta
+                <combo_item name="Hungarian">
+                        Magyar (Hongrois) - Bêta
                 </combo_item>
-                <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語 (Chinois) - Bêta
+                <combo_item name="Polish">
+                        Polski (Polonais) - Bêta
                 </combo_item>
                 <combo_item name="Portugese">
                         Portugués (Portugais) - Bêta
                 </combo_item>
-                <combo_item name="Spanish">
-                        Español (Espagnol) - Bêta
+                <combo_item length="1" name="Chinese" type="string">
+                        中文 (简体) (Chinois) - Bêta
+                </combo_item>
+                <combo_item length="1" name="(Japanese)" type="string">
+                        日本語 (Japonais) - Bêta
+                </combo_item>
+                <combo_item length="1" name="(Korean)" type="string">
+                        한국어 (Coréen) - Bêta
                 </combo_item>
         </combo_box>
-        <check_box label="Partager la langue avec les objets" name="language_is_public"
-             tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite." />
+        <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index b9415f6..27825b7 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
-        <button label="?" name="GraphicsPreferencesHelpButton" />
+        <button label="?" name="GraphicsPreferencesHelpButton"/>
         <text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
-                Si cette option n&apos;est pas cochée, le visualisateur prend tout l&apos;écran lorsque vous êtes connecté(e).
+                Décochez cette option pour passer en mode plein écran.
         </text_editor>
         <text name="WindowSizeLabel">
                 Taille de la fenêtre :
@@ -31,42 +31,42 @@
                 Rapport hauteur/largeur :
         </text>
         <combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-                <combo_item type="string" length="1" name="4:3(StandardCRT)">
+                <combo_item length="1" name="4:3(StandardCRT)" type="string">
                         4:3 (Standard CRT)
                 </combo_item>
-                <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+                <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
                         5:4 (1280 x 1024 LCD)
                 </combo_item>
                 <combo_item name="8:5(Widescreen)">
-                        8 : 5 (écran large)
+                        8:5 (écran large)
                 </combo_item>
-                <combo_item type="string" length="1" name="16:9(Widescreen)">
+                <combo_item length="1" name="16:9(Widescreen)" type="string">
                         16:9 (plein écran)
                 </combo_item>
         </combo_box>
-        <text type="string" length="1" name="text">
+        <text length="1" name="text" type="string">
                 Résolution d&apos;affichage :
         </text>
-        <text type="string" length="1" name="Fullscreen Aspect Ratio:">
+        <text length="1" name="Fullscreen Aspect Ratio:" type="string">
                 Format de plein écran :
         </text>
-        <text type="string" length="1" name="(width / height)">
+        <text length="1" name="(width / height)" type="string">
                 (largeur / hauteur)
         </text>
-        <text type="string" length="1" name="UI Size:">
+        <text length="1" name="UI Size:" type="string">
                 Taille de l&apos;IU :
         </text>
-        <text type="string" length="1" name="(meters, lower is faster)">
+        <text length="1" name="(meters, lower is faster)" type="string">
                 (mètres, moins = plus rapide)
         </text>
-        <text type="string" length="1" name="text2">
+        <text length="1" name="text2" type="string">
                 Options d&apos;affichage :
         </text>
-        <check_box label="Lancer Second Life dans une fenêtre" name="windowed mode" />
-        <check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect" />
-        <check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale" />
-        <check_box label="Montrer l&apos;avatar en mode Mouselook" name="avfp" />
-        <spinner label="Draw Distance :" name="draw_distance" />
+        <check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
+        <check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
+        <check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
+        <check_box label="Montrer l&apos;avatar en vue subjective" name="avfp"/>
+        <spinner label="Distance d&apos;affichage :" name="draw_distance"/>
         <text name="HigherText">
                 Qualité et
         </text>
@@ -91,28 +91,27 @@
         <text bottom="-86" left="325" name="HigherText2">
                 Plus élevée
         </text>
-        <text name="QualityText2" visible="false" />
-        <check_box label="Personnaliser" left="395" name="CustomSettings" />
+        <text name="QualityText2" visible="false"/>
+        <check_box label="Personnaliser" left="395" name="CustomSettings"/>
         <text name="ShadersText">
-                Shaders :
+                Effets :
         </text>
-        <check_box label="Placage de relief et brillance" name="BumpShiny" />
-        <check_box label="Shaders de base" name="BasicShaders"
-             tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter." />
-        <check_box label="Shaders atmosphériques" name="WindLightUseAtmosShaders" />
-        <check_box label="Reflets de l&apos;eau" name="Reflections" />
+        <check_box label="Placage de relief et brillance" name="BumpShiny"/>
+        <check_box label="Effets de base" name="BasicShaders" tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter."/>
+        <check_box label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+        <check_box label="Reflets de l&apos;eau" name="Reflections"/>
         <text name="ReflectionDetailText">
-                Détails des reflets :
+                Objets reflétés :
         </text>
         <radio_group name="ReflectionDetailRadio">
                 <radio_item name="0">
                         Terrain et Arbres
                 </radio_item>
                 <radio_item name="1">
-                        Tous les objets statiques
+                        Objets statiques
                 </radio_item>
                 <radio_item name="2">
-                        Tous les objets et avatars
+                        Objets et avatars
                 </radio_item>
                 <radio_item name="3">
                         Tout
@@ -121,27 +120,27 @@
         <text name="AvatarRenderingText">
                 Rendu de l&apos;avatar :
         </text>
-        <check_box label="Avatars éloignés en 2D" name="AvatarImpostors" />
-        <check_box label="Rendu matériel des skins" name="AvatarVertexProgram" />
-        <check_box label="Habit de l&apos;avatar" name="AvatarCloth" />
+        <check_box label="Avatars éloignés en 2D" name="AvatarImpostors"/>
+        <check_box label="Accélération du rendu" name="AvatarVertexProgram"/>
+        <check_box label="Mouvement des habits" name="AvatarCloth"/>
         <text name="DrawDistanceMeterText1">
                 m
         </text>
         <text name="DrawDistanceMeterText2">
                 m
         </text>
-        <slider label="Distance d&apos;affichage :" name="DrawDistance" />
-        <slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount" />
-        <slider label="Qualité post-traitement :" name="RenderPostProcess" />
+        <slider label="Limite d&apos;affichage :" name="DrawDistance"/>
+        <slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+        <slider label="Qualité post-traitement :" name="RenderPostProcess"/>
         <text name="MeshDetailText">
-                Détails du maillage :
-        </text>
-        <slider label="  Objets :" name="ObjectMeshDetail" />
-        <slider label="  Flexiprims :" name="FlexibleMeshDetail" />
-        <slider label="  Arbres :" name="TreeMeshDetail" />
-        <slider label="  Avatars :" name="AvatarMeshDetail" />
-        <slider label="  Terrain :" name="TerrainMeshDetail" />
-        <slider label="  Ciel :" name="SkyMeshDetail" />
+                Détails des rendus :
+        </text>
+        <slider label="  Objets :" name="ObjectMeshDetail"/>
+        <slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
+        <slider label="  Arbres :" name="TreeMeshDetail"/>
+        <slider label="  Avatars :" name="AvatarMeshDetail"/>
+        <slider label="  Relief :" name="TerrainMeshDetail"/>
+        <slider label="  Ciel :" name="SkyMeshDetail"/>
         <text name="PostProcessText">
                 Faible
         </text>
@@ -164,7 +163,7 @@
                 Faible
         </text>
         <text name="LightingDetailText">
-                Détails de la lumière :
+                Sources lumineuses :
         </text>
         <radio_group name="LightingDetailRadio">
                 <radio_item name="SunMoon">
@@ -175,7 +174,7 @@
                 </radio_item>
         </radio_group>
         <text left="380" name="TerrainDetailText">
-                Détails du terrain :
+                Rendu du terrain :
         </text>
         <radio_group name="TerrainDetailRadio">
                 <radio_item name="0">
@@ -185,9 +184,8 @@
                         Élevé
                 </radio_item>
         </radio_group>
-        <button label="Paramètres recommandés" name="Defaults" />
-        <button label="Configuration du matériel" label_selected="Configuration du matériel"
-             name="GraphicsHardwareButton" />
+        <button label="Paramètres recommandés" name="Defaults"/>
+        <button label="Configuration du matériel" label_selected="Configuration du matériel" name="GraphicsHardwareButton"/>
         <text name="resolution_format">
                 [RES_X] x [RES_Y]
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
index 58b70b4..b73f004 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
@@ -1,38 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Communication" name="im">
-        <text type="string" length="1" name="text_box">
+        <text length="1" name="text_box" type="string">
                 Mon statut en ligne :
         </text>
-        <check_box label="Seuls mes amis et groupes voient quand je suis connecté(e)"
-             name="online_visibility" />
+        <check_box label="Seuls mes amis et groupes voient quand je suis connecté(e)" name="online_visibility"/>
         <text name="log_in_to_change">
                 se connecter pour changer
         </text>
-        <check_box label="Envoyer l&apos;IM à une adresse e-mail ([EMAIL])"
-             name="send_im_to_email" />
-        <check_box label="Inclure les IM dans le chat local" name="include_im_in_chat_history" />
-        <check_box label="Afficher les marques temporelles dans les IM"
-             name="show_timestamps_check" />
-        <check_box label="Me prévenir quand des amis se connectent"
-             name="friends_online_notify_checkbox" />
+        <check_box label="Envoyer les IM à mon adresse e-mail ([EMAIL])" name="send_im_to_email"/>
+        <check_box label="Afficher les IM dans le chat" name="include_im_in_chat_history"/>
+        <check_box label="Afficher l&apos;heure dans les IM" name="show_timestamps_check"/>
+        <check_box label="Me prévenir quand des amis se connectent" name="friends_online_notify_checkbox"/>
         <text name="text_box3">
-                Réponse mode occupé :
+                Réponse si occupé(e) :
         </text>
         <text name="text_box4">
-                Options de connexion :
+                Enregistrements :
         </text>
-        <check_box label="Enregistrer un journal des IM sur mon ordinateur"
-             name="log_instant_messages" />
-        <check_box label="Inclure les marques temporelles" name="log_instant_messages_timestamp" />
-        <check_box label="Enregistrer un journal du chat local sur mon ordinateur" name="log_chat" />
-        <check_box label="Inclure la fin de la dernière conversation IM" name="log_show_history" />
-        <check_box label="Inclure les marques temporelles" name="log_chat_timestamp" />
-        <check_box label="Inclure les IM reçus" name="log_chat_IM" />
-        <check_box label="Inclure la date avec les marques temporelles" name="log_date_timestamp" />
-        <button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement"
-             name="log_path_button" width="150" />
-        <line_editor left="308" name="log_path_string" right="-20" />
-        <text type="string" length="1" name="text_box2">
-                Options IM :
+        <check_box label="Enregistrer les IM sur mon ordinateur" name="log_instant_messages"/>
+        <check_box label="Inclure les heures" name="log_instant_messages_timestamp"/>
+        <check_box label="Enregistrer le chat local sur mon ordinateur" name="log_chat"/>
+        <check_box label="Inclure la fin de la dernière conversation IM" name="log_show_history"/>
+        <check_box label="Inclure les heures" name="log_chat_timestamp"/>
+        <check_box label="Inclure les IM reçus" name="log_chat_IM"/>
+        <check_box label="Inclure la date avec les heures" name="log_date_timestamp"/>
+        <button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement" name="log_path_button" width="150"/>
+        <line_editor left="308" name="log_path_string" right="-20"/>
+        <text length="1" name="text_box2" type="string">
+                IM :
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
index 5351f55..2d82bb1 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Entrée et Caméra" name="Input panel">
-        <text type="string" length="1" name=" Mouselook Options:">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Contrôle et Caméra" name="Input panel">
+        <text length="1" name=" Mouselook Options:" type="string">
                 Vue subjective :
         </text>
-        <text type="string" length="1" name=" Mouse Sensitivity:">
+        <text length="1" name=" Mouse Sensitivity:" type="string">
                 Sensibilité de la souris :
         </text>
-        <text type="string" length="1" name=" Auto Fly Options:">
+        <text length="1" name=" Auto Fly Options:" type="string">
                 Vol automatique :
         </text>
-        <text type="string" length="1" name=" Camera Options:">
+        <text length="1" name=" Camera Options:" type="string">
                 Options de la caméra :
         </text>
-        <text type="string" length="1" name="Camera Springiness:">
+        <text length="1" name="Camera Springiness:" type="string">
                 Réactivité :
         </text>
-        <check_box label="Inverser la souris" name="invert mouse" />
-        <check_box label="Voler/atterrir en appuyant sur la flèche du haut/bas"
-             name="automatic fly" />
+        <check_box label="Inverser la souris" name="invert_mouse"/>
+        <check_box label="Voler/atterrir en appuyant sur la flèche du haut/bas" name="automatic_fly"/>
         <text name="Camera Follow Distance:">
-                Distance de la caméra :
+                Distance :
         </text>
         <text name="Camera Transition Time:">
                 Temps de transition :
@@ -27,18 +26,14 @@
         <text name="Camera Smoothing:">
                 Effet de lissage :
         </text>
-        <check_box label="Ajustement automatique de la caméra en mode Édition"
-             name="edit camera movement"
-             tool_tip="Positionner automatiquement la caméra lors de l&apos;entrée ou de la sortie du mode Édition" />
-        <check_box label="Ajustement automatique de la caméra en mode Apparence"
-             name="appearance camera movement"
-             tool_tip="Positionner automatiquement la caméra en mode Édition" />
+        <check_box label="Ajustement automatique en mode Édition" name="edit_camera_movement" tool_tip="Positionner automatiquement la caméra lors de l&apos;entrée ou de la sortie du mode Édition"/>
+        <check_box label="Ajustement automatique en mode Édition d&apos;apparence" name="appearance_camera_movement" tool_tip="Positionner automatiquement la caméra en mode Édition"/>
         <text name="text2">
                 Affichage de l&apos;avatar :
         </text>
-        <check_box label="Montrer l&apos;avatar dans la vue subjective" name="avfp" />
+        <check_box label="Montrer l&apos;avatar en vue subjective" name="first_person_avatar_visible"/>
         <text name="text5">
                 Options du joystick :
         </text>
-        <button label="Configuration du joystick" name="joystic_setup_button" width="175" />
+        <button label="Configuration du joystick" name="joystick_setup_button" width="175"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
index 5e7bc2f..a6ec0fc 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
@@ -1,24 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Réseau" name="network">
-        <text type="string" length="1" name="text_box">
-                Bande passante maximum :
+        <text length="1" name="text_box" type="string">
+                Bande passante maximale :
         </text>
-        <text type="string" length="1" name="text_box2">
+        <text length="1" name="text_box2" type="string">
                 kbps (kilobits par seconde)
         </text>
         <text name="cache_size_label_l" width="210">
-                Taille de la mémoire cache du disque :
+                Taille de la mémoire :
         </text>
-        <text type="string" length="1" name="text_box5">
+        <text length="1" name="text_box5" type="string">
                 Mo
         </text>
-        <button label="Vider la mémoire cache" label_selected="Vider le cache"
-             name="clear_cache" width="150"/>
+        <button label="Vider la mémoire cache" label_selected="Vider le cache" name="clear_cache" width="150"/>
         <text name="cache_location_label">
                 Emplacement du cache :
         </text>
-        <button label="Définir" label_selected="Définir" name="set_cache" />
-        <button label="Redéfinir" label_selected="Définir" name="reset_cache" />
-        <check_box label="Port de connexion personnalisé" name="connection_port_enabled" />
-        <spinner label="Numéro de port :" name="connection_port" label_width="95" width="170"/>
+        <button label="Modifier" label_selected="Modifier" name="set_cache"/>
+        <button label="Réinitialiser" label_selected="Réinitialiser" name="reset_cache"/>
+        <check_box label="Port de connexion personnalisé" name="connection_port_enabled"/>
+        <spinner label="Numéro de port :" label_width="95" name="connection_port" width="170"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
index cf4b0da..0eff381 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
@@ -1,29 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Pop-ups" name="popups" title="Pop-ups">
-        <text type="string" length="1" name="text_box">
+        <text length="1" name="text_box" type="string">
                 Ne pas afficher les pop-ups :
         </text>
         <text name="dont_show_label">
                 Ne pas afficher ces pop-ups :
         </text>
-        <button label="Activer ce pop-up" label_selected="Autoriser cette pop-up"
-             name="enable_popup" />
+        <button label="Activer ce pop-up" label_selected="Autoriser ce pop-up" name="enable_popup"/>
         <text name="show_label">
                 Afficher ces pop-ups :
         </text>
-        <button width="185" label="Désactiver tous ces pop-ups..." name="skip_dialogs_btn"
-             tool_tip="Désactiver tous les pop-ups facultatifs et les notifications envoyées lors d&apos;un premier usage." />
-        <text type="string" length="1" name="text_box2">
+        <button label="Désactiver tous les pop-ups" name="skip_dialogs_btn" tool_tip="Désactiver tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
+        <text length="1" name="text_box2" type="string">
                 Offres de notes, textures et repères :
         </text>
-        <button width="185" label="Activer tous les pop-ups..."
-             label_selected="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..."
-             name="reset_dialogs_btn"
-             tool_tip="Activer tous les pop-ups facultatifs et les notifications envoyées lors d&apos;un premier usage." />
-        <check_box label="Accepter automatiquement" name="accept_new_inventory" />
-        <check_box label="Afficher automatiquement après avoir accepté"
-             name="show_new_inventory" />
-        <check_box
-             label="Afficher automatiquement les objets récemment acceptés dans l&apos;inventaire"
-             name="show_in_inventory" />
+        <button label="Activer tous les pop-ups" label_selected="Réinitialiser les dialogues &apos;Afficher la prochaine fois&apos;..." name="reset_dialogs_btn" tool_tip="Activer tous les pop-ups et les notifications envoyées lors d&apos;un premier usage." width="185"/>
+        <check_box label="Accepter automatiquement" name="accept_new_inventory"/>
+        <check_box label="Afficher après avoir accepté" name="show_new_inventory"/>
+        <check_box label="Ouvrir l&apos;inventaire et sélectionner les objets reçus" name="show_in_inventory"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
index 2f3855c..7a9876a 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat vocal" name="chat">
         <text_editor name="voice_unavailable">
                 Le chat vocal n&apos;est pas disponible
         </text_editor>
-        <check_box label="Activer le chat vocal" name="enable_voice_check" />
+        <check_box label="Activer la voix" name="enable_voice_check"/>
         <radio_group name="ear_location">
                 <radio_item name="0">
                         Écouter depuis la position de la caméra.
@@ -16,22 +16,20 @@
                 Mode Appuyer pour parler
         </text>
         <text_editor name="voice_chat_description" width="465">
-                En mode Appuyer pour parler, vous contrôlez le moment où votre voix est transmise. Lorsque vous êtes en mode bascule, appuyez et relâchez le bouton Appuyer pour parler pour activer ou désactiver votre micro. Lorsque vous n&apos;êtes pas en mode bascule, le micro n&apos;est activé que lorsque vous appuyez sur le déclencheur.
+                Avec ce mode, vous contrôlez quand vous parlez en appuyant sur le bouton Parler de l&apos;interface. Vous pouvez définir une touche de contrôle supplémentaire en cochant l&apos;option ci-dessous. Pour laisser votre micro constamment ouvert, verrouillez le petit cadenas de l&apos;interface en cliquant dessus.
         </text_editor>
-        <check_box label="Utiliser la fonction Appuyer pour parler en mode bascule"
-             name="push_to_talk_toggle_check" />
+        <check_box label="Attribuer une touche de contrôle" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label">
-                Déclencheur de la fonction Appuyer pour parler :
+                Touche de contrôle :
         </text>
-        <button label="Choisir la touche" name="set_voice_hotkey_button" />
-        <button label="Molette de la souris" name="set_voice_middlemouse_button" />
+        <button label="Choisir la touche" name="set_voice_hotkey_button"/>
+        <button label="Molette de la souris" name="set_voice_middlemouse_button"/>
         <text name="privacy_heading">
                 Options de confidentialité
         </text>
-        <check_box label="N&apos;accepter que les appels de mes amis"
-             name="voice_call_friends_only_check" />
-        <text_editor name="device_settings_text">
-                Remarque : si vous cliquez sur Paramètres du matériel, vous serez temporairement deconnecté du chat vocal.
+        <check_box label="N&apos;accepter que les appels de mes amis" name="voice_call_friends_only_check"/>
+        <text_editor name="device_settings_text" height="48" bottom_delta="-45">
+                Remarque : si vous cliquez sur Paramètres du matériel, vous serez temporairement déconnecté du Chat vocal. Tous les changements que vous faites seront immédiatement appliqués.
         </text_editor>
-        <button label="Paramètres du matériel" name="device_settings_btn" />
+        <button label="Paramètres du matériel" name="device_settings_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
index 45b60ea..47c401e 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
@@ -1,31 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Web" name="web">
         <radio_group name="use_external_browser">
-                <radio_item name="external"
-                     tool_tip="Utilisez le navigateur web du système pour l&apos;aide, les liens web etc. Déconseillé en mode plein écran.">
+                <radio_item name="external" tool_tip="Utilisez le navigateur web du système pour l&apos;aide, les liens web etc. Déconseillé en mode plein écran.">
                         Utiliser un navigateur web externe (Firefox, Safari, Internet Explorer)
                 </radio_item>
-                <radio_item name="internal"
-                     tool_tip="Utilisez le navigateur web intégré pour l&apos;aide, les liens etc. Ce navigateur s&apos;ouvre dans une nouvelle fenêtre à l&apos;intérieur de Second Life.">
+                <radio_item name="internal" tool_tip="Utilisez le navigateur web intégré pour l&apos;aide, les liens etc. Ce navigateur s&apos;ouvre dans une nouvelle fenêtre à l&apos;intérieur de Second Life.">
                         Utiliser le navigateur web intégré
                 </radio_item>
         </radio_group>
         <text name="cache_size_label_l">
                 Cache du navigateur :
         </text>
-        <button label="Vider" name="clear_cache" />
+        <button label="Vider" name="clear_cache"/>
         <text name="cookie_label">
                 Cookies :
         </text>
-        <check_box label="Accepter les cookies d&apos;autres sites" name="cookies_enabled" />
+        <check_box label="Accepter les cookies" name="cookies_enabled"/>
         <text name="proxy_label">
-                Web proxy :
+                Proxy web :
         </text>
-        <check_box label="Activer le Web proxy" name="web_proxy_enabled" />
+        <check_box label="Activer le proxy web" name="web_proxy_enabled"/>
         <text name="proxy_text_label">
                 Adresse :
         </text>
-        <line_editor name="web_proxy_editor"
-             tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser" left="237" />
-        <spinner label="Numéro de port :" name="web_proxy_port" label_width="95" width="170"/>
+        <line_editor left="237" name="web_proxy_editor" tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser"/>
+        <spinner label="Numéro de port :" label_width="95" name="web_proxy_port" width="170"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index 6ab8cee..557e882 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Règlement" name="Covenant">
-        <text name="covenant_help_text">
-                Les changements apportés au règlement apparaîtront sur toutes les parcelles du domaine.
+        <text name="covenant_help_text" bottom="-25">
+                Les changements apportés au règlement apparaîtront sur toutes les
+parcelles du domaine.
         </text>
-        <text name="region_name_lbl">
+        <text name="region_name_lbl" bottom_delta="-31">
                 Région :
         </text>
         <text name="region_name_text">
                 (inconnue)
         </text>
-        <text name="estate_name_lbl">
+        <text name="estate_name_lbl" bottom_delta="-19">
                 Domaine :
         </text>
         <text name="estate_name_text">
@@ -20,7 +21,7 @@
         </text>
         <button label="?" name="covenant_help" />
         <button label="Redéfinir" name="reset_covenant" />
-        <text name="estate_owner_lbl">
+        <text name="estate_owner_lbl" bottom_delta="-19">
                 Propriétaire :
         </text>
         <text name="estate_owner_text">
@@ -33,7 +34,7 @@
                 Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
         </text>
         <text_editor name="covenant_editor">
-                Chargement en cours...
+                Chargement...
         </text_editor>
         <text name="can_resell">
                 Le terrain acheté dans cette région peut être revendu.
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 08b675e..92f44fa 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Débugger" name="Debug">
         <text name="region_text_lbl">
                 Région :
@@ -6,46 +6,35 @@
         <text name="region_text">
                 (inconnue)
         </text>
-        <check_box label="Désactiver les scripts" name="disable_scripts_check"
-             tool_tip="Désactiver tous les scripts dans cette région" />
-        <button label="?" name="disable_scripts_help" />
-        <check_box label="Désactiver les collisions" name="disable_collisions_check"
-             tool_tip="Désactiver les collisions entre non-avatars dans cette région" />
-        <button label="?" name="disable_collisions_help" />
-        <check_box label="Désactiver les propriétés physiques" name="disable_physics_check"
-             tool_tip="Désactiver toutes les propriétés physiques dans cette région" />
-        <button label="?" name="disable_physics_help" />
-        <button label="Appliquer" name="apply_btn" />
+        <check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactiver tous les scripts dans cette région"/>
+        <button label="?" name="disable_scripts_help"/>
+        <check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/>
+        <button label="?" name="disable_collisions_help"/>
+        <check_box label="Désactiver les propriétés &#10;physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
+        <button label="?" name="disable_physics_help"/>
+        <button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
+        <text name="objret_text_lbl" bottom_delta="-42">
+                Renvoi de l&apos;objet
+        </text>
+        <text name="resident_text_lbl">
+                Résident :
+        </text>
         <line_editor name="target_avatar_name">
                 (aucun)
         </line_editor>
-        <button label="Choisir..." name="choose_avatar_btn" />
-        <button
-             label="Renvoyer les objets scriptés de l&apos;avatar vers une propriété tierce"
-             name="return_scripted_other_land_btn" />
-        <button label="Renvoyer TOUS les objets scriptés de l&apos;avatar"
-             name="return_scripted_all_btn" />
-        <check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts"
-             tool_tip="Ne renvoyer que les objets avec des scripts." />
-        <check_box
-             label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre"
-             name="return_other_land"
-             tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre" />
-        <check_box label="Renvoyer les objets dans toutes les régions de ce domaine"
-             name="return_estate_wide"
-             tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine" />
-        <button label="Renvoyer" name="return_btn" />
-        <button label="Afficher les objets souvent responsables de collision..."
-             name="top_colliders_btn"
-             tool_tip="Liste des objets avec le plus de collisions potentielles" />
-        <button label="?" name="top_colliders_help" />
-        <button label="Afficher les objets exécutant le plus de scripts..."
-             name="top_scripts_btn"
-             tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" />
-        <button label="?" name="top_scripts_help" />
-        <button label="Redémarrer la région" name="restart_btn"
-             tool_tip="Redémarrer la région au bout de 2 minutes" />
-        <button label="?" name="restart_help" />
-        <button label="Retarder le redémarrage" name="cancel_restart_btn"
-             tool_tip="Retarder le redémarrage de la région d&apos;une heure" />
+        <button label="Choisir..." name="choose_avatar_btn"/>
+        <text name="options_text_lbl">
+                Options :
+        </text>
+        <check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip="Ne renvoyer que les objets avec des scripts."/>
+        <check_box label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu&apos;un d&apos;autre"/>
+        <check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
+        <button label="Renvoyer" name="return_btn"/>
+        <button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
+        <button label="?" name="top_colliders_help" left="337"/>
+        <button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
+        <button label="?" name="top_scripts_help" left="337"/>
+        <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
+        <button label="?" name="restart_help" left="177" />
+        <button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 7f11b0a..425f273 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Domaine" name="Estate">
-        <text name="estate_help_text">
-                Les changements apportés aux paramètres de cet onglet auront des répercussions sur toutes les régions du domaine.
+        <text name="estate_help_text" bottom="-34">
+                Les changements apportés aux paramètres
+de cet onglet auront des répercussions sur
+toutes les régions du domaine.
         </text>
-        <text name="estate_text">
+        <text name="estate_text" bottom_delta="-34">
                 Domaine :
         </text>
         <text name="estate_name">
@@ -16,63 +18,61 @@
                 (inconnu)
         </text>
         <text name="Only Allow">
-                Limiter l&apos;accès aux résidents :
+                Limiter l&apos;accès aux résidents qui :
         </text>
-        <check_box label="Qui ont enregistré leurs infos de paiement" name="limit_payment"
-             tool_tip="Interdire les résidents non identifés." />
-        <check_box label="Adultes dont l&apos;âge a été vérifié" name="limit_age_verified"
-             tool_tip="Interdire les résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com." />
-        <check_box label="Autoriser les chats vocaux" name="voice_chat_check" />
-        <button label="?" name="voice_chat_help" />
+        <check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannir les résidents non identifés."/>
+        <check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannir les résidents dont l&apos;âge n&apos;a pas été vérifié. Pour plus d&apos;infos, consultez la page support.secondlife.com."/>
+        <check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
+        <button label="?" name="voice_chat_help"/>
         <text name="abuse_email_text">
                 E-mail où signaler l&apos;infraction :
         </text>
         <string name="email_unsupported">
                 Non pris en charge
         </string>
-        <button label="?" name="abuse_email_address_help" />
+        <button label="?" name="abuse_email_address_help"/>
         <text name="estate_manager_label">
                 Gérants du domaine :
         </text>
-        <button label="?" name="estate_manager_help" />
-        <button label="Ajouter..." name="add_estate_manager_btn" />
-        <button label="Supprimer..." name="remove_estate_manager_btn" />
-        <check_box label="Utiliser le temps universel" name="use_global_time_check" />
-        <button label="?" name="use_global_time_help" />
-        <check_box label="Soleil fixe" name="fixed_sun_check" />
-        <button label="?" name="fixed_sun_help" />
-        <slider label="Phase" name="sun_hour_slider" />
-        <check_box label="Autoriser l&apos;accès public" name="externally_visible_check" />
-        <button label="?" name="externally_visible_help" />
-        <check_box label="Vue sur le continent" name="mainland_visible_check" />
-        <button label="?" name="mainland_visible_help" />
-        <check_box label="Autoriser la téléportation directe" name="allow_direct_teleport" />
-        <button label="?" name="allow_direct_teleport_help" />
+        <button label="?" name="estate_manager_help"/>
+        <button label="Ajouter..." name="add_estate_manager_btn"/>
+        <button label="Supprimer..." name="remove_estate_manager_btn"/>
+        <check_box label="Utiliser le temps universel" name="use_global_time_check"/>
+        <button label="?" name="use_global_time_help"/>
+        <check_box label="Soleil fixe" name="fixed_sun_check"/>
+        <button label="?" name="fixed_sun_help"/>
+        <slider label="Phase" name="sun_hour_slider"/>
+        <check_box label="Autoriser l&apos;accès public" name="externally_visible_check"/>
+        <button label="?" name="externally_visible_help"/>
+        <check_box label="Vue sur le continent" name="mainland_visible_check"/>
+        <button label="?" name="mainland_visible_help"/>
+        <check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
+        <button label="?" name="allow_direct_teleport_help"/>
         <text name="region_text_lbl">
                 Refuser l&apos;accès selon les infos de paiement :
         </text>
-        <check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous" />
-        <check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified" />
-        <check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted" />
-        <button label="Appliquer" name="apply_btn" />
+        <check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
+        <check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
+        <check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
+        <button label="Appliquer" name="apply_btn"/>
         <text name="allow_resident_label">
                 Résidents autorisés :
         </text>
-        <button label="?" name="allow_resident_help" />
-        <button label="Ajouter..." name="add_allowed_avatar_btn" />
-        <button label="Supprimer..." name="remove_allowed_avatar_btn" />
+        <button label="?" name="allow_resident_help"/>
+        <button label="Ajouter..." name="add_allowed_avatar_btn"/>
+        <button label="Supprimer..." name="remove_allowed_avatar_btn"/>
         <text name="allow_group_label">
                 Groupes autorisés :
         </text>
-        <button label="?" name="allow_group_help" />
-        <button label="Ajouter..." name="add_allowed_group_btn" />
-        <button label="Supprimer..." name="remove_allowed_group_btn" />
+        <button label="?" name="allow_group_help"/>
+        <button label="Ajouter..." name="add_allowed_group_btn"/>
+        <button label="Supprimer..." name="remove_allowed_group_btn"/>
         <text name="ban_resident_label">
-                Résidents interdits :
+                Résidents bannis :
         </text>
-        <button label="?" name="ban_resident_help" />
-        <button label="Ajouter..." name="add_banned_avatar_btn" />
-        <button label="Supprimer..." name="remove_banned_avatar_btn" />
-        <button label="Envoyer un message au domaine..." name="message_estate_btn" />
-        <button label="Expulser le résident du domaine..." name="kick_user_from_estate_btn" />
+        <button label="?" name="ban_resident_help"/>
+        <button label="Ajouter..." name="add_banned_avatar_btn"/>
+        <button label="Supprimer..." name="remove_banned_avatar_btn"/>
+        <button label="Envoyer un message au domaine..." name="message_estate_btn"/>
+        <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
index 59ff4a8..c3ef963 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Région" name="General">
         <text name="region_text_lbl">
                 Région :
@@ -12,42 +12,39 @@
         <text name="version_channel_text">
                 (inconnu)
         </text>
-        <check_box label="Bloquer le terraformage" name="block_terraform_check" />
-        <button label="?" name="terraform_help" />
-        <check_box label="Interdire le vol" name="block_fly_check" />
-        <button label="?" name="fly_help" />
-        <check_box label="Autoriser les dégâts" name="allow_damage_check" />
-        <button label="?" name="damage_help" />
-        <check_box label="Interdire les bousculades" name="restrict_pushobject" />
-        <button label="?" name="restrict_pushobject_help" />
-        <check_box label="Autoriser la revente de terrain" name="allow_land_resell_check" />
-        <button label="?" name="land_resell_help" />
-        <check_box label="Autoriser la fusion/division de terrain"
-             name="allow_parcel_changes_check" />
-        <button label="?" name="parcel_changes_help" />
-        <check_box label="Ne pas afficher le terrain dans la recherche"
-             name="block_parcel_search_check"
-             tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche" />
-        <button label="?" name="parcel_search_help" />
-        <spinner label="Nombre limite d&apos;avatars" name="agent_limit_spin" />
-        <button label="?" name="agent_limit_help" />
-        <spinner label="Bonus objet" name="object_bonus_spin" />
-        <button label="?" name="object_bonus_help" />
+        <check_box label="Bloquer le terraformage" name="block_terraform_check"/>
+        <button label="?" name="terraform_help"/>
+        <check_box label="Interdire le vol" name="block_fly_check"/>
+        <button label="?" name="fly_help"/>
+        <check_box label="Autoriser les dégâts" name="allow_damage_check"/>
+        <button label="?" name="damage_help"/>
+        <check_box label="Interdire les bousculades" name="restrict_pushobject"/>
+        <button label="?" name="restrict_pushobject_help"/>
+        <check_box label="Autoriser la revente" name="allow_land_resell_check"/>
+        <button label="?" name="land_resell_help"/>
+        <check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
+        <button label="?" name="parcel_changes_help"/>
+        <check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
+        <button label="?" name="parcel_search_help"/>
+        <spinner label="Nombre limite d&apos;avatars" name="agent_limit_spin" label_width="127" width="190"/>
+        <button label="?" name="agent_limit_help"/>
+        <spinner label="Bonus objet" name="object_bonus_spin" label_width="127" width="190"/>
+        <button label="?" name="object_bonus_help"/>
         <text label="Maturité" name="access_text">
                 Maturité :
         </text>
         <combo_box label="Adulte" name="access_combo">
                 <combo_item name="PG">
-                        Accompagnement parental
+                        Tout public
                 </combo_item>
                 <combo_item name="Mature">
                         Adulte
                 </combo_item>
         </combo_box>
-        <button label="?" name="access_help" />
-        <button label="Appliquer" name="apply_btn" />
-        <button label="Téléporter un résident chez lui..." name="kick_btn" />
-        <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn" />
-        <button label="Envoyer un message à la région..." name="im_btn" />
-        <button label="Gérer le Téléhub..." name="manage_telehub_btn" />
+        <button label="?" name="access_help"/>
+        <button label="Appliquer" name="apply_btn"/>
+        <button label="Téléporter un résident chez lui..." name="kick_btn"/>
+        <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/>
+        <button label="Envoyer un message à la région..." name="im_btn"/>
+        <button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index de149b0..4d7652e 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terrain" name="Terrain">
         <text name="region_text_lbl">
                 Région :
@@ -6,25 +6,22 @@
         <text name="region_text">
                 (inconnue)
         </text>
-        <spinner label="Niveau de l&apos;eau" name="water_height_spin" />
-        <button label="?" name="water_height_help" />
-        <spinner label="Limite de surélévation du terrain" name="terrain_raise_spin" />
-        <button label="?" name="terrain_raise_help" />
-        <spinner label="Limite d&apos;abaissement du terrain" name="terrain_lower_spin" />
-        <button label="?" name="terrain_lower_help" />
-        <check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check" />
-        <button label="?" name="use_estate_sun_help" />
-        <check_box label="Soleil fixe" name="fixed_sun_check" />
-        <button label="?" name="fixed_sun_help" />
-        <slider label="Phase" name="sun_hour_slider" />
-        <button label="Appliquer" name="apply_btn" />
-        <button label="Télécharger le terrain au format RAW..." name="download_raw_btn"
-             tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" />
-        <button label="?" name="download_raw_help" />
-        <button label="Charger le terrain au format RAW..." name="upload_raw_btn"
-             tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" />
-        <button label="?" name="upload_raw_help" />
-        <button label="Figer le terrain" name="bake_terrain_btn"
-             tool_tip="Définir le terrain actuel comme point central pour les limites de surélévation/abaissement" />
-        <button label="?" name="bake_terrain_help" />
+        <spinner label="Niveau de l&apos;eau" name="water_height_spin"/>
+        <button label="?" name="water_height_help"/>
+        <spinner label="Limite d&apos;élévation du &#10;terrain" name="terrain_raise_spin"/>
+        <button label="?" name="terrain_raise_help"/>
+        <spinner label="Limite d&apos;abaissement &#10;du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
+        <button label="?" name="terrain_lower_help"/>
+        <check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
+        <button label="?" name="use_estate_sun_help"/>
+        <check_box label="Soleil fixe" name="fixed_sun_check"/>
+        <button label="?" name="fixed_sun_help"/>
+        <slider label="Phase" name="sun_hour_slider"/>
+        <button label="Appliquer" name="apply_btn"/>
+        <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+        <button label="?" name="download_raw_help" left="246" />
+        <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+        <button label="?" name="upload_raw_help" left="246" />
+        <button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d&apos;élévation/abaissement"/>
+        <button label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index 09fe3df..a6ec93b 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="LLScrollingPanelParam">
         <text type="string" length="1" name="Loading...">
-                Chargement en cours...
+                Chargement...
         </text>
         <text type="string" length="1" name="Loading...2">
-                Chargement en cours...
+                Chargement...
         </text>
         <button label="" label_selected="" name="less" />
         <button label="" label_selected="" name="more" />
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
index 4500b66..125fb1e 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="active_speakers_panel">
         <string name="moderator_label">
                 (Modérateur)
@@ -7,23 +7,23 @@
                 <layout_panel name="moderation_mode_panel">
                         <combo_box name="moderation_mode">
                                 <combo_item name="OpenVoice">
-                                        Voix activées par défaut)
+                                        Voix activées par défaut
                                 </combo_item>
                                 <combo_item name="ModeratedVoice">
-                                        Voix désactivées par défaut)
+                                        Voix désactivées par défaut
                                 </combo_item>
                         </combo_box>
                 </layout_panel>
                 <layout_panel name="moderate_chat_panel">
                         <scroll_list name="speakers_list">
-                                <column label="Nom" name="speaker_name" />
+                                <column label="Nom" name="speaker_name"/>
                         </scroll_list>
                         <panel name="speaker_controls">
                                 <text name="resident_name">
                                         Rumplstiltskin Califragilistic
                                 </text>
-                                <button name="mute_btn" tool_tip="Rendre ce résident muet" />
-                                <check_box label="Ignorer le texte" name="mute_text_btn" />
+                                <button name="mute_btn" tool_tip="Ignorer ce résident"/>
+                                <check_box label="Ignorer les messages" name="mute_text_btn"/>
                         </panel>
                 </layout_panel>
                 <layout_panel name="moderator_controls">
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index b8418d3..2e4c694 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-        <text type="string" length="1" name="ParcelNameText"
-             tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir À propos du terrain.">
+        <text length="1" name="ParcelNameText" tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir la section À propos du terrain." type="string">
                 Saisissez le nom de la parcelle ici
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="Solde du compte">
-                Chargement en cours...
+        <text length="1" name="BalanceText" tool_tip="Solde du compte" type="string">
+                Chargement...
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises" />
-        <text type="string" length="12" name="TimeText" tool_tip="Heure actuelle (Californie)">
+        <button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises"/>
+        <text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
                 midi
         </text>
         <string name="StatBarDaysOfWeek">
@@ -17,23 +16,22 @@
         <string name="StatBarMonthsOfYear">
                 January:February:March:April:May:June:July:August:September:October:November:December
         </string>
-        <button label="" label_selected="" name="scriptout"
-             tool_tip="Alertes et erreurs de scripts" />
-        <button label="" label_selected="" name="health" tool_tip="Santé" />
-        <text type="string" length="1" name="HealthText" tool_tip="Santé">
-                100%
+        <button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
+        <button label="" label_selected="" name="health" tool_tip="Santé"/>
+        <text length="1" name="HealthText" tool_tip="Santé" type="string">
+                100 %
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="Vol interdit" />
-        <button label="" label_selected="" name="build" tool_tip="Construction interdite" />
-        <button label="" label_selected="" name="scripts" tool_tip="Scripts interdits" />
-        <button name="no_fly" tool_tip="Interdiction de voler" />
-        <button name="no_build" tool_tip="Interdiction de construire/rezzer" />
-        <button name="no_scripts" tool_tip="Interdiction d&apos;utiliser des scripts" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject interdit" />
-        <button name="status_no_voice" tool_tip="Voix non disponible ici" />
-        <button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle" />
-        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life" />
-        <button name="search_btn" tool_tip="Rechercher dans Second Life" />
+        <button label="" label_selected="" name="fly" tool_tip="Vol interdit"/>
+        <button label="" label_selected="" name="build" tool_tip="Construction interdite"/>
+        <button label="" label_selected="" name="scripts" tool_tip="Scripts interdits"/>
+        <button name="no_fly" tool_tip="Interdiction de voler"/>
+        <button name="no_build" tool_tip="Interdiction de construire/rezzer"/>
+        <button name="no_scripts" tool_tip="Interdiction d&apos;utiliser des scripts"/>
+        <button label="" label_selected="" name="restrictpush" tool_tip="Pas de bousculades"/>
+        <button name="status_no_voice" tool_tip="Voix non disponible ici"/>
+        <button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle"/>
+        <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+        <button name="search_btn" tool_tip="Rechercher dans Second Life"/>
         <text name="packet_loss_tooltip">
                 Perte de paquets
         </text>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
index 4405b38..80adabf 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="toolbar">
         <string name="Redock Windows">
                 Rétablir les fenêtres
         </string>
         <layout_stack name="toolbar_stack">
-                <button label="" name="chat_btn" tool_tip="Afficher la barre de chat. (Entrée)" />
-                <flyout_button label="Communiquer" name="communicate_btn"
-                     tool_tip="Communiquer avec vos amis et vos groupes." />
-                <button label="Voler" label_selected="Atterrir" name="fly_btn"
-                     tool_tip="Commencer à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas." />
-                <button label="Photo" name="snapshot_btn"
-                     tool_tip="Enregistrer une photo sur le disque ou dans l&apos;inventaire." />
-                <button label="Rechercher" name="directory_btn"
-                     tool_tip="Rechercher des endroits, des événements, des personnes, et plus encore." />
-                <button label="Construire" name="build_btn" tool_tip="Créer de nouveaux objets." />
-                <button label="Mini-carte" name="radar_btn"
-                     tool_tip="Carte de la zone autour de vous. (Ctrl-Maj-M)" />
-                <button label="Carte" name="map_btn" tool_tip="Carte du monde. (Ctrl-M)" />
-                <button label="Inventaire" name="inventory_btn" tool_tip="Vos objets. (Ctrl-I)" />
+                <button label="" name="chat_btn" tool_tip="Affichez la barre de chat. (Entrée)"/>
+                <flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez avec vos amis et vos groupes."/>
+                <button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PageBas pour voler vers le haut et vers le bas."/>
+                <button label="Photo" name="snapshot_btn" tool_tip="Enregistrez une photo sur le disque ou dans l&apos;inventaire."/>
+                <button label="Rechercher" name="directory_btn" tool_tip="Recherchez des endroits, des événements, des résidents, et plus encore."/>
+                <button label="Construire" name="build_btn" tool_tip="Créez de nouveaux objets."/>
+                <button label="Mini-carte" name="radar_btn" tool_tip="Affichez la carte de la zone autour de vous. (Ctrl-Maj-M)"/>
+                <button label="Carte" name="map_btn" tool_tip="Affichez la carte du Monde. (Ctrl-M)"/>
+                <button label="Inventaire" name="inventory_btn" tool_tip="Vos objets (Ctrl-I)"/>
         </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
index 3dc9dfe..dc0da1c 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="voice_controls">
+<panel name="voice_controls" width="138">
+        <!-- WARNING: separate formatting and translations of these same strings (for using the Silver skin) is controlled by a different file in \skins\silver\xui\fr\panel_voice_controls.xml You must make changes to translations in both files.-->
         <button name="speakers_btn"
-             tool_tip="Afficher la liste des résidents utilisant le chat vocal près de vous" />
-        <button label="Parler" name="push_to_talk" tool_tip="Appuyer sur le bouton pour parler" />
-        <button name="ptt_lock" tool_tip="Cliquer sur Verrouiller pour passer au mode Parler" />
-        <button name="show_channel" tool_tip="Cliquer pour afficher le canal vocal actuel" />
+             tool_tip="Affichez la liste des résidents utilisant le chat vocal près de vous" />
+        <button label="Parler" name="push_to_talk" tool_tip="Appuyez sur le bouton pour parler"  width="74" />
+        <button name="ptt_lock" tool_tip="Cliquez sur Verrouiller pour passer au mode Parler" />
+        <icon name="voice_volume" left_delta="50" />
+        <button name="show_channel" tool_tip="Cliquez pour afficher le canal vocal utilisé" left_delta="20"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
index ab95e4e..97c4770 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="content_panel">
         <text_editor name="voice_intro_text1">
-                Bienvenue dans le chat vocal de Second Life ! Le chat vocal vous permet de communiquer avec les autres résidents. Cet assistant vous aidera à le paramétrer correctement.  Le chat vocal requiert l&apos;utilisation de speakers audio. Pour parler, il vous faudra aussi un micro ou un casque stéréo avec un micro.
+                Bienvenue dans le chat vocal de Second Life ! Le chat vocal vous permet de communiquer avec les autres résidents. Cet assistant vous aidera à le paramétrer correctement. Le chat vocal requiert l&apos;utilisation de haut-parleurs audio. Pour parler, il vous faudra aussi un micro ou un casque stéréo avec un micro.
         </text_editor>
         <text_editor name="voice_intro_text2">
                 Le chat vocal est activé par défaut. Souhaitez-vous continuer à l&apos;utiliser ?
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml
index dde5c59..be3331e 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="content_panel">
         <text_editor name="voice_intro_text1">
                 Pour configurer votre chat vocal, utilisez les options ci-dessous.
@@ -11,13 +11,11 @@
                         Écouter depuis la position de l&apos;avatar.
                 </radio_item>
         </radio_group>
-        <check_box label="N&apos;autoriser que mes amis à m&apos;appeler."
-             name="friends_only_check" />
-        <check_box label="Utiliser la fonction Appuyer pour parler en mode bascule"
-             name="push_to_talk_toggle_check" />
+        <check_box label="N&apos;autoriser que mes amis à m&apos;appeler." name="friends_only_check"/>
+        <check_box label="Attribuer une touche de contrôle" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label">
-                Déclencheur de la fonction Appuyer pour parler :
+                Touche de contrôle de la fonction Appuyer pour parler :
         </text>
-        <button label="Choisir la touche" name="set_voice_hotkey_button" />
-        <button label="Molette de la souris" name="set_voice_middlemouse_button" />
+        <button label="Choisir la touche" name="set_voice_hotkey_button"/>
+        <button label="Molette de la souris" name="set_voice_middlemouse_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
new file mode 100644
index 0000000..96e3032
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_remote" width="140">

+        <panel name="panel_bg_tab" width="138" />

+        <panel name="panel_voice_controls" width="140" />

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
index b8b75d9..83efac4 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="voice_remote">
+        <panel name="panel_bg_tab" width="138" />
         <button name="end_call_btn" tool_tip="Cliquer pour raccrocher" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/role_actions.xml b/linden/indra/newview/skins/default/xui/fr/role_actions.xml
index 2d076b5..4dd1288 100644
--- a/linden/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -4,198 +4,198 @@
              description="Ces pouvoirs permettent d&apos;ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d&apos;invitation."
              name="Membership">
                 <action description="Inviter des membres dans ce groupe"
-                     longdescription="Invitez des membres à rejoindre ce goupe en utilisant le bouton Inviter nouvelle personne à partir de l&apos;onglet Membres et rôles &gt; Membres."
+                     longdescription="Invitez des membres à rejoindre ce groupe en utilisant le bouton Inviter un nouveau membre à partir de l&apos;onglet Membres et rôles &gt; Membres."
                      name="member invite" value="1" />
-                <action description="Expulser des membres de ce groupe"
-                     longdescription="Expulsez des membres de ce goupe en utilisant le bouton Expulser du groupe à partir de l&apos;onglet Membres et rôles &gt; Membres. Un propriétaire peur expulser n&apos;importe qui sauf un autre propriétaire. Si vous n&apos;êtes pas propriétaire, notez qu&apos;un membre peut être expulsé d&apos;un groupe uniquement s&apos;il se trouve dans le rôle Tous et dans aucun autre rôle. Pour supprimer des rôles, vous devez avoir le pouvoir de retirer des rôles aux membres."
+                <action description="Expulser des membres du groupe"
+                     longdescription="Expulsez des membres de ce groupe en utilisant le bouton Expulser un membre à partir de l&apos;onglet Membres et rôles &gt; Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d&apos;un groupe uniquement s&apos;il a le rôle Tous (Everyone). Si vous n&apos;êtes pas propriétaire, vous devez d&apos;abord retirer les rôles d&apos;un membre avant de pouvoir l&apos;expulser."
                      name="member eject" value="2" />
                 <action
-                     description="Mettre l&apos;inscription libre en mode bascule et changer les frais d&apos;inscription."
-                     longdescription="Mettez Inscription libre en mode bascule pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez Frais d&apos;inscription dans les Préférences du groupe, sous l&apos;onglet Général."
+                     description="Gérer l&apos;inscription et les frais d&apos;inscription"
+                     longdescription="Choisissez l&apos;inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les frais d&apos;inscription à l&apos;onglet Général."
                      name="member options" value="3" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent d&apos;ajouter, supprimer et modifier les rôles dans le groupe, d&apos;ajouter et de supprimer des membres affectés à ces rôles et d&apos;assigner des pouvoirs aux rôles."
+             description="Ces pouvoirs permettent d&apos;ajouter, de supprimer et de modifier les rôles dans le groupe et d&apos;y assigner des membres et des pouvoirs."
              name="Roles">
                 <action description="Créer des rôles"
-                     longdescription="Créez de nouveaux rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles."
+                     longdescription="Créez de nouveaux rôles à l&apos;onglet Membres et rôles &gt; Rôles."
                      name="role create" value="4" />
                 <action description="Supprimer des rôles"
-                     longdescription="Supprimez des rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles."
+                     longdescription="Supprimez des rôles à l&apos;onglet Membres et rôles &gt; Rôles."
                      name="role delete" value="5" />
-                <action description="Modifier les noms, titres et descriptions des rôles"
-                     longdescription="Modifiez les noms, titres et descriptions des rôles à l&apos;onglet Membres et rôles, sous-onglet Rôles, après avoir sélectionné un rôle."
+                <action description="Modifier les noms, les titres et les descriptions des rôles"
+                     longdescription="Modifiez les noms, titres et descriptions des rôles à l&apos;onglet Membres et rôles &gt; Rôles."
                      name="role properties" value="6" />
-                <action description="Affecter des membres à des rôles d&apos;attribution"
-                     longdescription="Affectez des membres à des rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Un membre disposant de ce pouvoir ne peut affecter de nouveaux membres qu&apos;à un rôle auquel il est lui même affecté."
+                <action description="Attribuer des rôles limités"
+                     longdescription="Affectez des membres à certains rôles à l&apos;onglet Membres et rôles &gt; Membres. Un membre ne peut attribuer que des rôles auxquels il est lui-même affecté."
                      name="role assign member limited" value="7" />
-                <action description="Affecter des membres à tous types de rôles"
-                     longdescription="Affectez des membres à tous types de rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Avertissement : tout membre disposant de ce pouvoir peut s&apos;affecter lui-même, ainsi que tout autre membre non-propriétaire du groupe, à des rôles disposant de facultés plus importantes, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+                <action description="Attribuer tous les rôles"
+                     longdescription="Affectez des membres à tous types de rôles à l&apos;onglet Membres et rôles &gt; Membres &gt; Rôles assignés. Attention : ce pouvoir peut conférer des rôles très importants, proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
                      name="role assign member" value="8" />
                 <action description="Destituer des membres de leurs rôles"
-                     longdescription="Destituez des membres de leurs rôles dans la section Rôles attribués à l&apos;onglet Membres et rôles, sous-onglet Membres. Les propriétaires ne peuvent pas être destitués."
+                     longdescription="Destituez des membres de leurs rôles à partir du menu Rôles attribués à l&apos;onglet Membres et rôles &gt; Membres. Les propriétaires ne peuvent pas être destitués."
                      name="role remove member" value="9" />
-                <action description="Attribuer et retirer les pouvoirs d&apos;un rôle"
-                     longdescription="Attribuez et retirez les pouvoirs d&apos;un rôle à partir de la section Pouvoirs attribués à l&apos;onglet Membres et rôles, sous-onglet Rôles. Avertissement : tout membre dans un rôle avec ce pouvoir peut s&apos;attribuer à lui-même, ainsi qu&apos;à tout autre membre non-propriétaire du groupe, Tous les pouvoirs, et accéder potentiellement à des pouvoirs proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+                <action description="Modifier les pouvoirs d&apos;un rôle"
+                     longdescription="Attribuez et retirez les pouvoirs d&apos;un rôle à partir du menu Pouvoirs attribués à l&apos;onglet Membres et rôles &gt; Rôles &gt; Pouvoirs attribués. Attention : ce pouvoir peut donner des rôles très importants, proches de ceux d&apos;un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
                      name="role change actions" value="10" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent de modifier l&apos;identité du groupe, et donc sa visibilité publique, sa charte et son emblème."
+             description="Ces pouvoirs permettent de modifier le profil public du groupe, sa charte et son logo."
              name="Group Identity">
                 <action
-                     description="Modifier la charte, l&apos;emblème, les résultats dans la recherche, et quels membres apparaissent dans les Informations du groupe."
-                     longdescription="Modifier la charte, l&apos;emblème, les résultats dans la recherche, et quels membres apparaissent dans les Informations du groupe. Ces opérations s&apos;effectuent à l&apos;onglet Général."
+                     description="Modifier le profil public du groupe"
+                     longdescription="Modifiez la charte, le logo, l&apos;affichage dans la recherche et la liste des membres visibles à l&apos;onglet Général."
                      name="group change identity" value="11" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au patrimoine du groupe. Pour accéder au menu du terrain, cliquez à droite sur le sol et sélectionnez À propos du terrain, ou bien cliquez sur les infos de la parcelle dans la barre de menus."
+             description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l&apos;écran ou cliquez à droite sur le sol."
              name="Parcel Management">
-                <action description="Transférer du terrain et acheter du terrain pour le groupe"
-                     longdescription="Transférez du terrain et achetez du terrain pour le groupe Ces opérations s&apos;effectuent à partir de À propos du terrain &gt; Général."
+                <action description="Transférer et acheter des parcelles pour le groupe"
+                     longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu À propos du terrain &gt; Général."
                      name="land deed" value="12" />
-                <action description="Céder le terrain au Governor Linden"
-                     longdescription="Cédez le terrain au Governor Linden. Avertissement : seul un membre dont le rôle lui confère ce pouvoir peut céder son terrain à la section À propos du terrain, onglet Général, le rendant ainsi au patrimoine des Linden sans le vendre ! Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+                <action description="Abandonner le terrain"
+                     longdescription="Abandonnez des parcelles du groupe à Linden Lab. Attention : ce pouvoir autorise l&apos;abandon d&apos;un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
                      name="land release" value="13" />
-                <action description="Infos sur la mise en vente du terrain"
-                     longdescription="Infos sur la mise en vente du terrain. Avertissement : seul un membre dans un rôle avec ce pouvoir peut vendre un terrain possédé par le groupe à la section À propos du terrain &gt; Général. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir."
+                <action description="Vendre du terrain"
+                     longdescription="Vendez des parcelles du groupe. Attention : ce pouvoir autorise la vente d&apos;un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer."
                      name="land set sale info" value="14" />
                 <action description="Diviser et fusionner des parcelles"
-                     longdescription="Divisez et fusionnez des parcelles Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l&apos;endroit du terrain que vous souhaitez modifier.  Pour sous-diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner. "
+                     longdescription="Divisez et fusionnez des parcelles. Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l&apos;endroit que vous souhaitez modifier. Pour diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner."
                      name="land divide join" value="15" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent de modifier le nom de la parcelle, la visibilité dans l&apos;annuaire et les options de routage et de téléportation."
+             description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation."
              name="Parcel Identity">
                 <action
-                     description="Mettre Afficher dans la recherche d&apos;endroits en mode bascule et définir une catégorie."
-                     longdescription="Mettez Afficher dans la recherche d&apos;endroits en mode bascule et définissez une catégorie pour la parcelle dans À propos du terrain &gt; Options."
+                     description="Afficher dans la recherche et définir une catégorie"
+                     longdescription="Choisissez de faire apparaître la parcelle dans la recherche et définissez sa catégorie à partir du menu À propos du terrain &gt; Options."
                      name="land find places" value="17" />
                 <action
-                     description="Modifier le nom de la parcelle, la description et les paramètres d&apos;affichage dans la recherche"
-                     longdescription="Modifiez le nom de la parcelle, la description et les paramètres d&apos;affichage dans les résultats de recherche. Ces opérations s&apos;effectuent à partir de À propos du terrain &gt;  Options."
+                     description="Modifier le nom, la description et le référencement du terrain dans la recherche"
+                     longdescription="Modifiez le nom, la description de la parcelle et son référencement dans la recherche à partir du menu À propos du terrain &gt; Options."
                      name="land change identity" value="18" />
                 <action
-                     description="Définir le lieu d&apos;arrivée et le routage de téléportation "
-                     longdescription="Sur une parcelle appartenant au groupe, les membres ayant un rôle avec ce pouvoir peuvent définir le lieu d&apos;arrivée des téléportations et définir le routage des téléportations pour plus de contrôle. Ces opérations s&apos;effectuent à partir de À propos du terrain, onglet Options."
+                     description="Définir le lieu d&apos;arrivée et le routage des téléportations"
+                     longdescription="Définissez le lieu d&apos;arrivée des téléportations et le routage à partir du menu À propos du terrain &gt; Options."
                      name="land set landing point" value="19" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent de contrôler les options de la parcelle, telles que l&apos;option Créer des objets ou Modifier le terrain, ainsi que les paramètres de musique et de médias."
+             description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d&apos;objets et le relief."
              name="Parcel Settings">
-                <action description="Modifier les paramètres de musique et médias"
-                     longdescription="Modifiez les paramètres de flux musicaux et vidéos à partir de la section À propos du terrain, onglet Média."
+                <action description="Modifier la musique et les médias"
+                     longdescription="Changez la musique et les médias à partir du menu À propos du terrain &gt; Médias."
                      name="land change media" value="20" />
-                <action description="Mettre la section Modifier le terrain en mode bascule"
-                     longdescription="Mettez la section Modifier le terrain en mode bascule. Avertissement : la section À propos du terrain &gt; Options &gt; Modifier le terrain permet à tout le monde de terraformer votre terrain, disposer des plantes Linden et les déplacer. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir. Ces opérations s&apos;effectuent à partir de À propos du terrain &gt; Options."
+                <action description="Changer l&apos;option Modifier le terrain"
+                     longdescription="Changez l&apos;option Modifier le terrain à partir du menu À propos du terrain &gt; Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l&apos;attribuer. "
                      name="land edit" value="21" />
                 <action
-                     description="Mettre en bascule divers paramètres À propos du terrain &gt; Options"
-                     longdescription="Mettre en bascule Sécurisé (pas de dégâts) et Voler, et permettre aux autres résidents de : Créer des objets, Modifier le terrain, Créer des repères et Lancer des scripts sur des terrains appartenant au groupe, à partir de la section À propos du terrain &gt; Options."
+                     description="Changer diverses options du terrain"
+                     longdescription="Changez diverses options de la parcelle à partir du menu À propos du terrain &gt; Options. Vous pouvez permettre aux autres résidents de voler, créer des objets, modifier le terrain, lancer des scripts, créer des repères etc."
                      name="land options" value="22" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent aux membres d&apos;outrepasser les restrictions sur les parcelles appartenant à un groupe."
+             description="Ces pouvoirs permettent aux membres d&apos;outrepasser les restrictions sur les parcelles du groupe."
              name="Parcel Powers">
                 <action description="Toujours autoriser Modifier le terrain"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent modifier le terrain d&apos;une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+                     longdescription="Vous pouvez modifier le relief d&apos;une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
                      name="land allow edit land" value="23" />
                 <action description="Toujours autoriser à voler"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent voler sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+                     longdescription="Vous pouvez voler sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
                      name="land allow fly" value="24" />
                 <action description="Toujours autoriser à créer des objets"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent créer des objets sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+                     longdescription="Vous pouvez créer des objets sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
                      name="land allow create" value="25" />
                 <action description="Toujours autoriser à créer des repères"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent créer un repère sur une parcelle appartenant au groupe, même si l&apos;option est désactivée dans la section À propos du terrain &gt; Options."
+                     longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu À propos du terrain &gt; Options."
                      name="land allow landmark" value="26" />
-                <action description="Autoriser à définir un domicile ici sur le terrain du groupe"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent utiliser le menu Monde &gt; Définir comme domicile sur une parcelle transférée à ce groupe."
+                <action description="Autoriser à définir un domicile sur le terrain du groupe"
+                     longdescription="Vous pouvez définir votre domicile sur une parcelle du groupe à partir du menu Monde &gt; Définir comme domicile."
                      name="land allow set home" value="28" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent d&apos;autoriser ou d&apos;interdire l&apos;accès à des parcelles appartenant au groupe, y compris de geler ou d&apos;expulser des résidents."
+             description="Ces pouvoirs permettent d&apos;autoriser ou d&apos;interdire l&apos;accès à des parcelles du groupe et de geler ou d&apos;expulser des résidents."
              name="Parcel Access">
-                <action description="Gérer les listes d&apos;accès à cette parcelle"
-                     longdescription="Gérez les listes d&apos;accès à la parcelle à partir de la section À propos du terrain &gt; Accès."
+                <action description="Gérer la liste d&apos;accès à la parcelle"
+                     longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain &gt; Accès."
                      name="land manage allowed" value="29" />
-                <action description="Gérer les listes noires de cette parcelle"
-                     longdescription="Gérez les listes de membres interdits sur la parcelle à partir de la section À propos du terrain &gt; Interdire."
+                <action description="Gérer la liste noire de cette parcelle"
+                     longdescription="Gérez la liste des résidents interdits sur la parcelle à partir du menu À propos du terrain &gt; Interdire."
                      name="land manage banned" value="30" />
-                <action description="Modifier les paramètres Vendre des passes sur cette parcelle"
-                     longdescription="Modifiez les paramètres Vendre des passes à la section À propos du terrain &gt; Accès."
+                <action description="Vendre des pass"
+                     longdescription="Choisissez le prix et la durée des pass pour accéder à la parcelle à partir du menu À propos du terrain &gt; Accès."
                      name="land manage passes" value="31" />
-                <action description="Expulser et geler des résidents sur les parcelles"
-                     longdescription="Les membres dans un rôle leur conférant ce pouvoir peuvent intervenir auprès d&apos;un résident indésirable en cliquant-droit sur lui &gt; Plus et en choisissant de les expulser ou de les geler."
+                <action description="Expulser et geler des résidents"
+                     longdescription="Vous pouvez expulser ou geler un résident indésirable en cliquant-droit sur lui, menu radial &gt; Plus."
                      name="land admin" value="32" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent d&apos;autoriser des membres à renvoyer des objets et de placer ou déplacer des plantes Linden. Ceci permet aux membres de jeter les déchets et d&apos;aménager le paysage. A utiliser avec précaution car les objets rendus le sont définitivement."
+             description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement."
              name="Parcel Content">
-                <action description="Renvoyer les objets appartenant au groupe"
-                     longdescription="Renvoyez les objets sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+                <action description="Renvoyer les objets transférés au groupe"
+                     longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu À propos du terrain &gt; Objets."
                      name="land return group owned" value="48" />
                 <action description="Renvoyer les objets attribués au groupe"
-                     longdescription="Renvoyez les objets attribués au groupe et sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+                     longdescription="Renvoyez les objets attribués au groupe et sur des parcelles du groupe à partir du menu À propos du terrain &gt; Objets."
                      name="land return group set" value="33" />
                 <action description="Renvoyer des objets n&apos;appartenant pas au groupe"
-                     longdescription="Renvoyez les objets non attribués au groupe et sur des parcelles appartenant au groupe à la section À propos du terrain &gt; Objets."
+                     longdescription="Renvoyez les objets n&apos;appartenant pas au groupe et sur des parcelles du groupe à partir du menu À propos du terrain &gt; Objets."
                      name="land return non group" value="34" />
                 <action description="Aménager le paysage avec des plantes Linden"
-                     longdescription="Le pouvoir de placer et de déplacer des arbres, plantes et pelouses Linden. Ces éléments sont disponibles dans le dossier Objets de la  bibiliothèque de votre inventaire ou peuvent être créés à l&apos;aide du bouton Construire."
+                     longdescription="Placez et déplacez des arbres, plantes et herbes Linden. Vous les trouverez dans le dossier Objets de la  bibliothèque de votre inventaire mais aussi à partir du menu Construire."
                      name="land gardening" value="35" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent de transférer, modifier et vendre des objets appartenant au groupe. Ces changements se font à partir de la section Construire &gt; Modifier &gt; Général. Cliquez-droite sur un objet pour le modifier et afficher ses paramètres. "
+             description="Ces pouvoirs permettent de transférer, modifier et vendre des objets du groupe. Ces changements se font à partir du menu Construire &gt; Modifier &gt; Général."
              name="Object Management">
                 <action description="Transférer des objets au groupe"
-                     longdescription="Transférez des objets à un groupe à la section Construire &gt; Modifier &gt; Général."
+                     longdescription="Transférez des objets au groupe à partir du menu Construire &gt; Modifier &gt; Général."
                      name="object deed" value="36" />
                 <action
-                     description="Manipuler (déplacer, copier, modifier) des objets appartenant au groupe"
-                     longdescription="Manipulez (déplacez, copiez, modifiez) des objets appartenant au groupe à la section Construire &gt; Modifier &gt; Général."
+                     description="Manipuler les objets du groupe"
+                     longdescription="Déplacez, copiez et modifiez les objets du groupe à partir du menu Construire &gt; Modifier &gt; Général."
                      name="object manipulate" value="38" />
-                <action description="Mettre en vente des objets appartenant au groupe"
-                     longdescription="Définissez les objets du groupe à vendre à la section Construire &gt; Modifier &gt; Général."
+                <action description="Vendre des objets du groupe"
+                     longdescription="Mettez en vente des objets du groupe à partir du menu Construire &gt; Modifier &gt; Général."
                      name="object set sale" value="39" />
         </action_set>
         <action_set
-             description="Les membres avec ces pouvoirs contribuent aux frais du groupe, reçoivent des dividendes et ont accès à l&apos;historique du compte du groupe."
+             description="Ce pouvoir définit les contributions aux frais du groupe, la réception des dividendes et l&apos;accès aux finances du groupe."
              name="Accounting">
                 <action description="Contribuer aux frais du groupe et recevoir des dividendes"
-                     longdescription="Les membres ayant ce pouvoir contribueront automatiquement aux frais du groupe et recevront aussi des dividendes. Cela signifie qu&apos;ils recevront une portion des ventes de terrains appartenant au groupe (distribuée quotidiennement) et contribueront aux frais divers, tels que les frais de mise en vente des terrains. "
+                     longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc.)"
                      name="accounting accountable" value="40" />
         </action_set>
         <action_set
-             description="Ces pouvoirs permettent d&apos;envoyer, recevoir et consulter les notes du groupe."
+             description="Envoyez, recevez et consultez les notices du groupe."
              name="Notices">
-                <action description="Envoyer des notes"
-                     longdescription="Ces pouvoirs permettent d&apos;envoyer des notes à la section Infos du groupe &gt; Notes."
+                <action description="Envoyer des notices"
+                     longdescription="Envoyez des notices à l&apos;onglet Notices."
                      name="notices send" value="42" />
-                <action description="Recevoir des notes et consulter les anciennes notes"
-                     longdescription="Ces pouvoirs permettent de recevoir des notes et de consulter d&apos;anciennes notes à la section Infos du groupe &gt; Notes."
+                <action description="Recevoir et consulter les notices"
+                     longdescription="Recevez des notices et consulter d&apos;anciennes notices à l&apos;onglet Notices."
                      name="notices receive" value="43" />
         </action_set>
         <action_set
              description="Ces pouvoirs permettent de créer de nouvelles propositions, de voter et de consulter l&apos;historique des votes."
              name="Proposals">
                 <action description="Créer des propositions"
-                     longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir de la section Infos du groupe &gt; Propositions."
+                     longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir du menu Profil du groupe &gt; Propositions."
                      name="proposal start" value="44" />
                 <action description="Voter les propositions"
-                     longdescription="Ces pouvoirs permettent de voter des propositions à la section Infos du groupe &gt; Propositions."
+                     longdescription="Votez les propositions à partir du menu Profil du groupe &gt; Propositions."
                      name="proposal vote" value="45" />
         </action_set>
         <action_set
-             description="Ces pouvoirs vous permettent d&apos;autoriser ou dinterdire l&apos;accès aux sessions de chat de groupe et au chat de groupe vocal."
+             description="Ces pouvoirs vous permettent de gérer l&apos;accès aux sessions de chat écrit ou vocal du groupe."
              name="Chat">
-                <action description="Participer au chat de groupe"
-                     longdescription="Les membres qui ont ce pouvoir peuvent participer aux chats de groupe, texte ou vocal."
+                <action description="Participer aux chats"
+                     longdescription="Participez aux chats du groupe."
                      name="join group chat" />
-                <action description="Participer au chat de groupe vocal"
-                     longdescription="Les membres qui ont ce pouvoir peuvent participer aux chats de groupe vocaux. Remarque : pour accéder à une session de chat vocal, vous devez avoir le droit de participer à un chat de groupe."
+                <action description="Participer au chat vocal"
+                     longdescription="Participez au chat vocal du groupe. Remarque : vous devez au préalable avoir le pouvoir de participer aux chats."
                      name="join voice chat" />
-                <action description="Modérer un chat de groupe"
-                     longdescription="Les membres dont le rôle leur confèrent ce pouvoir contrôlent l&apos;accès et la participation aux chats de groupe écrits et vocaux.le"
+                <action description="Modérer les chats"
+                     longdescription="Contrôlez l&apos;accès et la participation aux chats de groupe écrits et vocaux."
                      name="moderate group chat" />
         </action_set>
 </role_actions>
diff --git a/linden/indra/newview/skins/default/xui/fr/strings.xml b/linden/indra/newview/skins/default/xui/fr/strings.xml
index 90585d3..a26088f 100644
--- a/linden/indra/newview/skins/default/xui/fr/strings.xml
+++ b/linden/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <strings>
         <string name="LoginInProgress">
                 La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
@@ -82,7 +82,7 @@
                 Toucher
         </string>
         <string name="TooltipFlagL$">
-                $L
+                L$
         </string>
         <string name="TooltipFlagDropInventory">
                 Laisser tomber l&apos;inventaire
@@ -100,7 +100,7 @@
                 Copie autorisée
         </string>
         <string name="TooltipForSaleL$">
-                À vendre : [AMOUNT] $L
+                À vendre : [AMOUNT] L$
         </string>
         <string name="TooltipForSaleMsg">
                 À vendre : [MESSAGE]
@@ -139,7 +139,7 @@
                 Notes de version
         </string>
         <string name="LoadingData">
-                Chargement en cours...
+                Chargement..
         </string>
         <string name="AvatarNameNobody">
                 (personne)
@@ -301,7 +301,7 @@
                 Non
         </string>
         <string name="anim_nyanya">
-                Na na na nère
+                Na na na na nère
         </string>
         <string name="anim_punch_onetwo">
                 Gauche-droite
@@ -403,15 +403,15 @@
                 Oui
         </string>
         <string name="texture_loading">
-                Chargement en cours...
+                Chargement...
         </string>
         <string name="worldmap_offline">
                 Hors ligne
         </string>
         <string name="whisper">
-                chuchotages :
+                chuchote :
         </string>
         <string name="shout">
-                cris :
+                crie :
         </string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index 9fb7a12..30ba935 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <alerts>
         <global name="skipnexttime">
                 今後�表示���
@@ -200,7 +200,7 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="GroupCreateSuccess">
                 <message name="message">
-                        グループ�作��正常�終了����。
+                        グループ�作��正常�行�れ���。
                 </message>
         </alert>
         <alert name="UnableToCreateGroup">
@@ -383,22 +383,22 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="ClickWebProfileHelpAvatar">
                 <message name="message">
-                        ���人�ウェブプロフィールURLを設定���る場���以下�����能��。
- * ��ページを内蔵ブラウザー�表示�る��� [ロード]をクリック���。
- * ��ページを外部ブラウザー�表示�る��� [ロード]-[開�]をクリック���。
- * 別�ページ�アクセス������ �人�ウェブ・プロフィール�戻り��時�� [ロード]-[ホームURL]をクリック���。
+                        ���人�ウェブ・プロフィールURLを設定���る場���以下�����能��。
+ * [ロード]をクリック����ウェブ・タブ内�ページを表示
+ * [ロード] &gt; &apos;外部ブラウザ&apos; をクリック��ディフォルト�ウェブ・ブラウザ�ページを表示
+ * [ロード] &gt; &apos;ホームURL&apos; をクリック��他�ページ�ら���人�ウェブ・プロフィール�戻る
  
-自分�プロフィールを表示���る����任��URLをウェブプロフィール���入力��[OK]をクリック��設定����。
-プロフィールを見�他��人����URL�アクセス�る�������。
+自分�プロフィール�任��URLを入力�OKをクリック���ウェブ・プロフィール���設定�る�������。
+�れを見�他��人���サイトを訪れる�������。
                 </message>
         </alert>
         <alert name="ClickWebProfileNoWebHelpAvatar">
                 <message name="message">
-                        ���人�ウェブ・プロフィールURLを設定���る場���以下�����能��:
-*��ページをデフォルト�外部ウェブ・ブラウザー�表示�る���[開�]をクリック���。
+                        ���人�ウェブ・プロフィールURLを設定���る場���以下�����能��。
+ * Openをクリック��ディフォルト�ウェブ・ブラウザ�ページを表示
  
-自分�プロフィールを表示���る����任��URLをウェブ・プロフィール���入力����。
-プロフィールを見��人����URL�アクセス�る�������。
+自分�プロフィール�任��URLを入力�OKをクリック���ウェブ・プロフィール���設定�る�������。
+�れを見�他��人���サイトを訪れる�������。
                 </message>
         </alert>
         <alert name="ReputationMinGreaterThanMax">
@@ -468,8 +468,8 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
-                        ��グループ��加�る��L$[COST]��り��。
-残金�足������グループ��加����ん。
+                        ��グループ�加入�る���L$[COST]必���。
+L$��足���る����グループ��加�る�������ん。
                 </message>
         </alert>
         <alert name="LandBuyPass">
@@ -656,12 +656,12 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
-                        �信者�電�メール・アドレスを入力������。
+                        �信者�有効�Eメールアドレスを入力������。
                 </message>
         </alert>
         <alert name="PromptSelfEmail">
                 <message name="message">
-                        ����電�メール・アドレスを入力������。
+                        ����Eメール・アドレスを入力������。
                 </message>
         </alert>
         <alert name="PromptMissingSubjMsg">
@@ -716,14 +716,6 @@ Studio exhibit�ウェブ・ページ�確�������。
                         ��読�込�れ���������アイテムを装�����ん。後�やり直������。
                 </message>
         </alert>
-        <alert name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        [SECOND_LIFE]��接続��アカウント�必���。
-                </message>
-                <option name="OK">
-                        閉�る
-                </option>
-        </alert>
         <alert name="MustHaveAccountToLogIn">
                 <message name="message">
                         ���! 記入�れ��り��よ。
@@ -886,8 +878,7 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
-                        オークション�詳細を見�り�
-入札を�る���[SECOND_LIFE]ウェブ・ページ�移動����？
+                        [SECOND_LIFE]ウェブ・ページ�移動�� 入札�る��オークション�詳細を確�����？
                 </message>
                 <option name="GotoPage">
                         OK
@@ -1026,10 +1017,10 @@ Studio exhibit�ウェブ・ページ�確�������。
         </alert>
         <alert name="UnsupportedHardware">
                 <message name="message">
-                        警告： ����システム� Second Life を使用�る���必��必須動作環境��件をを満������ん。 Second Life を�����使用��る����分�パフォーマンス��得られ����れ��り��。 ���サ�ート外�システム構���使用�場��テクニカルサ�ートを�利用�����������ん。 
+                        警告： ����システム� Second Life を使用�る���必��必須動作環境��件を満������ん。 Second Life を�����使用��る����分�パフォーマンス��得られ����れ��り��。 ���サ�ート外�システム構���使用�場��テクニカルサ�ートを�利用�����������ん。 
 
  必須動作環境��件
-［_URL］ �アクセス����ら�詳��情報を�覧��り���?
+[_URL] �アクセス����ら�詳��情報を�覧��り���?
                 </message>
                 <ignore name="ignore">
                         サ�ート外��ードウェア�検出時
@@ -1394,6 +1385,28 @@ www.secondlife.comã�«æˆ»ã�£ã�¦ã€�æ–°è¦�アカウントã�®ä½œæˆ�ã‚’è¡Œã�„ã�¾ã�™ã�
                         キャンセル
                 </option>
         </alert>
+        <alert name="EjectAvatarNoBan">
+                <message name="message">
+                        ��ア�ターを����土地�ら追放����？
+                </message>
+                <option name="Eject">
+                        追放
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
+        <alert name="EjectAvatarFullnameNoBan">
+                <message name="message">
+                        [AVATAR_NAME] を����土地�ら追放����？
+                </message>
+                <option name="Eject">
+                        追放
+                </option>
+                <option name="Cancel">
+                        キャンセル
+                </option>
+        </alert>
         <alert name="InvalidUUID">
                 <message name="message">
                         UUID�無効��。
@@ -1573,12 +1586,12 @@ www.secondlife.comã�«æˆ»ã�£ã�¦ã€�æ–°è¦�アカウントã�®ä½œæˆ�ã‚’è¡Œã�„ã�¾ã�™ã�
         </alert>
         <alert name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        ファイルをアップロード�る��資金�足��:価格�L$[COST]����残金�L$[BALANCE]��。
+                        L$�足����ファイル�アップロード�����ん。 必�金��L$[COST], 残高�L$[BALANCE]��。
                 </message>
         </alert>
         <alert name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        ファイル[FILE]�アップロードを完了�る��資金�足��:価格�L$[COST]����残金�L$[BALANCE]��。
+                        L$�足����[FILE]�アップロード�����ん。 必�金��L$[COST], 残高�L$[BALANCE]��。
                 </message>
         </alert>
         <alert name="CannotUploadReason">
@@ -2074,10 +2087,13 @@ L$�贈与�れ��ん。
         </alert>
         <alert name="AddFriend" title="フレンドを追加">
                 <message name="message">
-                        フレンド�士��互���在地を地図�表示�る��を許���オンラインステータス�更新�����
+                        フレンド���追加�る���互���在地�地図��表示許��オンラインステータス表示�設定を�る�������。
 
 [NAME] �フレンドシップを�り���？
                 </message>
+                <editline name="editline">
+                        フレンド���登録���れ���？
+                </editline>
                 <option name="Offer">
                         OK
                 </option>
@@ -2087,12 +2103,12 @@ L$�贈与�れ��ん。
         </alert>
         <alert name="AddFriendWithMessage" title="フレンドを追加">
                 <message name="message">
-                        フレンド�士��互���在地を地図�表示�る��を許���オンラインステータス�更新�����
+                        フレンド���追加�る���互���在地�地図��表示許��オンラインステータス表示�設定を�る�������。
 
 [NAME] �フレンドシップ�オファーを����？
                 </message>
                 <editline name="editline">
-                        ��フレンド�����������？
+                        フレンド���登録���れ���？
                 </editline>
                 <option name="Offer">
                         OK
@@ -2444,8 +2460,8 @@ http://www.apple.com/quicktime/ã�§ã€�最新版をダウンロードã�—ã�¦ã��ã� ã
         </alert>
         <alert name="AvatarMoved">
                 <message name="message">
-                        [TYPE]�ロケーション��在利用����ん。 [HELP] 
-����近��地域�移�れ���。
+                        ����訪れ��[TYPE]�ロケーション��在�利用����ん。 [HELP] 
+近��地域�移動����。
                 </message>
         </alert>
         <alert name="ClothingLoading">
@@ -2523,7 +2539,7 @@ F1キーを押������。
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] 残金�足り��ん。
+                        [NAME] L$ [PRICE] 残高�足���実行����。
                 </message>
         </alert>
         <alert name="GrantedModifyRights">
@@ -2781,10 +2797,10 @@ F1キーを押������。
         </alert>
         <alert name="WebLaunchExternalTarget">
                 <message name="message">
-                        �使��システム�ウェブ・ブラウザーを開�����内容を表示����?
+                        �使��システム�ウェブ・ブラウザを開�����内容を表示����?
                 </message>
                 <ignore name="ignore">
-                        �使��システム�ブラウザーを開��ウェブ・ページを表示�よ������
+                        �使��システム�ブラウザを開��ウェブ・ページを表示�よ������
                 </ignore>
                 <option name="Open">
                         OK
@@ -2798,7 +2814,7 @@ F1キーを押������。
                         www.secondlife.com�移動��アカウントを管�����？
                 </message>
                 <ignore name="ignore">
-                        �座を管��る���ウェブ・ブラウザーを起動�る��
+                        アカウントを管��る���ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="OK">
                         OK
@@ -2837,10 +2853,10 @@ F1キーを押������。
         </alert>
         <alert name="WebLaunchQAWiki">
                 <message name="message">
-                        [SECOND_LIFE] QA Wikiを�覧����。
+                        [SECOND_LIFE] �質�証関連Wikiを�覧����。
                 </message>
                 <ignore name="ignore">
-                        QA Wikiを閲覧�る���ウェブ・ブラウザを起動�る�����
+                        �質�証関連Wikiを閲覧�る���ウェブ・ブラウザを起動�る�����
                 </ignore>
                 <option name="Gotopage">
                         OK
@@ -2879,10 +2895,10 @@ F1キーを押������。
         </alert>
         <alert name="WebLaunchForums">
                 <message name="message">
-                        最新�ヒント�よ�トリック������[SECOND_LIFE]�知識ベースを検索������。
+                        最新�ヒント�よ�トリック������[SECOND_LIFE]�ナレッジベースを検索������。
                 </message>
                 <ignore name="ignore">
-                        知識ベースを表示�る���ウェブ・ブラウザーを起動�る��
+                        ナレッジベースを表示�る���ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="Gotopage">
                         OK
@@ -2896,7 +2912,7 @@ F1キーを押������。
                         [SECOND_LIFE]サ�ート�コンタクト
                 </message>
                 <ignore name="ignore">
-                        サ�ート�連絡�る���ウェブ・ブラウザーを起動�る��
+                        サ�ート�連絡�る���ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="Gotopage">
                         OK
@@ -2910,7 +2926,7 @@ F1キーを押������。
                         Linden公�ブログ��最新�ニュースや情報を入手������。
                 </message>
                 <ignore name="ignore">
-                        ブログを表示�る���ウェブ・ブラウザーを起動�る��
+                        ブログを表示�る���ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="Gotopage">
                         OK
@@ -2924,7 +2940,7 @@ F1キーを押������。
                         スクリプトガイドを開���スクリプト�ヘルプを�照����？
                 </message>
                 <ignore name="ignore">
-                        LSLガイドを表示�る���ウェブ・ブラウザーを起動�る��
+                        LSLガイドを表示�る���ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="Gotopage">
                         OK
@@ -2938,7 +2954,7 @@ F1キーを押������。
                         LSL�ータルを開��スクリプト�ヘルプを�照����？
                 </message>
                 <ignore name="ignore">
-                        LSL�ータルを表示�る����ウェブ・ブラウザーを起動�る��
+                        LSL�ータルを表示�る����ウェブ・ブラウザを起動�る��
                 </ignore>
                 <option name="Gotopage">
                         ページ�移動
@@ -3062,14 +3078,13 @@ F1キーを押������。
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        ビジーモード�設定�れ���。
-�ャット�ＩＭ�隠れ��。 ＩＭ
-��ビジーモード�応答を���り��。 全��テレ�ート
-�オファー�拒��れ��。 全����物�オファー�ゴミ箱�
-�られ��。
+                        �り込�中�設定�れ���。
+�ャット�インスタント・メッセージ（IM）�隠れ��。 
+相手�「�り込�中応答メッセージ�をIM����り��。 
+テレ�ート�オファー�全�拒��れ���物�オファー�全�ゴミ箱��られ��。
                 </message>
                 <ignore name="ignore">
-                        ビジー・モードを設定�る��
+                        �り込�中�設定を�る��
                 </ignore>
                 <option name="OK">
                         OK
@@ -3195,10 +3210,10 @@ F1キーを押������。
         </alert>
         <alert name="OfferTeleport">
                 <message name="message">
-                        ����ロケーション��テレ�ートを次�メッセージ�共�贈り���？
+                        次�メッセージを添������今�る場所��テレ�ートを�り���？
                 </message>
                 <editline name="editline">
-                        [REGION]��加希望
+                        [REGION]����ん�？
                 </editline>
                 <option name="OK">
                         OK
@@ -3212,7 +3227,7 @@ F1キーを押������。
                         ユーザーをゴッド・コール�呼�寄����？
                 </message>
                 <editline name="editline">
-                        [REGION]��加希望
+                        [REGION]����ん�？
                 </editline>
                 <option name="OK">
                         OK
@@ -3240,6 +3255,7 @@ F1キーを押������。
                         今�����動産��る人全員��る
 短�メッセージを入力������。.
                 </message>
+                <editline name="editline"/>
                 <option name="OK">
                         OK
                 </option>
@@ -3527,6 +3543,7 @@ L$[AMOUNT]ã�§ã€�ã�“ã�®ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šã‚’今ã�™ã��公開ã�—ã�¾ã�™ã�‹ï
                         ��地域��る人全員��る
 短�メッセージを入力������。
                 </message>
+                <editline name="editline"/>
                 <option name="OK">
                         OK
                 </option>
@@ -4137,7 +4154,7 @@ Linden社所有�メインランド��動産��太陽��置�
                         SecondLifeウェブ・ページを開��アカウント履歴を確�����？
                 </message>
                 <ignore name="ignore">
-                        �座履歴�ウェブ・ページをロード�る��
+                        アカウント履歴�ウェブ・ページをロード�る��
                 </ignore>
                 <option name="Gotopage">
                         ページ�移動
@@ -4190,17 +4207,15 @@ Linden社所有�メインランド��動産��太陽��置�
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        ��ツール�利用�約���コミュニティースタンダード��� 
-報告�使用������。 �照:
+                        利用�約���コミュニティースタンダード���報告���ツールを�使用����。 �照：
 
 http://secondlife.com/corporate/tos.php 
 http://secondlife.com/corporate/cs.php
 
-利用�約���コミュニティースタンダード���関�る全��レ�ート� 
-調査�れ�解決�れ��。 以下�Police Blotter� 
-解決�確�を�る�������:
+利用�約���コミュニティースタンダード���関�る全��レ�ート��調査�れ�解決�れ��。 
+以下�リンク先�Incident Report����確�を�る�������。
 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
@@ -4220,7 +4235,7 @@ http://secondlife.com/community/blotter.php
 使用������。��る��詳��情報を�供������。
 自動返答メール��より詳��情報を付�加��返信�る��も
 ����。
-�グレ�ート�全�調査�れ解決�れ��。�れ�よ��電�メール�返答��られ��る����り��ん。
+�グレ�ート�全�調査�れ解決�れ��。�れ�よ��Eメール�返答��られ��る����り��ん。
 -
 テクニカル��題�生��場���次�サ�ート�連絡������:  
 http://secondlife.com/community/support.php
@@ -4282,18 +4297,22 @@ http://secondlife.com/community/support.php
         </alert>
         <alert name="HelpReportAbuseContainsCopyright">
                 <message name="message">
-                        親愛�る�人�皆様�
-
-知的所有権�侵害を報告�る場���以下���り正確�報告������。
-
-(1) 嫌�ら��処�。 �人�Second Life�許�システムを�当�使用��知的所有権�侵害�れ��る�考�られる場���嫌�ら�報告を�出�る�������。許�システムを�当�使用�る手段����������CopyBot���類似��コピー・ツール��り��。 嫌�ら�対応担当�ーム�調査を行��Second Life�コミュニティ・スタンダード���利用�約����る態度�対����切�懲罰処分�行�れ��。 ����嫌�ら�対応担当�ーム���コンテンツをSecond Lifeワールド�ら削除�るリクエスト�対�る処����回答�行���ん。
+                        Dear Resident,
+ 
+知的財産�侵害�関�る報告を行�際���以下�点�注�������。
 
-(2) DMCA���コンテンツ�削除処�。 Second Life�ら�コンテンツ�削除をリクエスト�る���http://secondlife.com/corporate/dmca.php�DMCA�リシー��る�侵害�関�る有効�通知を�出�る必���り��。
+(1) 嫌�ら��報告�プロセス。Second Life�権�システムを悪用���る�人を見���ら�嫌�ら��報告を行������。
+例��コピーBot�使用��れ�似�ツール�使用�よる知的財産権�侵害��り��。
+アビューズ�ーム�調査�基��Second Life�コミュニティースタンダードや利用�約����る行為�判断�れ�場����切�処置を行�����。
+����コンテンツをSecond Life�ら撤去�����������望��アビューズ�ーム�応�る�������ん。
 
-嫌�ら��処�を継続�る場�����ウインドウを閉��報告を�出������。
+(2) DMCA（デジタルミレニアム著作権法）��コンテンツ撤去プロセス。 Second Life�ら�コンテンツ�撤去をリクエスト�る���著作権侵害通知��出を行�必���り��。
+�照：http://secondlife.com/corporate/dmca.php
 
-��力�り��������。
+��件�関�る嫌�ら��報告を続�る際����ウィンドウを閉������。�択���カテゴリ�「知的財産�侵害 &gt; コピーBot��権��悪用������る�も�れ��ん���確�����。
 
+Thank you,
+ 
 Linden Lab
                 </message>
         </alert>
@@ -4318,17 +4337,16 @@ Linden Lab
                         キャンセル
                 </option>
         </alert>
-        <alert name="BusyModePay" title="ビジー・モード�警告">
+        <alert name="BusyModePay" title="�り込�中�警告">
                 <message name="message">
-                        �在�ビジー・モード������支払��
+                        �在��り込�中������支払��
 引����アイテムを���る���
 ����ん。
  
-���引を完了�る���ビジー・
-モードを外����？
+���引を完了�る����り込�中�設定を解除����？
                 </message>
                 <ignore name="ignore">
-                        ビジー・モード�人���オブジェクト�支払���
+                        �り込�中�人���オブジェクト�支払���
                 </ignore>
                 <option name="Yes">
                         OK
@@ -4412,7 +4430,7 @@ Linden Lab
         </alert>
         <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        ��パ�ル�ウィンドウ�サイズ�解�度��よ�クライアント�グラフィック��質を制御���。  [環境設定]&gt;[グラフィック]�インタフェース���次� 4 ��中�らグラフィック・レベルを�択����。低�中�高�超高。 ���[カスタム]�ェックボックスをクリック��次�設定を�作�る����グラフィックス�設定をカスタマイズ�る��も����。
+                        ��パ�ル���ウィンドウ�サイズ�解�度��よ�クライアント�グラフィック��質を設定�る�������。[環境設定]&gt;[表示]�インタフェース���低�中�高�超高�4��中�らグラフィック・レベルを�択����。���[カスタム]�ェックボックスをクリック��以下�グラフィックス�設定をカスタマイズ�る��も����。
 
 シェーダー:ピクセル・シェーダー������種類を有効���無効����。 
 
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_about.xml b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
index f281193..c8f6b76 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Second Life����">
         <text_editor name="credits_editor">
-                Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ����他多数�人��よ��作��れ���。
+                Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les����他多数�人��よ��作��れ���。
 
-  ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 Aminom Marvin�ava ganache�Balthazar Fouroux�CrystalShard Foo�Davec Horsforth�Drew Dwi�Ellla McMahon�Gellan Glenelg�Harleen Gretzky�istephanija munro�Iustinian Tomsen�JC Glimmer�Joeseph Albanese�kelly young�Latif Khalifa�Lex Neva�McCabe Maxsted�Michi Lumin�moni duettmann�Moon Metty�motor loon�Opensource Obscure�Sky Hye�Soap Clawtooth�velveeta biedermann�zeebster colasanti
+  ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 afon shepherd�Aimee Trescothick�Alexandrea Fride�Alissa Sabre�Amber DeCuir�Asuka Neely�Auron Forcella�Blue Revolution�Bocan Undercroft�Boroondas Gupte�Brandon Shinobu�Bri Gufler�Buckaroo Mu�Celierra Darling�Christos Atlantis�Coder Kas�Cummere Mayo�dakota schwade�Dirk Talamasca�Dizzy Banjo�Drew Dwi�Duckling Kwak�Ellla McMahon�Erikah Jameson�Erinyse Planer�Eyana Yohkoh�Ezian Ecksol�Faron Karu�Fenoe Lowey�Fox Hwasung�Francisca Biedermann�Gally Young�Gellan Glenelg�Geneko Nemeth�Glenn Rotaru�Hagar Qinan�Harleen Gretzky�Holger Gilruth�hotrodjohnny gears�IAm Zabelin�Inigo Catteneo�Iustinian Tomsen�Jacek Antonell�James Benedek�Jim Kupferberg�Joeseph Albanese�JPT62089 Agnon�Kardargo Adamczyk�Kirstenlee Cinquetti�Latif Khalifa�lea Parnall�Lex Neva�Lillith Anatine�Lilly Zenovka�Lim Catteneo�Lindal Kidd�Mark Rosenbaum�MasterJ Chaplin�McCabe Maxsted�Melvin Starbrook�Meni Kaiousei�Mero Collas�Minakothegothicgeisha Kamachi�Moon Metty�neofilo aabye�Neutron Chesnokov�Nomad Ingwer�norritt Xi�Opensource Obscure�Oracle Weatherwax�Ourasi Ferraris�Pabl0 Roffo�Peyton Aleixandre�Phli Foxchase�Psi Merlin�r2d2 Wunderlich�Regi Yifu�Saijanai Kuhn�Sandor Balczo�Sarkan Dreamscape�Scree Raymaker�Sedona Mills�Selena Beale�Sheet Spotter�Shibari Twine�Silver Key�Simon Kline�SLB Wirefly�Stacy Wombat�Sugarcult Dagger�Tayra Dagostino�Tetsuryu Vlodovic�ThaBiGGDoGG Richez�Timo Gufler�tx Oh�wayfinder wishbringer�Wizzytoe McCullough�Wundur Primbee�Yann Dufaux�Yuu Nakamichi�Aminom Marvin�Andred Qinan�arminasx saiman�caroline apollo�Iskar Ariantho�Jenika Connolly�Maghnus Balogh�Nefertiti Nefarious�RodneyLee Jessop
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
@@ -26,9 +26,9 @@
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
-  ��り�短���������山�よ���る –アラン・�ューニング
+  ���助���れ�何��や����る --リ�ャード・スターキー
         </text_editor>
         <text name="you_are_at">
-                [POSITION]中
+                [POSITION]
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
index adc85df..15a4c91 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -1,288 +1,260 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="土地情報">
         <tab_container name="landtab">
                 <panel label="一般" name="land_general_panel">
-                        <text type="string" length="1" name="Name:">
+                        <text length="1" name="Name:" type="string">
                                 ��：
                         </text>
-                        <text type="string" length="1" name="Description:">
+                        <line_editor name="Name"/>
+                        <text length="1" name="Description:" type="string">
                                 説明：
                         </text>
-                        <text type="string" length="1" name="Owner:">
+                        <text length="1" name="Owner:" type="string">
                                 オーナー：
                         </text>
-                        <text type="string" length="1" name="OwnerText">
+                        <text length="1" name="OwnerText" type="string">
                                 Leyla Linden
                         </text>
-                        <button label="プロフィール..." label_selected="プロフィール..."
-                             name="Profile..." />
-                        <text type="string" length="1" name="Group:">
+                        <button label="プロフィール..." label_selected="プロフィール..." name="Profile..."/>
+                        <text length="1" name="Group:" type="string">
                                 グループ：
                         </text>
-                        <button label="設定..." label_selected="設定..." name="Set..." />
-                        <check_box label="グループ��譲渡を許�" name="check deed"
-                             tool_tip="グループ・オフィサー����土地をグループ�譲渡��グループ�土地�分�委�る�������。" />
-                        <button label="譲渡..." label_selected="譲渡..." name="Deed..."
-                             tool_tip="�択�れ�グループ�オフィサー��る�����土地を譲渡����。" />
-                        <check_box label="オーナー�譲渡�共�寄付" name="check contrib"
-                             tool_tip="土地�グループ�譲渡�れる�����所有者�譲渡��立�るよ���分�土地を寄付���。" />
-                        <text type="string" length="1" name="For Sale:">
+                        <button label="設定..." label_selected="設定..." name="Set..."/>
+                        <check_box label="グループ��譲渡を許�" name="check deed" tool_tip="グループ・オフィサー����土地をグループ�譲渡��グループ�土地�分�委�る�������。"/>
+                        <button label="譲渡..." label_selected="譲渡..." name="Deed..." tool_tip="�択�れ�グループ�オフィサー��る�����土地を譲渡����。"/>
+                        <check_box label="オーナー�譲渡�共�寄付" name="check contrib" tool_tip="土地�グループ�譲渡�れる�����所有者�譲渡��立�るよ���分�土地を寄付���。"/>
+                        <text length="1" name="For Sale:" type="string">
                                 売り出�中：
                         </text>
-                        <text type="string" length="1" name="Not for sale.">
-                                販売対象外。
+                        <text length="1" name="Not for sale." type="string">
+                                販売対象外
                         </text>
-                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+                        <text length="1" name="For Sale: Price L$[PRICE]." type="string">
                                 料金：L$[PRICE]
                         </text>
-                        <button label="土地を販売..." label_selected="土地を販売..."
-                             name="Sell Land..." />
-                        <text type="string" length="1" name="For sale to">
+                        <button label="土地を販売..." label_selected="土地を販売..." name="Sell Land..."/>
+                        <text length="1" name="For sale to" type="string">
                                 販売先：[BUYER]
                         </text>
-                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
-                                販売���るオブジェクト。
+                        <text length="1" name="Sell with landowners objects in parcel." type="string">
+                                オブジェクトも販売価格���れ��
                         </text>
-                        <text type="string" length="1" name="Selling with no objects in parcel.">
-                                販売�����オブジェクト。
+                        <text length="1" name="Selling with no objects in parcel." type="string">
+                                オブジェクト�販売対象外��
                         </text>
-                        <button label="土地販売��り消�"
-                             label_selected="土地販売��り消�" name="Cancel Land Sale" />
-                        <text type="string" length="1" name="Claimed:">
+                        <button label="土地販売��り消�" label_selected="土地販売��り消�" name="Cancel Land Sale"/>
+                        <text length="1" name="Claimed:" type="string">
                                 �求：
                         </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text length="1" name="DateClaimText" type="string">
                                 2006年8月15日�曜日13:47:25
                         </text>
-                        <text type="string" length="1" name="PriceLabel">
+                        <text length="1" name="PriceLabel" type="string">
                                 ��：
                         </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text length="1" name="PriceText" type="string">
                                 4048平方メートル
                         </text>
-                        <text type="string" length="1" name="Traffic:">
+                        <text length="1" name="Traffic:" type="string">
                                 交通�:
                         </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text length="1" name="DwellText" type="string">
                                 誤
                         </text>
-                        <button label="土地を購入..." label_selected="土地を購入..."
-                             name="Buy Land..." />
-                        <button label="グループ用�購入..."
-                             label_selected="グループ用�購入..." name="Buy For Group..." />
-                        <button label="パスを購入..." label_selected="パスを購入..."
-                             name="Buy Pass..."
-                             tool_tip="パス���土地��一時的�アクセスを許����。" />
-                        <button label="土地を放棄..." label_selected="土地を放棄..."
-                             name="Abandon Land..." />
-                        <button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..." />
-                        <button label="Lindenセール..." label_selected="Lindenセール..."
-                             name="Linden Sale..."
-                             tool_tip="土地�所有�れ��り�コンテンツ�設定�れ��る必���り��。オークション�対象���������も必��件��。" />
-                        <text name="new users only">
+                        <button label="土地を購入..." label_selected="土地を購入..." name="Buy Land..." width="125" left="130"/>
+                        <button label="グループ用�購入..." label_selected="グループ用�購入..." name="Buy For Group..."/>
+                        <button label="入場許�を購入..." label_selected="入場許�を購入..." name="Buy Pass..." tool_tip="��土地��一時的�アクセスを許����。" width="125" left="130"/>
+                        <button label="土地を放棄..." label_selected="土地を放棄..." name="Abandon Land..."/>
+                        <button label="土地開拓..." label_selected="土地開拓..." name="Reclaim Land..."/>
+                        <button label="Lindenセール..." label_selected="Lindenセール..." name="Linden Sale..." tool_tip="土地�所有�れ��り�コンテンツ�設定�れ��る必���り��。オークション�対象���������も必��件��。"/>
+                        <string name="new users only">
                                 新�ユーザー��
-                        </text>
-                        <text name="anyone">
+                        </string>
+                        <string name="anyone">
                                 誰�も
-                        </text>
-                        <text name="area_text">
+                        </string>
+                        <string name="area_text">
                                 エリア
-                        </text>
-                        <text name="area_size_text">
+                        </string>
+                        <string name="area_size_text">
                                 [AREA]平方メートル
-                        </text>
-                        <text name="auction_id_text">
+                        </string>
+                        <string name="auction_id_text">
                                 オークションID： [ID]
-                        </text>
-                        <text name="need_tier_to_modify">
+                        </string>
+                        <string name="need_tier_to_modify">
                                 ��土地を修正変更�る���購入を承��る必���り��。
-                        </text>
-                        <text name="group_owned_text">
+                        </string>
+                        <string name="group_owned_text">
                                 (グループ所有)
-                        </text>
-                        <text name="profile_text">
+                        </string>
+                        <string name="profile_text">
                                 プロフィール...
-                        </text>
-                        <text name="info_text">
-                                インフォ...
-                        </text>
-                        <text name="public_text">
+                        </string>
+                        <string name="info_text">
+                                情報...
+                        </string>
+                        <string name="public_text">
                                 (公共)
-                        </text>
-                        <text name="none_text">
+                        </string>
+                        <string name="none_text">
                                 （��）
-                        </text>
-                        <text name="sale_pending_text">
+                        </string>
+                        <string name="sale_pending_text">
                                 (購入審査中)
-                        </text>
+                        </string>
                         <string name="no_selection_text">
                                 区画��定�れ����ん。
 [世界]メニュー&gt;[土地情報]�進む��別�区画を�択���詳細を表示���。
                         </string>
                 </panel>
                 <panel label="約款" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text length="1" name="covenant_timestamp_text" type="string">
                                 最後�更新1969年12月31日水曜日16：00：00
                         </text>
-                        <text type="string" length="1" name="region_name_lbl">
+                        <text length="1" name="region_name_lbl" type="string">
                                 地域：
                         </text>
-                        <text type="string" length="1" name="region_name_text">
+                        <text length="1" name="region_name_text" type="string">
                                 Leyla
                         </text>
-                        <text type="string" length="1" name="estate_name_lbl">
+                        <text length="1" name="estate_name_lbl" type="string">
                                 �動産：
                         </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text length="1" name="estate_name_text" type="string">
                                 メインランド
                         </text>
-                        <text type="string" length="1" name="estate_owner_lbl">
+                        <text length="1" name="estate_owner_lbl" type="string">
                                 �動産オーナー：
                         </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text length="1" name="estate_owner_text" type="string">
                                 （��）
                         </text>
-                        <text type="string" length="1" name="resellable_clause">
+                        <text length="1" name="resellable_clause" type="string">
                                 ��地域�購入��土地���販��������り��。
                         </text>
-                        <text type="string" length="1" name="changeable_clause">
+                        <text length="1" name="changeable_clause" type="string">
                                 ��地域�購入��土地��統���分割��������り��。
                         </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
+                        <text_editor length="1" name="covenant_editor" type="string">
                                 ���動産��約款��り��ん。
                         </text_editor>
-                        <text name="can_resell">
+                        <string name="can_resell">
                                 ��地域�購入��土地���販����。
-                        </text>
-                        <text name="can_not_resell">
+                        </string>
+                        <string name="can_not_resell">
                                 ��地域�購入��土地���販��������り��。
-                        </text>
-                        <text name="can_change">
+                        </string>
+                        <string name="can_change">
                                 ��地域�購入��土地��統�����分割����。
-                        </text>
-                        <text name="can_not_change">
+                        </string>
+                        <string name="can_not_change">
                                 ��地域�購入��土地��統���分割��������り��。
-                        </text>
+                        </string>
                 </panel>
                 <panel label="オブジェクト" name="land_objects_panel">
                         <text name="parcel_object_bonus">
                                 地域オブジェクトボーナス�因: [BONUS]
                         </text>
-                        <text type="string" length="1" name="Simulator primitive usage:" width="500">
-                                シミュレータ�基本�素使用状�：
-                        </text>
-                        <text type="string" length="1" left="200" name="0 out of 0 available">
-                                14055���0（14055利用�能）
+                        <text length="1" name="Simulator primitive usage:" type="string" width="500">
+                                地域全体�プリム使用状�：
                         </text>
                         <text left="200" name="objects_available">
                                 [MAX]�内[COUNT]（[AVAILABLE]利用�能）
                         </text>
-                        <text left="200" name="objects_available_text">
+                        <string left="200" name="objects_available_text">
                                 [MAX]�内[COUNT]（[AVAILABLE]利用�能）
-                        </text>
-                        <text left="200" name="objects_deleted_text">
+                        </string>
+                        <string left="200" name="objects_deleted_text">
                                 [MAX]�内[COUNT]（[DELETED]を削除）
+                        </string>
+                        <text length="1" name="Primitives parcel supports:" type="string" width="200">
+                                区画�サ�ート�れるプリム数：
                         </text>
-                        <text type="string" length="1" name="Primitives parcel supports:" width="200">
-                                区画�サ�ート�れる基本�素数：
-                        </text>
-                        <text type="string" length="1" left="200" name="object_contrib_text">
+                        <text left="200" length="1" name="object_contrib_text" type="string">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Primitives on parcel:">
-                                区画上�基本�素数：
+                        <text length="1" name="Primitives on parcel:" type="string">
+                                区画上�プリム数：
                         </text>
-                        <text type="string" length="1" left="200" name="total_objects_text">
+                        <text left="200" length="1" name="total_objects_text" type="string">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Owned by parcel owner:" width="300">
+                        <text length="1" name="Owned by parcel owner:" type="string" width="300">
                                 区画オーナー�よる所有：
                         </text>
-                        <text type="string" length="1" left="200" name="owner_objects_text">
+                        <text left="200" length="1" name="owner_objects_text" type="string">
                                 [COUNT]
                         </text>
-                        <button label="表示" label_selected="表示" name="ShowOwner" right="-145" />
-                        <button label="返�..." label_selected="返�..." name="ReturnOwner..." right="-15"
-                             tool_tip="オブジェクトをオーナー�返����" />
-                        <text type="string" length="1" name="Set to group:">
+                        <button label="表示" label_selected="表示" name="ShowOwner" right="-145"/>
+                        <button label="返�..." label_selected="返�..." name="ReturnOwner..." right="-15" tool_tip="オブジェクトをオーナー�返����"/>
+                        <text length="1" name="Set to group:" type="string">
                                 グループ�設定：
                         </text>
-                        <text type="string" length="1" left="200" name="group_objects_text">
+                        <text left="200" length="1" name="group_objects_text" type="string">
                                 [COUNT]
                         </text>
-                        <button label="表示" label_selected="表示" name="ShowGroup" right="-145" />
-                        <button label="返�..." label_selected="返�..." name="ReturnGroup..." right="-15"
-                             tool_tip="オブジェクトをオーナー�返����" />
-                        <text type="string" length="1" name="Owned by others:">
+                        <button label="表示" label_selected="表示" name="ShowGroup" right="-145"/>
+                        <button label="返�..." label_selected="返�..." name="ReturnGroup..." right="-15" tool_tip="オブジェクトをオーナー�返����"/>
+                        <text length="1" name="Owned by others:" type="string">
                                 他人�よる所有：
                         </text>
-                        <text type="string" length="1" left="200" name="other_objects_text">
+                        <text left="200" length="1" name="other_objects_text" type="string">
                                 [COUNT]
                         </text>
-                        <button label="表示" label_selected="表示" name="ShowOther" right="-145" />
-                        <button label="返�..." label_selected="返�..." name="ReturnOther..." right="-15"
-                             tool_tip="オブジェクトをオーナー�返����" />
-                        <text type="string" length="1" name="Selected / sat upon:">
+                        <button label="表示" label_selected="表示" name="ShowOther" right="-145"/>
+                        <button label="返�..." label_selected="返�..." name="ReturnOther..." right="-15" tool_tip="オブジェクトをオーナー�返����"/>
+                        <text length="1" name="Selected / sat upon:" type="string">
                                 �択済��決定済�：
                         </text>
-                        <text type="string" length="1" left="200" name="selected_objects_text">
+                        <text left="200" length="1" name="selected_objects_text" type="string">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Autoreturn" width="500">
-                                他��人�オブジェクト�自動返�（分�オフ�設定�0）
+                        <text length="1" name="Autoreturn" type="string" width="500">
+                                他��人�オブジェクト�自動返�(分�0�自動返���)
                         </text>
-                        <line_editor left_delta="5" name="clean other time" right="-80" />
-                        <text type="string" length="1" name="Object Owners:" width="150">
+                        <line_editor left_delta="5" name="clean other time" right="-80"/>
+                        <text length="1" name="Object Owners:" type="string" width="150">
                                 オブジェクト�オーナー：
                         </text>
-                        <button label="リスト更新" label_selected="リスト更新" left="146"
-                             name="Refresh List" />
-                        <button label="オブジェクト�返�..."
-                             label_selected="オブジェクト�返�..." left="256"
-                             name="Return objects..." />
-                        <button label="" label_selected="" name="Type" tool_tip="種類�振り分�" />
-                        <button label="��" label_selected="��" name="Name"
-                             tool_tip="���振り分�" />
-                        <button label="カウント" label_selected="カウント" name="Count"
-                             tool_tip="カウント�振り分�" />
+                        <button label="リスト更新" label_selected="リスト更新" left="146" name="Refresh List"/>
+                        <button label="オブジェクト�返�..." label_selected="オブジェクト�返�..." left="256" name="Return objects..."/>
                         <name_list label="カウント" name="owner list">
-                                <column label="タイプ" name="type" />
-                                <column label="��" name="name" />
-                                <column label="カウント" name="count" />
+                                <column label="タイプ" name="type"/>
+                                <column name="online_status"/>
+                                <column label="��" name="name"/>
+                                <column label="カウント" name="count"/>
+                                <column label="最新" name="mostrecent"/>
                         </name_list>
-                        /&gt;
                 </panel>
                 <panel label="オプション" name="land_options_panel">
-                        <text type="string" length="1" name="allow_label">
+                        <text length="1" name="allow_label" type="string">
                                 他��人�以下を許�：
                         </text>
-                        <check_box label="地形を編集" name="edit land check" />
-                        <check_box label="ランドマーク作�" name="check landmark" />
-                        <check_box label="飛行" name="check fly" />
-                        <text type="string" length="1" left="138" name="allow_label2" width="144">
+                        <check_box label="地形を編集" name="edit land check" tool_tip="�ェックを入れる��他人�����土地�地形編集を行�����能��り��。��オプション��ェックを外������を�������。外��状態�����土地�地形編集��能��。"/>
+                        <check_box label="ランドマーク作�" name="check landmark"/>
+                        <check_box label="飛行" name="check fly" tool_tip="�ェックを入れる���土地��飛行��能��り��。�ェックを外��土地�入る際�通り��る����飛行�能��り��。"/>
+                        <text left="138" length="1" name="allow_label2" type="string" width="144">
                                 オブジェクト�作�：
                         </text>
-                        <check_box label="�����人" left="280" name="edit objects check" />
-                        <check_box label="グループ" left="380" name="edit group objects check" />
-                        <text type="string" length="1" left="138" name="allow_label3" width="144">
-                                オブジェクト・エントリ：
+                        <check_box label="�����人" left="280" name="edit objects check"/>
+                        <check_box label="グループ" left="380" name="edit group objects check"/>
+                        <text left="138" length="1" name="allow_label3" type="string" width="144">
+                                オブジェクト�進入：
                         </text>
-                        <check_box label="�����人" left="280" name="all object entry check" />
-                        <check_box label="グループ" left="380" name="group object entry check" />
-                        <text type="string" length="1" left="138" name="allow_label4" width="144">
-                                スクリプト実行：
+                        <check_box label="�����人" left="280" name="all object entry check"/>
+                        <check_box label="グループ" left="380" name="group object entry check"/>
+                        <text left="138" length="1" name="allow_label4" type="string" width="144">
+                                スクリプト�実行：
                         </text>
-                        <check_box label="�����人" left="280" name="check other scripts" />
-                        <check_box label="グループ" left="380" name="check group scripts" />
-                        <text type="string" length="1" name="land_options_label">
+                        <check_box label="�����人" left="280" name="check other scripts"/>
+                        <check_box label="グループ" left="380" name="check group scripts"/>
+                        <text length="1" name="land_options_label" type="string">
                                 土地オプション：
                         </text>
-                        <check_box label="安全（ダメージ��）" name="check safe" />
-                        <check_box label="プッシュを制�" name="PushRestrictCheck"
-                             tool_tip="llPushObject�機能�る���区画オーナー�スクリプトを通��使用�れ�場������プッシュ元�オーナー�����るスクリプトを通��使用�れ�場�����。" />
-                        <check_box label="検索�表示＞（週L$30）以下�場所"
-                             name="ShowDirectoryCheck"
-                             tool_tip="検索�果����区画を人�見�る" />
+                        <check_box label="安全（ダメージ��）" name="check safe" tool_tip="�ェックを入れる���土地��ダメージコン�ット�無効��り�「安全��設定�れ��。 �ェックを外��ダメージコン�ット�有効��り��。"/>
+                        <check_box label="プッシングを制�" name="PushRestrictCheck" tool_tip="スクリプト�よるプッシングを制����。 ��オプションを�択�る���より�����土地��破壊的行動を妨�る�������。"/>
+                        <check_box label="検索�表示＞（週L$30）以下�場所" name="ShowDirectoryCheck" tool_tip="検索�果���区画を表示��る"/>
                         <combo_box name="land category">
                                 <combo_item name="AnyCategory">
                                         全カテゴリー
@@ -324,66 +296,59 @@
                                         ��他
                                 </combo_item>
                         </combo_box>
-                        <check_box label="�人��コンテンツ" name="MatureCheck"
-                             tool_tip="����区画情報���コンテンツ��人���見��れ����。" />
-                        <check_box label="リストをウェブ上�公開" name="PublishCheck"
-                             tool_tip="自分�区画情報をウェブ上�公開���。" />
-                        <button label="?" label_selected="?" name="?" />
-                        <text type="string" length="1" name="Snapshot:">
+                        <button label="?" label_selected="?" name="?"/>
+                        <check_box label="�人��コンテンツ" name="MatureCheck" tool_tip="����区画情報���コンテンツ��人���見��れ����。"/>
+                        <text length="1" name="Snapshot:" type="string">
                                 スナップショット：
                         </text>
-                        <texture_picker label="" left="116" name="snapshot_ctrl"
-                             tool_tip="写真をクリック���択" />
-                        <text type="string" length="1" name="Landing Point: (none)">
-                                �地点：（��）
-                        </text>
+                        <texture_picker label="" left="116" name="snapshot_ctrl" tool_tip="写真をクリック���択"/>
                         <text name="landing_point">
                                 �陸地点: [LANDING]
                         </text>
-                        <text name="landing_point_none">
+                        <string name="landing_point_none">
                                 （��）
-                        </text>
-                        <button label="設定" label_selected="設定" name="Set"
-                             tool_tip="����ア�ター�ロケーション��地点を設定������。 ��土地区画�中���れ��り��ん。" />
-                        <button label="クリア" label_selected="クリア" name="Clear"
-                             tool_tip="�地点をクリア������。" />
-                        <text type="string" length="1" name="Teleport Routing: ">
-                                テレ�ート・ルート:
-                        </text>
-                        <combo_box name="landing type"
-                             tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
-                                <combo_item type="string" length="1" name="Blocked">
-                                        ブロック済�
+                        </string>
+                        <button label="設定" label_selected="設定" name="Set" tool_tip="訪�者��地地点�設定を行���。��区画内�立��行������。"/>
+                        <button label="クリア" label_selected="クリア" name="Clear" tool_tip="�地点をクリア������。"/>
+                        <text length="1" name="Teleport Routing: " type="string">
+                                テレ�ート制�：
+                        </text>
+                        <combo_box name="landing type" tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
+                                <combo_item length="1" name="Blocked" type="string">
+                                        ��
                                 </combo_item>
-                                <combo_item type="string" length="1" name="LandingPoint">
+                                <combo_item length="1" name="LandingPoint" type="string">
                                         �地点
                                 </combo_item>
-                                <combo_item type="string" length="1" name="Anywhere">
+                                <combo_item length="1" name="Anywhere" type="string">
                                         ���も
                                 </combo_item>
                         </combo_box>
-                        <text name="push_restrict_text">
+                        <string name="push_restrict_text">
                                 プッシングを制�
-                        </text>
-                        <text name="push_restrict_region_text">
-                                プッシングを制� (地域無効)
-                        </text>
+                        </string>
+                        <string name="push_restrict_region_text">
+                                プッシングを制� (地域優先)
+                        </string>
                 </panel>
                 <panel label="メディア" name="land_media_panel">
-                        <text name="at URL:">
-                                URL：
-                        </text>
-                        <button label="設定..." label_selected="設定..." name="set_media_url" />
                         <text name="with media:">
                                 タイプ：
                         </text>
-                        <combo_box name="media type"
-                             tool_tip="URL �動画�ウェブ・ページ���他�メディア�場��指定���" />
+                        <combo_box name="media type" tool_tip="URL �動画�ウェブ・ページ���他�メディア�場��指定���"/>
+                        <text name="at URL:">
+                                URL：
+                        </text>
+                        <button label="設定..." label_selected="設定..." name="set_media_url"/>
                         <text name="Description:">
                                 説明：
                         </text>
-                        <line_editor name="url_description"
-                             tool_tip="［�生］/［ロード］ボタン�隣�表示�れるテキスト" />
+                        <line_editor name="url_description" tool_tip="［�生］/［ロード］ボタン�隣�表示�れるテキスト"/>
+                        <text length="1" name="Media texture:" type="string">
+                                テクス�
+ャ�替：
+                        </text>
+                        <texture_picker label="" name="media texture" tool_tip="写真をクリック���択"/>
                         <text name="replace_texture_help">
                                 ［�生］矢�をクリック�る����テクス�ャーを使用�るオブジェクト�
 動画���ウェブ・ページ�表示�れ��。
@@ -392,20 +357,15 @@
                                 メディア
 オプション：
                         </text>
-                        <check_box label="メディア�ループ" name="media_loop"
-                             tool_tip="メディアをループ�生���。  メディア��生�終���ら�最��ら�生�直���。" />
-                        <check_box label="メディア URL を隠�" name="hide_media_url"
-                             tool_tip="��オプションをオン��る��許������区画情報�アクセス���るユーザー��メディア URL �表示�れ��ん。 �れ� HTML タイプ��使用����ん���注�����。" />
-                        <check_box label="音楽�URLを隠�" name="hide_music_url"
-                             tool_tip="��オプションをオン��る��許������区画情報�アクセス���るユーザー��音楽� URL �表示�れ��ん。" />
-                        <text name="media_size"
-                             tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。">
+                        <check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="��オプションを�ェック�る����区画�コンテンツ�スケール�自動的�設定�れ��。 動作速度�画質�少�低下�る����り����他�テクス�ャー�スケーリングや整列�必���る����り��ん。"/>
+                        <check_box label="メディア�ループ" name="media_loop" tool_tip="メディアをループ�生���。  メディア��生�終���ら�最��ら�生�直���。"/>
+                        <check_box label="メディア URL を隠�" name="hide_media_url" tool_tip="��オプションをオン��る��許������区画情報�アクセス���るユーザー��メディア URL �表示�れ��ん。 �れ� HTML タイプ��使用����ん���注�����。"/>
+                        <check_box label="音楽�URLを隠�" name="hide_music_url" tool_tip="��オプションをオン��る��許������区画情報�アクセス���るユーザー��音楽� URL �表示�れ��ん。"/>
+                        <text name="media_size" tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。">
                                 サイズ：
                         </text>
-                        <spinner name="media_size_width"
-                             tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。" />
-                        <spinner name="media_size_height"
-                             tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。" />
+                        <spinner name="media_size_width" tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。"/>
+                        <spinner name="media_size_height" tool_tip="レンダリング�るウェブ・メディア�サイズ。デフォルト� 0 �������。"/>
                         <text name="pixels">
                                 ピクセル
                         </text>
@@ -415,27 +375,11 @@
                         <text name="Sound:">
                                 サウンド：
                         </text>
-                        <check_box label="空間音響を��区画����定" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
-                                ミュージックURL：
-                        </text>
-                        <text type="string" length="1" name="Media texture:">
-                                テクス�
-ャ�替：
-                        </text>
-                        <text type="string" length="1" name="Replace this texture:">
-                                ��テクス�ャーを置�：
-                        </text>
-                        <texture_picker label="" name="media texture" tool_tip="写真をクリック���択" />
-                        <text type="string" length="1" name="with content from this URL:">
-                                �� URL�ら�コンテンツ：
-                        </text>
-                        <check_box label="スケールを自動設定" name="media_auto_scale"
-                             tool_tip="��オプションを�ェック�る����区画�コンテンツ�スケール�自動的�設定�れ��。 動作速度�画質�少�低下�る����り����他�テクス�ャー�スケーリングや整列�必���る����り��ん。" />
+                        <check_box label="空間音響を��区画����定" name="check sound local"/>
                         <text name="Voice settings:">
                                 ボイス：
                         </text>
-                        <radio_group name="parcel_voice_channel">
+                        <radio_group name="parcel_voice_channel" width="310">
                                 <radio_item name="Estate">
                                         �動産空間�ャン�ルを使用
                                 </radio_item>
@@ -448,23 +392,20 @@
                         </radio_group>
                 </panel>
                 <panel label="アクセス" name="land_access_panel">
-                        <text type="string" length="1" name="Limit access to this parcel to:">
+                        <text length="1" name="Limit access to this parcel to:" type="string">
                                 ��区画�アクセス
                         </text>
-                        <check_box label="パブリック・アクセスを許�" name="public_access" />
+                        <check_box label="パブリック・アクセスを許�" name="public_access"/>
                         <text name="Only Allow">
                                 次��人�アクセスをブロック：
                         </text>
-                        <check_box label="Linden Lab�支払�情報を登録������人"
-                             name="limit_payment" tool_tip="年齢未確���人を排除�る" />
-                        <check_box label="年齢確�を済�������人��人"
-                             name="limit_age_verified"
-                             tool_tip="年齢確�を済�������人を排除�る詳細������support.secondlife.comを�照������。" />
+                        <check_box label="Linden Lab�支払�情報を登録������人" name="limit_payment" tool_tip="支払�情報未確���人を排除�る"/>
+                        <check_box label="年齢確�を済�������人��人" name="limit_age_verified" tool_tip="年齢確�を済�������人を排除�る詳細������support.secondlife.comを�照������。"/>
                         <string name="estate_override">
                                 1�以上�オプション���動産レベル�設定�れ����。
                         </string>
-                        <check_box label="グループ・アクセスを許�：[GROUP]" name="GroupCheck"
-                             tool_tip="[一般]タブ��グループを�択������。" />
+                        <check_box label="グループ・アクセスを許�：[GROUP]" name="GroupCheck" tool_tip="[一般]タブ��グループを�択������。"/>
+                        <check_box label="入場許�を販売：" name="PassCheck" tool_tip="��区画��一時的�アクセスを許�"/>
                         <combo_box name="pass_combo">
                                 <combo_item name="Anyone">
                                         誰�も
@@ -473,45 +414,20 @@
                                         グループ
                                 </combo_item>
                         </combo_box>
+                        <spinner label="価格（L$）：" name="PriceSpin"/>
+                        <spinner label="アクセス時間：" name="HoursSpin"/>
                         <text label="常�許�" name="AllowedText">
                                 許��れ��人
                         </text>
-                        <button label="追加..." label_selected="追加..." name="add_allowed" />
-                        <button label="削除" label_selected="削除" name="remove_allowed" />
-                        <check_box label="�止" name="BanCheck">
+                        <name_list name="AccessList" tool_tip="([LISTED]リスト入り�[MAX]最大)"/>
+                        <button label="追加..." label_selected="追加..." name="add_allowed"/>
+                        <button label="削除" label_selected="削除" name="remove_allowed"/>
+                        <text label="�止" name="BanCheck">
                                 �止�れ��人
-                        </check_box>
-                        <name_list name="AccessList" tool_tip="([LISTED]リスト入り�[MAX]最大)">
-                                <column label="許��れ��人" name="name" />
-                        </name_list>
-                        <button label="追加..." label_selected="追加..." name="Add..." />
-                        <button label="削除" label_selected="削除" name="Remove" />
-                        <check_box label="パスを販売：" name="PassCheck"
-                             tool_tip="��区画��一時的�アクセスを許�" />
-                        <spinner label="L$建�価格：" name="PriceSpin" />
-                        <spinner label="アクセス時間：" name="HoursSpin" />
-                        <name_list name="BannedList" tool_tip="([LISTED]リスト入り�[MAX]最大)" />
-                        <button label="追加..." label_selected="追加..." name="add_banned" />
-                        <button label="削除" label_selected="削除" name="remove_banned" />
-                </panel>
-                <panel label="�止" name="land_ban_panel">
-                        <check_box
-                             label="�れら�ア�ターを�止�る:([LISTED]リスト済��[MAX]最大)"
-                             name="LandBanCheck" />
-                        <name_list name="LandBanList">
-                                <column label="�止�れ��人" name="name" />
-                        </name_list>
-                        <button label="追加..." label_selected="追加..." name="Add..." />
-                        <button label="削除" label_selected="削除" name="Remove" />
-                        <text type="string" length="1" name="Deny by Payment Status:">
-                                支払�状��より拒�：
-                        </text>
-                        <check_box label="支払�情報�登録���も�を拒�"
-                             name="DenyAnonymousCheck" />
-                        <check_box label="支払�情報�登録��るも�を拒�"
-                             name="DenyIdentifiedCheck" />
-                        <check_box label="支払�情報�使用�れ��るも�を拒�"
-                             name="DenyTransactedCheck" />
+                        </text>
+                        <name_list name="BannedList" tool_tip="([LISTED]リスト入り�[MAX]最大)"/>
+                        <button label="追加..." label_selected="追加..." name="add_banned"/>
+                        <button label="削除" label_selected="削除" name="remove_banned"/>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index ee7e4df..fb0659f 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="ア�ター・テクス�ャー">
-        <text name="">
-                構築�れ�テクス�ャー
+        <text name="baked_label" width="128">
+                構築�れ�ﾃｸｽ�ｬｰ
         </text>
-        <text name="">
-                ��テクス�ャー
-        </text>
-        <text name="baked_label">
-                構築�れ�テクス�ャー
-        </text>
-        <text name="composite_label">
+        <text name="composite_label" width="128">
                 ��テクス�ャー
         </text>
         <texture_picker label="é ­" name="baked_head" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml b/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml
new file mode 100644
index 0000000..49c8758
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="beacons" title="ビーコン（標識）">

+        <panel name="beacons_panel">

+                <check_box label="ﾀｯ�ｵ�ﾘｰ�ｽｸﾘﾌﾟﾄを�むｵﾌﾞｼﾞｪｸﾄ" name="touch_only"/>

+                <check_box label="スクリプト・オブジェクト" name="scripted"/>

+                <check_box label="物�的オブジェクト" name="physical"/>

+                <check_box label="音�" name="sounds"/>

+                <check_box label="パーティクル�" name="particles"/>

+                <check_box label="�イライト�レンダリング" name="highlights"/>

+                <check_box label="ビーコン(標識)�レンダリング" name="beacons"/>

+                <text name="beacon_width_label">

+                        ビーコン(標識)�幅

+                </text>

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml b/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 89748b4..cbd6a2f 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="���る�押���よ�当�る">
+<floater name="floater_bumps" title="���記録">
         <text name="none_detected">
                 検出��
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
index ca8f44d..a532640 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_currency.xml
@@ -35,19 +35,19 @@
                 データを�得�����...
         </text>
         <text name="balance_label">
-                �在所有���る��
+                �在所有���る金�
         </text>
         <text name="balance_amount">
                 L$ [AMT]
         </text>
         <text name="buying_label">
-                ����購�よ�������
+                購入�る金�
         </text>
         <text name="buying_amount">
                 L$ [AMT]
         </text>
         <text name="total_label">
-                ����残高�
+                �計残高
         </text>
         <text name="total_amount">
                 L$ [AMT]
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index c67bdaf..85bafea 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -22,10 +22,10 @@
                 ��地域�購入��土地：
         </text>
         <text name="resellable_clause">
-                ��地域�購入��土地���販��能�場�������場���り��。
+                ��地域�購入��土地���販��能�場�������場���り��
         </text>
         <text name="changeable_clause">
-                統�����分割�れる�能性も��れ���能性も�り��。
+                統�����分割�れる�能性も��れ���能性も�り��
         </text>
         <text name="covenant_text">
                 �動産約款���������：
@@ -33,7 +33,7 @@
         <text_editor name="covenant_editor">
                 ロード中．．．
         </text_editor>
-        <check_box label="上記�約款������。" name="agree_covenant" />
+        <check_box label="上記�約款������" name="agree_covenant" />
         <text name="info_parcel_label">
                 区画：
         </text>
@@ -43,10 +43,10 @@
         <text name="info_size_label">
                 サイズ：
         </text>
-        <text name="info_size">
+        <text name="info_size" bottom_delta="-37" height="48" >
                 1024平方メートル
         </text>
-        <text name="info_price_label">
+        <text name="info_price_label" >
                 価格：
         </text>
         <text name="info_price">
@@ -56,14 +56,14 @@
                 ��土地を買��：
         </text>
         <text name="error_message">
-                何�変��。
+                何�変��
         </text>
         <button label="ウェブ・サイト�移動" name="error_web" />
         <text name="account_action">
                 プレミアム・メン�ー�アップグレード
         </text>
         <text name="account_reason">
-                土地を�有��る��プレミアム・メン�ー����。
+                土地を�有��る��プレミアム・メン�ー����
         </text>
         <combo_box name="account_level">
                 <combo_item name="US$9.95/month,billedmonthly">
@@ -77,7 +77,7 @@
                 </combo_item>
         </combo_box>
         <text name="land_use_action">
-                毎月�土地使用料をUS$40�引�上���。
+                毎月�土地使用料をUS$40�引�上���
         </text>
         <text name="land_use_reason">
                 ����1,309平方メートル�土地を所有�����。 
@@ -119,32 +119,32 @@
                 統���分割��能
         </text>
         <text name="cant_buy_for_group">
-                ����アクティブ�グループ用�土地購入を許��れ����ん。
+                ����アクティブ�グループ用�土地購入を許��れ����ん
         </text>
         <text name="no_land_selected">
-                土地��択�れ����ん。
+                土地��択�れ����ん
         </text>
         <text name="multiple_parcels_selected">
                 複数�異���区画を�択����。 
 �れより���エリアを�択������。
         </text>
         <text name="no_permission">
-                ����アクティブ�グループ用�土地購入を許��れ����ん。
+                ����アクティブ�グループ用�土地購入を許��れ����ん
         </text>
         <text name="parcel_not_for_sale">
-                �択�れ�区画�販売対象外��。
+                �択�れ�区画�販売対象外��
         </text>
         <text name="group_already_owns">
-                グループ������区画を所有�����。
+                グループ������区画を所有�����
         </text>
         <text name="you_already_own">
-                ���������区画を所有�����。
+                ���������区画を所有�����
         </text>
         <text name="set_to_sell_to_other">
-                �択�れ�区画��他�人��販売�決������。
+                �択�れ�区画��他�人��販売�決������
         </text>
         <text name="no_public_land">
-                �択�れ�地域��公共�土地��り��ん。
+                �択�れ�地域��公共�土地��り��ん
         </text>
         <text name="not_owned_by_you">
                 他�使用者�所有�れ�土地��択�れ����。 
@@ -156,7 +156,7 @@
 （数分��る����り��）
         </text>
         <text name="fetching_error">
-                土地購入�情報入手中�エラー�起����。
+                土地購入�情報入手中�エラー�起����
         </text>
         <text name="buying_will">
                 ��土地を買��：
@@ -174,32 +174,33 @@
                 一切必���
         </text>
         <text name="must_upgrade">
-                アカウントをアップグレード�����土地を所有����ん。
+                アカウントをアップグレード�����土地を所有����ん
         </text>
         <text name="cant_own_land">
-                ����アカウント�土地を所有����。
+                ����アカウント�土地を所有����
         </text>
         <text name="land_holdings">
-                ���� [BUYER] 平方メートル�土地を所有�����。
+                ���� [BUYER] 平方メートル�土地を所有�����
         </text>
         <text name="pay_to_for_land">
-                ��土地�代金����[SELLER]�L＄[AMOUNT]を支払�
+                ��土地�代金����[SELLER]�L$[AMOUNT]を支払�
         </text>
         <text name="buy_for_US">
                 約US$ [AMOUNT2]�L$ [AMOUNT]を購入
         </text>
         <text name="parcel_meters">
-                ��区画� [AMOUNT] 平方メートル�り��。
+                ��区画� [AMOUNT] 平方メートル�り��
         </text>
         <text name="premium_land">
-                ��土地�プレミアム���� [AMOUNT] 平方メートル ���請求�れ��。
+                ��土地�プレミアム���� [AMOUNT] 平方メートル ���請求�れ��
         </text>
         <text name="discounted_land">
-                ��土地�値下��れ�[AMOUNT]平方メートル���請求�れ��。
+                ��土地�値下��れ�[AMOUNT]平方メートル���請求�れ��
         </text>
         <text name="meters_supports_object">
                 [AMOUNT]平方メートル��れ��
-[AMOUNT2]個�オブジェクト�サ�ート�れ��。
+[AMOUNT2]個�オブジェクト�サ�
+ート�れ��
         </text>
         <text name="sold_with_objects">
                 オブジェクト�共�販売済�
@@ -207,19 +208,19 @@
         <text name="insufficient_land_credits">
                 �� [GROUP] �区画�購入手続�を完了�る��� 
 価格�見�����寄付�れ�土地�利用実績�
-必���。
+必���
         </text>
         <text name="have_enough_lindens">
-                ����所��る L$ [AMOUNT]����土地を購入����。
+                ����所��る L$ [AMOUNT]����土地を購入����
         </text>
         <text name="not_enough_lindens">
-                ����所�金� L$ [AMOUNT]������L$ [AMOUNT2] 必���。
+                ����所�金� L$ [AMOUNT]������L$ [AMOUNT2] 必���
         </text>
         <text name="balance_left">
-                購入後�����残��L$[AMOUNT]��り��。
+                購入後�����残��L$[AMOUNT]��り��
         </text>
         <text name="balance_needed">
-                ��土地を買����少���も L$ [AMOUNT] を購入�る必���り��。
+                ��土地を買����少���も L$ [AMOUNT] を購入�る必���り��
         </text>
         <text name="no_parcel_selected">
                 (区画��定�れ����ん)
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml
index 41592a3..1f7b99d 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_chat_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="chat floater" title="ローカル・�ャット">
         <string name="ringing">
                 インワールドボイス�ャット�接続中．．．
@@ -28,7 +28,7 @@
                                         ジェス�ャー
                                 </combo_item>
                         </combo_box>
-                        <check_box label="ミュート�れ�テキストを表示" name="show mutes"/>
+                        <check_box label="無視�れ�テキストを表示" name="show mutes"/>
                         <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="��をクリック�����IMセッション��アクティブ��加者リストを表示。"/>
                         <panel name="chat_panel">
                                 <string name="gesture_label">
@@ -42,6 +42,9 @@
                                         <flyout_button_item name="say_item">
                                                 発言
                                         </flyout_button_item>
+                                        <flyout_button_item name="whisper_item">
+                                                ��や�
+                                        </flyout_button_item>
                                 </flyout_button>
                         </panel>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_customize.xml b/linden/indra/newview/skins/default/xui/ja/floater_customize.xml
index 7b4fdbc..4b420db 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_customize.xml
@@ -3,7 +3,7 @@
         <tab_container name="customize tab container">
                 <panel label="身体部�" />
                 <panel label="身体部�" name="body_parts_placeholder" />
-                <panel label="å½¢" name="Shape">
+                <panel label="シェイプ" name="Shape">
                         <button label="戻�" label_selected="戻�" name="Revert" />
                         <button label="身体" label_selected="身体" name="Body" />
                         <button label="é ­" label_selected="é ­" name="Head" />
@@ -39,12 +39,12 @@
                                 [PATH]�所在
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                新��形を��物�らア�ター�ドラッグ��装����ょ�。完全�新��状態�ら作���装��る��も����。
+                                新��シェイプ(体型)を��物�らア�ター�ドラッグ��装����ょ�。完全�新��状態�ら作���装��る��も����。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
                                 ��������修正を許�れ����ん。
                         </text>
-                        <button label="新��形を作�" label_selected="新��形を作�"
+                        <button label="新��シェイプ(体型)を作�" label_selected="新��シェイプ(体型)を作�"
                              name="Create New" />
                         <button label="�り外�" label_selected="�り外�" name="Take Off" />
                         <button label="�存" label_selected="�存" name="Save" />
@@ -53,7 +53,7 @@
                 <panel label="スキン" name="Skin">
                         <button label="スキン�色" label_selected="スキン�色" name="Skin Color" />
                         <button label="顔�細部" label_selected="顔�細部" name="Face Detail" />
-                        <button label="メイクアップ" label_selected="メイクアップ" name="Makeup" />
+                        <button label="ﾒｲｸｱｯﾌﾟ" label_selected="ﾒｲｸｱｯﾌﾟ" name="Makeup" />
                         <button label="身体細部" label_selected="身体細部" name="Body Detail" />
                         <text type="string" length="1" name="title">
                                 [DESC]
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_directory.xml b/linden/indra/newview/skins/default/xui/ja/floater_directory.xml
index 0090ceb..018a4a5 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_directory.xml
@@ -237,7 +237,7 @@
                                 何も見��り��ん���。
                         </string>
                         <button label="戻る" name="back_btn" />
-                        <button label="転�" name="forward_btn" />
+                        <button label="進む" name="forward_btn" />
                         <string name="loading_text">
                                 ロード中...
                         </string>
@@ -400,7 +400,7 @@
                                 <column label="" name="score" />
                         </scroll_list>
                         <button label="戻る" name="back_btn" />
-                        <button label="転�" name="forward_btn" />
+                        <button label="進む" name="forward_btn" />
                         <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
                         <button label="検索" name="search_btn" />
                         <check_box label="�人��コンテンツを��る" name="mature_check" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml b/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml
index 9330ca0..6b4ea3c 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_group_info.xml
@@ -27,7 +27,7 @@
                                 創設者：
                         </text>
                         <text name="lbl2">
-                                特権：
+                                �念：
                         </text>
                         <check_box label="グループ・リスト�表示" name="sho" />
                         <check_box label="グループ・リスト�会員を表示" name="sho_mem" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 0d09734..2466dd5 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -33,9 +33,9 @@
         <text name="Enable VBO:">
                 VBO を有効化：
         </text>
-        <check_box label="OpenGL Vertex Buffer オブジェクトを有効化" name="vbo"
+        <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo"
              tool_tip="最新��ードウェア���設定を有効��る��パフォーマンス��上���。  ����旧型��ードウェア�� VBO �実装�貧弱�場��多����設定を有効��る���クラッシュ����る��れ��り��。" />
-        <slider label="テクス�ャ記憶(MB)：" name="GrapicsCardTextureMemory"
+        <slider label="テクス�ャﾒﾓﾘ(MB)：" name="GrapicsCardTextureMemory"
              tool_tip="テクス�ャー�割り当�るメモリ��計。 ビデオ・カード・メモリをデフォルト����。 ��数値を減ら���パフォーマンス�改善�れ����テクス�ャー��や��感���る場���り��。" />
         <spinner label="フォグ��離比率：" name="fog" />
         <button label="OK" label_selected="OK" name="OK" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_im.xml b/linden/indra/newview/skins/default/xui/ja/floater_im.xml
index 30dae0a..eec6447 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_im.xml
@@ -10,7 +10,7 @@
                 ��ボイス�ャット�応答/接続�る場���[BUTTON NAME]をクリック������。
         </string>
         <string name="muted_message">
-                �������人をミュート�����。 メッセージを�信�る��ミュート�自動的�解除�れ��。
+                �������人を無視�����。 メッセージを�信�る��無視設定�自動的�解除�れ��。
         </string>
         <string name="generic_request_error">
                 �求中�エラー�発生����。後�も�一度試������。
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml b/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
index 38b2f09..3ada48e 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="オブジェクト検査">
+<floater name="inspect" title="オブジェクト検査" min_width="450" >
         <scroll_list name="object_list"
              tool_tip="��リスト�らオブジェクトを�択����世界�強調表示���。">
-                <column label="オブジェクト�" name="object_name" />
+                <column label="ｵﾌﾞｼﾞｪｸﾄ�" name="object_name" />
                 <column label="所有者�" name="owner_name" />
                 <column label="制作者�" name="creator_name" />
                 <column label="作�日" name="creation_date" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
index ade57de..944e0e8 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message.xml
@@ -21,7 +21,7 @@
         <string name="default_text_label">
                 ��をクリック��IM
         </string>
-        <button label="プロフィール..." name="profile_callee_btn"  width="100"/>
+        <button label="プロフィール" name="profile_callee_btn"  width="100"/>
         <button label="コール" name="start_call_btn"  left_delta="105" width="100"/>
         <button label="呼出終了" name="end_call_btn" width="100" />
         <panel name="speaker_controls" left_delta="96">
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
index 4def3fb..f0d1454 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
@@ -2,7 +2,7 @@
 <floater label="(�明）" name="im_floater" title="(�明）">
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
-                        <button label="グループインフォ" name="group_info_btn" width="120"/>
+                        <button label="グループ情報" name="group_info_btn" width="120"/>
                         <button label="コール��加" name="start_call_btn"  left_delta="125" width="120"/>
                         <button label="コール�終了" name="end_call_btn" width="120" />
                         <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="��IMセッション�アクティブ��加者�リスト表示を切り替�る����をクリック���"/>
@@ -33,7 +33,7 @@
                                         Rumplstiltskin Califragilistic
                                 </text>
                                 <text name="Mute:">
-                                        ミュート:
+                                        無視:
                                 </text>
                                 <check_box label="テキスト" name="mute_text_btn"/>
                                 <check_box label="ボイス" name="mute_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml b/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml
index 6edae5a..6804968 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inventory.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Inventory" title="��物">
-        <search_editor label="���タイプ��検索" name="inventory search editor" />
+        <search_editor label="���入力��検索" name="inventory search editor" />
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="All Items" name="All Items" />
-                <inventory_panel label="Recent Items" name="Recent Items" />
+                <inventory_panel label="���" name="All Items" />
+                <inventory_panel label="最近�入手アイテム" name="Recent Items" />
         </tab_container>
         <menu_bar name="Inventory Menu">
                 <menu label="ファイル" name="File">
@@ -31,13 +31,13 @@
                                 <menu_item_call label="新��パンツ" name="New Underpants" />
                         </menu>
                         <menu name="New Body Parts">
-                                <menu_item_call label="新��形" name="New Shape" />
+                                <menu_item_call label="新��シェイプ(体型)" name="New Shape" />
                                 <menu_item_call label="新��スキン" name="New Skin" />
                                 <menu_item_call label="新��髪" name="New Hair" />
                                 <menu_item_call label="新��眼" name="New Eyes" />
                         </menu>
                 </menu>
-                <menu label="振り分�" name="Sort">
+                <menu label="並�替�" name="Sort">
                         <menu_item_check label="��" name="By Name" />
                         <menu_item_check label="日付" name="By Date" />
                         <menu_item_check label="フォルダ�常���順" name="Folders Always By Name" />
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
index 10bb7e4..9a408b9 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
@@ -12,22 +12,22 @@
         <text name="LabelCreatorName">
                 Nicole Linden
         </text>
-        <button label="プロフィール..." label_selected="" name="BtnCreator" />
+        <button label="情報" label_selected="" name="BtnCreator" />
         <text name="LabelOwnerTitle">
                 オーナー：
         </text>
         <text name="LabelOwnerName">
                 Thrax Linden
         </text>
-        <button label="プロフィール..." label_selected="" name="BtnOwner" />
+        <button label="情報" label_selected="" name="BtnOwner" />
         <text name="LabelAcquiredTitle">
-                入手：
+                入手日時：
         </text>
         <text name="LabelAcquiredDate">
                 2006年5月24日水曜日12:50:46
         </text>
         <text name="OwnerLabel">
-                ��る���：
+                ��る��：
         </text>
         <check_box label="修正" name="CheckOwnerModify" />
         <check_box label="コピー" name="CheckOwnerCopy" />
@@ -49,8 +49,8 @@
         </text>
         <check_box label="グループ分担" name="CheckShareWithGroup" />
         <check_box label="誰�対��もコピーを許�" name="CheckEveryoneCopy" />
-        <text name="NextOwnerLabel">
-                次�オーナー�実行��る�作：
+        <text name="NextOwnerLabel" width="158">
+                次�オーナー���る��：
         </text>
         <check_box label="修正" name="CheckNextOwnerModify" />
         <check_box label="コピー" name="CheckNextOwnerCopy" />
@@ -77,7 +77,7 @@
                 (公共)
         </text>
         <text name="you_can">
-                次��������：
+                ��る��：
         </text>
         <text name="owner_can">
                 オーナー�次��������：
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 49d7f16..ba85592 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="自分�土地">
         <scroll_list name="parcel list">
-                <column label="Name" name="name" />
-                <column label="Location" name="location" />
-                <column label="Area" name="area" />
-                <column label="" name="hidden" />
+                <column label="��" name="name"/>
+                <column label="�置" name="location"/>
+                <column label="��" name="area"/>
+                <column label="" name="hidden"/>
         </scroll_list>
-        <button label="テレ�ート" label_selected="テレ�ート" name="Teleport"
-             tool_tip="��土地�中心�テレ�ート" />
-        <button label="地図上�表示" label_selected="地図上�表示"
-             name="Show on Map"
-             tool_tip="��土地を世界地図�表示���。" />
+        <button label="テレ�ート" label_selected="テレ�ート" name="Teleport" tool_tip="��土地�中心�テレ�ート"/>
+        <button label="地図上�表示" label_selected="地図上�表示" name="Show on Map" tool_tip="��土地を世界地図�表示���。"/>
         <text name="contrib_label">
                 ����グループ��貢献：
         </text>
         <scroll_list name="grant list">
-                <column label="Group" name="group" />
-                <column label="Area" name="area" />
+                <column label="グループ�" name="group"/>
+                <column label="��" name="area"/>
         </scroll_list>
         <text name="allowed_label">
                 �在�支払�プラン��許��れ��有地：
         </text>
         <text name="allowed_text">
-                ［AREA］平方メートル
+                [AREA]平方メートル
         </text>
         <text name="current_label">
                 �在��有地：
         </text>
         <text name="current_text">
-                ［AREA］平方メートル
+                [AREA]平方メートル
         </text>
         <text name="available_label">
                 土地購入�：
         </text>
         <text name="available_text">
-                ［AREA］平方メートル
+                [AREA]平方メートル
         </text>
         <string name="area_string">
-                ［AREA］平方メートル
+                [AREA]平方メートル
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index d28c673..7994273 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -2,7 +2,7 @@
 <floater name="script ed float" title="スクリプト：新��スクリプト">
         <button label="リセット" label_selected="リセット" name="Reset" />
         <check_box label="実行中" name="running" />
-        <check_box label="モノ" name="mono" />
+        <check_box label="Mono" name="mono" />
         <text name="not_allowed">
                 ������スクリプトを見る�������ん。
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 1e69a23..55eba96 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -3,5 +3,5 @@
         <check_box label="カーソルを追�" name="lock_check" />
         <combo_box label="ロック" name="history_combo" />
         <button label="戻る" name="back_btn" />
-        <button label="転�" name="fwd_btn" />
+        <button label="進む" name="fwd_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index 8acb381..10f4dea 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="メディア・ブラウザー">
+<floater name="floater_about" title="メディア・ブラウザ">
         <layout_stack name="stack1">
                 <layout_panel name="nav_controls">
                         <button label="戻る" name="back" />
-                        <button label="転�" name="forward" />
-                        <button label="�ロード" name="reload" />
-                        <button label="行�" name="go" />
+                        <button label="進む" name="forward" />
+                        <button label="æ›´æ–°" name="reload" />
+                        <button label="閲覧" name="go" />
                 </layout_panel>
                 <layout_panel name="parcel_owner_controls">
                         <button label="�在� URL を区画��信" name="assign" />
                 </layout_panel>
                 <layout_panel name="external_controls">
-                        <button label="自分� Web ブラウザー�開�" name="open_browser" />
-                        <check_box label="常�マイブラウザー�開�" name="open_always" />
+                        <button label="自分� Web ブラウザ�開�" name="open_browser" />
+                        <check_box label="常�自分� Web ブラウザ�開�" name="open_always" />
                         <button label="閉�る" name="close" />
                 </layout_panel>
         </layout_stack>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_mute.xml b/linden/indra/newview/skins/default/xui/ja/floater_mute.xml
index dbc89f8..c76288f 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_mute.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mute floater"
-     title="ミュート�れ��人�よ�オブジェクト">
+     title="無視�れ��人�よ�オブジェクト" short_title="無視リスト">
         <scroll_list name="mutes" tool_tip="List of currently muted residents" />
-        <button label="�人をミュート�る..."
-             label_selected="�人をミュート�る..." name="Mute resident..."
-             tool_tip="ミュート�る�人を�択" />
-        <button label="オブジェクトを���ミュート..."
-             label_selected="オブジェクトを���ミュート..."
+        <button label="�人を無視�る"
+             label_selected="�人を無視�る" name="Mute resident..."
+             tool_tip="無視�る�人を�択" />
+        <button label="オブジェクト��無視"
+             label_selected="オブジェクト��無視"
              name="Mute object by name..." />
-        <button label="ミュート���" label_selected="ミュート���"
+        <button label="無視�解除" label_selected="無視�解除"
              name="Unmute"
-             tool_tip="�人���オブジェクトをミュート・リスト�ら削除" />
+             tool_tip="�人���オブジェクトを無視リスト�ら削除" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index 20367fb..072bb4a 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="オブジェクト��ミュート(消声)�る">
+<floater name="mute by name" title="オブジェクト��無視�る">
         <text name="message">
-                ���よるミュート(消声)��オブジェクト・�ャット��よ�ＩＭ���影響��サウンド(環境音��)��影響���ん。
-正確�オブジェクト�をタイプ�る必���り��。
+                ﾃｷｽﾄ���影響��ｻｳ�ﾄﾞ(環境音��)��影響���ん。
+正確�オブジェクト�を入力������。
         </text>
         <line_editor name="object_name">
                 オブジェクト�
         </line_editor>
         <button label="OK" name="OK" />
-        <button label="キャンセル" name="Cancel" />
+        <button label="ｷｬ�ｾﾙ" name="Cancel" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
index e39f9f1..3477bd4 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_new_outfit_dialog.xml
@@ -2,7 +2,7 @@
 <floater name="modal container" title=" ">
         <button label="�存" label_selected="�存" name="Save" />
         <button label="�り消�" label_selected="�り消�" name="Cancel" />
-        <check_box label="å½¢" name="checkbox_Shape" />
+        <check_box label="シェイプ(体型)" name="checkbox_Shape" />
         <check_box label="スキン" name="checkbox_Skin" />
         <check_box label="髪" name="checkbox_Hair" />
         <check_box label="眼" name="checkbox_Eyes" />
@@ -31,7 +31,7 @@
         <check_box label="左耳" name="checkbox_Left Ear" left="212" />
         <check_box label="�耳" name="checkbox_Right Ear" left="312" />
         <check_box label="左目眼�" name="checkbox_Left Eyeball" left="312"/>
-        <check_box label="�眼眼�" name="checkbox_Right Eyeball" left="312" />
+        <check_box label="�目眼�" name="checkbox_Right Eyeball" left="312" />
         <check_box label="é¼»" name="checkbox_Nose" left="312" />
         <check_box label="�上腕" name="checkbox_R Upper Arm" left="312" />
         <check_box label="��腕" name="checkbox_R Forearm" left="312" />
@@ -59,10 +59,10 @@
         </text>
         <text type="string" length="1"
              name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
-                �装フォルダ�����身体部����れ��。
-���を装��る����装フォルダをア�ター�ドラッグ���。
+                �装���や身体部��入��フォルダ��。
+�装フォルダをア�ター�ドラッグ��中身を装����。
  
-[新���装を作�]���新��フォルダを作���
+[�装を作�]���新��フォルダを作���
 �在装����るアイテム�コピーを�存���。
         </text>
         <text type="string" length="1" name="Folder name:">
@@ -78,7 +78,7 @@
                 �：
         </text>
         <text type="string" length="1" name="Attachments:" left="212">
-                添付物：
+                装�物：
         </text>
         <text type="string" length="1" name="Options:">
                 オプション：
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml b/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml
index 1689ec7..65c4f65 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_postcard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="スナップショットを電�メール��信">
+<floater name="Postcard" title="スナップショットをEメール��信">
         <text name="to_label">
-                �人�電�メール：
+                �人�Eメール：
         </text>
         <line_editor left="145" name="to_form" width="125" />
         <text name="from_label">
@@ -15,13 +15,13 @@
         <text name="subject_label">
                 件�：
         </text>
-        <line_editor label="件�を���タイプ。" left="145" name="subject_form"
+        <line_editor label="件�を���入力" left="145" name="subject_form"
              width="125" />
         <text name="msg_label">
                 メッセージ：
         </text>
         <text_editor bottom_delta="-120" height="110" name="msg_form">
-                メッセージを���タイプ。
+                メッセージを���入力������。
         </text_editor>
         <check_box label="ウェブ上�公開" name="allow_publish_check"
              tool_tip="���ストカードをウェブ上�公開���。" />
@@ -29,12 +29,12 @@
              tool_tip="���ストカード���人��内容���れ��。" />
         <button label="?" left="300" name="publish_help_btn" />
         <text name="fine_print">
-                �����信者�SL��加�る������紹介ボーナスを���れ��
+                ���信者�SL��加�る������紹介ボーナス�入り��
         </text>
         <button bottom_delta="-52" label="�り消�" name="cancel_btn" />
         <button label="�信" name="send_btn" />
         <text name="default_subject">
-                Second Life �ら��ストカード。
+                Second Life �ら��ストカード
         </text>
         <text name="default_message">
                 �れ�絶対�ェック�
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
index bc5675c..61665a1 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_preview_gesture.xml
@@ -22,7 +22,7 @@
         <text name="key_label">
                 ショートカット・キー：
         </text>
-        <combo_box label="��" name="modifier_combo"/>
+        <combo_box label="��" name="modifier_combo" left="160"/>
         <combo_box label="��" name="key_combo"/>
         <text name="library_label">
                 ライブラリ：
@@ -30,12 +30,14 @@
         <text name="steps_label">
                 手順：
         </text>
+        <!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
         <scroll_list name="library_list">
                 アニメーション
 サウンド
 �ャット
 å¾…æ©Ÿ
         </scroll_list>
+        -->
         <button label="追加＞＞" name="add_btn"/>
         <button label="上�移動" name="up_btn"/>
         <button label="下�移動" name="down_btn"/>
@@ -55,7 +57,7 @@
         </radio_group>
         <check_box label="アニメーション�完了�る��" name="wait_anim_check"/>
         <check_box label="秒表示�時間" name="wait_time_check"/>
-        <check_box label="アクティブ" name="active_check" tool_tip="アクティブ・ジェス�ャー��トリガー・フレーズを使������ホット・キーを押����よ��トリガー����。  1��ショートカット・キー�2�以上�ジェス�ャー�割り当�られ�場����ジェス�ャー�両方�もアクティブ�����り��。"/>
+        <check_box label="アクティブ" left="120" name="active_check" tool_tip="アクティブ・ジェス�ャー��トリガー・フレーズを使������ホット・キーを押����よ��トリガー����。  1��ショートカット・キー�2�以上�ジェス�ャー�割り当�られ�場����ジェス�ャー�両方�もアクティブ�����り��。"/>
         <button label="プレビュー" name="preview_btn"/>
         <button label="�存" name="save_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
index 29dfb2a..eddccdf 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_report_abuse.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="嫌�ら��報告">
+        <texture_picker label="" name="screenshot"/>
+        <check_box label="ｽｸﾘｰ�ｼｮｯﾄを��る" name="screen_check"/>
         <text name="reporter_title">
                 報告者：
         </text>
@@ -15,16 +17,13 @@
         <text name="pos_title">
                 �置：
         </text>
-        <texture_picker name="screenshot" />
-        <check_box label="ｽｸﾘｰ�ｼｮｯﾄを��る" name="screen_check" />
         <text name="pos_field">
                 {128.1, 128.1, 15.4}
         </text>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="オブジェクト・ピッカー - ��報告�主題��るオブジェクトを特定" />
         <text name="select_object_label">
                 ボタンを使��オブジェクトを�択：
         </text>
+        <button label="" label_selected="" name="pick_btn" tool_tip="オブジェクト・ピッカー - ��報告�主題��るオブジェクトを特定"/>
         <text name="object_name_label">
                 ��：
         </text>
@@ -37,11 +36,7 @@
         <text name="owner_name">
                 Hendrerit Vulputate
         </text>
-        <combo_box name="category_combo"
-             tool_tip="Category -- select the category that best describes this report">
-                <combo_item name="Selectcategory">
-                        カテゴリーを�択
-                </combo_item>
+        <combo_box name="category_combo" tool_tip="カテゴリー -- ��報告�最も���カテゴリーを�択������">
                 <combo_item name="Select_category">
                         カテゴリーを�択
                 </combo_item>
@@ -63,14 +58,11 @@
                 <combo_item name="Assault__Weapons_testing_sandbox">
                         攻撃&gt;武器テスト用サンドボックス
                 </combo_item>
-                <combo_item name="Copyright_or_intellectual_property_violation">
-                        著作権���知的所有権�関�る��
-                </combo_item>
                 <combo_item name="Commerce__Failure_to_deliver_product_or_service">
                         商�引&gt;製����サービス��供�行�れ��
                 </combo_item>
-                <combo_item name="Disclosure__First_Life_information">
-                        開示&gt;1st Life�情報
+                <combo_item name="Disclosure__Real_world_information">
+                        開示 &gt; リアルワールド�情報
                 </combo_item>
                 <combo_item name="Disclosure__Remotely_monitoring chat">
                         開示&gt;離れ�����ら�ャットをモニター���る
@@ -135,26 +127,14 @@
                 <combo_item name="Indecency__Mature_content_in_PG_region">
                         ����&gt;PG地域��人���見��れるコンテンツ
                 </combo_item>
-                <combo_item name="Intolerance">
-                        �寛容
-                </combo_item>
-                <combo_item name="Harassment">
-                        嫌�ら�
+                <combo_item name="Intellectual_property_infringement_Content_Removal">
+                        知的財産�侵害 &gt; コンテンツ�撤去
                 </combo_item>
-                <combo_item name="Assault">
-                        攻撃
+                <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+                        知的財産�侵害 &gt; コピーBot��権��悪用
                 </combo_item>
-                <combo_item name="Disclosure">
-                        開示
-                </combo_item>
-                <combo_item name="Indecency">
-                        ����
-                </combo_item>
-                <combo_item name="Age">
-                        å¹´é½¢
-                </combo_item>
-                <combo_item name="Parcel">
-                        区画
+                <combo_item name="Intolerance">
+                        �寛容
                 </combo_item>
                 <combo_item name="Land__Abuse_of_sandbox_resources">
                         土地&gt;サンドボックス・リソース�乱用
@@ -168,9 +148,6 @@
                 <combo_item name="Land__Encroachment__Trees_plants">
                         土地&gt;�法侵入&gt;樹木/�物
                 </combo_item>
-                <combo_item name="Trademark_violation">
-                        商標権�侵害
-                </combo_item>
                 <combo_item name="Wagering_gambling">
                         賭�/ギャンブル
                 </combo_item>
@@ -181,10 +158,8 @@
         <text name="abuser_name_title">
                 迷惑ユーザー���：
         </text>
-        <button label="�人を�択" label_selected="" name="select_abuser"
-             tool_tip="嫌�ら�を��人���をリスト�ら�択������。" />
-        <check_box label="嫌�ら�を��人�����明" name="omit_abuser_name"
-             tool_tip="嫌�ら�を��人���を�供�����������れを確�" />
+        <button label="�人を�択" label_selected="" name="select_abuser" tool_tip="嫌�ら�を��人���をリスト�ら�択������。"/>
+        <check_box label="嫌�ら�を��人�����明" name="omit_abuser_name" tool_tip="嫌�ら�を��人���を�供�����������れを確�"/>
         <text name="abuser_name_title2">
                 嫌�ら��起��場所：
         </text>
@@ -202,7 +177,6 @@
         <text name="incomplete_title">
                 注�：�完全�レ�ート�調査�れ��ん。
         </text>
-        <button label="嫌�ら��報告" label_selected="嫌�ら��報告"
-             name="send_btn" />
-        <button label="�り消�" label_selected="�り消�" name="cancel_btn" />
+        <button label="�り消�" label_selected="�り消�" name="cancel_btn"/>
+        <button label="嫌�ら��報告" label_selected="嫌�ら��報告" name="send_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 4b8650a..1db0e2a 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="sell land" title="土地を販売">
+<floater name="sell land" title="土地を販売" height="511" min_height="511" >
         <text name="info_parcel_label">
                 区画：
         </text>
-        <text name="info_parcel">
+        <text name="info_parcel" left="62">
                 区画�
         </text>
         <text name="info_size_label">
                 サイズ：
         </text>
-        <text name="info_size">
+        <text name="info_size" left="62">
                 [AREA]平方メートル
         </text>
         <text name="info_action">
@@ -19,19 +19,19 @@
                 価格を設定：
         </text>
         <text name="price_text">
-                ��土地�対�る�切�価格を�択������。
+                ��土地�対�る�切�価格を�択������
         </text>
         <text name="price_ld">
                 L$
         </text>
-        <text name="price_per_m">
+        <text name="price_per_m" width="230" left_delta="106">
                 （1平方メートル当�りL$ [PER_METER]）
         </text>
         <text name="sell_to_label">
                 土地�販売先：
         </text>
-        <text name="sell_to_text">
-                誰��も販売�る��特定�購入者���販売�る�を�択������。
+        <text name="sell_to_text" right="-6">
+                誰��も販売�る��特定�人���販売�る�を�択������
         </text>
         <combo_box name="sell_to">
                 <combo_item name="--selectone--">
@@ -49,20 +49,22 @@
                 土地�共�オブジェクトを販売����？
         </text>
         <text name="sell_objects_text">
-                区画上��る土地オーナー�譲渡�能�オブジェクト��所有権�変更�れ��。
+                区画上��る譲渡�能�オブジェクト�所有権�変更�れ��
         </text>
-        <radio_group name="sell_objects">
+        <radio_group name="sell_objects" height="72" bottom_delta="-76">
                 <radio_item name="no">
-                        ����オブジェクト所有権を�����
+                        ����オブジェクト所有権
+を�����
                 </radio_item>
-                <radio_item name="yes">
-                        ���土地�一緒�オブジェクトを売り��。
+                <radio_item name="yes" bottom="-56">
+                        ���土地�一緒�オブジェ
+クトを売り��
                 </radio_item>
         </radio_group>
-        <button label="オブジェクトを表示" name="show_objects" />
+        <button label="オブジェクトを表示" name="show_objects" width="138"/>
         <text name="nag_message_label">
-                注�：返�や交������ん。
+                注�：返�や交������ん
         </text>
-        <button label="売り地�設定" name="sell_btn" />
+        <button label="売り地�設定" name="sell_btn"  bottom="-505"/>
         <button label="�り消�" name="cancel_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 1a59057..defd5b0 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -5,7 +5,7 @@
         </text>
         <radio_group label="スナップショット・タイプ" name="snapshot_type_radio">
                 <radio_item name="postcard">
-                        電�メール��信
+                        Eメール��信
                 </radio_item>
                 <radio_item name="texture">
                         ��物��存(L$10)
@@ -34,12 +34,12 @@
         <text name="type_label2">
                 サイズ
         </text>
-        <text name="format_label">
-                フォーマット
+        <text name="format_label" width="75">
+                形�
         </text>
         <combo_box label="解�度" name="postcard_size_combo">
                 <combo_item name="CurrentWindow">
-                        �在�ウィンドウ
+                        �在�ｳｨ�ﾄﾞｳ
                 </combo_item>
                 <combo_item name="640x480">
                         640x480
@@ -56,7 +56,7 @@
         </combo_box>
         <combo_box label="解�度" name="texture_size_combo">
                 <combo_item name="CurrentWindow">
-                        �在�ウィンドウ
+                        �在�ｳｨ�ﾄﾞｳ
                 </combo_item>
                 <combo_item name="Small(128x128)">
                         �（128x128）
@@ -73,7 +73,7 @@
         </combo_box>
         <combo_box label="解�度" name="local_size_combo">
                 <combo_item name="CurrentWindow">
-                        �在�ウィンドウ
+                        �在�ｳｨ�ﾄﾞｳ
                 </combo_item>
                 <combo_item name="320x240">
                         320x240
@@ -97,7 +97,7 @@
                         カスタム
                 </combo_item>
         </combo_box>
-        <combo_box label="フォーマット" name="local_format_combo">
+        <combo_box label="形�" name="local_format_combo">
                 <combo_item name="PNG">
                         PNG
                 </combo_item>
@@ -108,9 +108,9 @@
                         BMP
                 </combo_item>
         </combo_box>
-        <spinner label="å¹…" name="snapshot_width"/>
-        <spinner label="高�" name="snapshot_height"/>
-        <check_box label="比率�制�" name="keep_aspect_check"/>
+        <spinner label="å¹…" name="snapshot_width" label_width="25" width="90"/>
+        <spinner label="高�" name="snapshot_height" label_width="30" left="115" width="90"/>
+        <check_box label="縦横比�固定" name="keep_aspect_check"/>
         <slider label="画質" name="image_quality_slider"/>
         <text name="layer_type_label">
                 ｷｬﾌﾟ�ｬ：
@@ -129,7 +129,7 @@
         <check_box label="インタフェースを表示" name="ui_check"/>
         <check_box label="HUD オブジェクトを表示" name="hud_check"/>
         <check_box label="�存後も開��状態を��" name="keep_open_check"/>
-        <check_box label="フレームをフリーズ（全画�）" name="freeze_frame_check"/>
+        <check_box label="画�全体を�止��る" name="freeze_frame_check"/>
         <check_box label="自動更新" name="auto_snapshot_check"/>
         <string name="unknown">
                 未知
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
index 4d22f39..ab20496 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -4,7 +4,7 @@
         <text name="tool label">
                 フォーカス
         </text>
-        <button label="" label_selected="" name="button move" tool_tip="動�" />
+        <button label="" label_selected="" name="button move" tool_tip="動��" />
         <text name="tool label2">
                 移動
         </text>
@@ -74,9 +74,9 @@
         <check_box label="土地を�択" name="radio select land" />
         <check_box label="土地を�ら�" name="radio flatten" />
         <check_box label="土地を隆起��る" name="radio raise" />
-        <check_box label="低地" name="radio lower" />
+        <check_box label="土地を低��る" name="radio lower" />
         <check_box label="土地を滑ら���る" name="radio smooth" />
-        <check_box label="土地を�ら�" name="radio noise" />
+        <check_box label="土地を凸凹��る" name="radio noise" />
         <check_box label="土地を元�戻�" name="radio revert" />
         <combo_box name="combobox brush size">
                 <combo_item name="Small">
@@ -137,7 +137,7 @@
                         <text name="perm_modify">
                                 ��オブジェクト�修正����。
                         </text>
-                        <check_box label="グループ分担" name="checkbox share with group"
+                        <check_box label="グループ�共�管�" name="checkbox share with group"
                              tool_tip="グループ・メン�ー�対��移動�修正�コピー�削除を許�" />
                         <text name="text deed continued">
                                 譲渡...
@@ -253,7 +253,7 @@
                 </panel>
                 <panel label="オブジェクト" name="Object">
                         <text name="select_single">
-                                パラメーターを編集�る���基本�素を1����択������。
+                                プリムを1����択��編集������
                         </text>
                         <text name="edit_object">
                                 オブジェクト�パラメーターを編集：
@@ -289,19 +289,19 @@
                         </text>
                         <combo_box name="material">
                                 <combo_item name="Stone">
-                                        石
+                                        石�
                                 </combo_item>
                                 <combo_item name="Metal">
                                         金属
                                 </combo_item>
                                 <combo_item name="Glass">
-                                        グラス
+                                        ガラス
                                 </combo_item>
                                 <combo_item name="Wood">
-                                        木
+                                        木�
                                 </combo_item>
                                 <combo_item name="Flesh">
-                                        肉体
+                                        肌
                                 </combo_item>
                                 <combo_item name="Plastic">
                                         プラス�ック
@@ -336,7 +336,7 @@
                                         リング
                                 </combo_item>
                                 <combo_item name="Sculpted">
-                                        変形済�
+                                        スカルプト
                                 </combo_item>
                         </combo_box>
                         <text name="text cut">
@@ -345,13 +345,13 @@
                         <spinner label="B" name="cut begin" />
                         <spinner label="E" name="cut end" />
                         <text name="text hollow">
-                                中空
+                                中空(空洞)
                         </text>
                         <text name="text skew">
                                 傾斜
                         </text>
                         <text name="Hollow Shape">
-                                中空�形
+                                中空（空洞）�形
                         </text>
                         <combo_box name="hole">
                                 <combo_item name="Default">
@@ -386,10 +386,10 @@
                         <spinner label="X" name="Shear X" />
                         <spinner label="Y" name="Shear Y" />
                         <text name="advanced_cut">
-                                プロフィール・カット�始点�終点
+                                ﾌﾟﾛﾌｨｰﾙ･ｶｯﾄ�始点�終点
                         </text>
                         <text name="advanced_dimple">
-                                �����始点�終点
+                                ����始点�終点
                         </text>
                         <spinner label="B" name="Path Limit Begin" />
                         <spinner label="E" name="Path Limit End" />
@@ -402,9 +402,9 @@
                                 �径
                         </text>
                         <text name="text revolutions">
-                                レボリューション
+                                回転体
                         </text>
-                        <texture_picker label="変形テクス�ャー" name="sculpt texture control"
+                        <texture_picker label="スカルプトテクス�ャー" name="sculpt texture control"
                              tool_tip="クリック��写真を�択������。" />
                         <check_box label="ミラー" name="sculpt mirror control"
                              tool_tip="スカルプト�れ�プリムをX軸上��転" />
@@ -433,7 +433,7 @@
                 </panel>
                 <panel label="特徴" name="Features">
                         <text name="select_single">
-                                特徴を編集�る���基本�素を1����択������。
+                                プリムを1����択��編集������
                         </text>
                         <text name="edit_object">
                                 オブジェクト�特徴を編集：
@@ -558,7 +558,7 @@
                                 </combo_item>
                         </combo_box>
                         <text name="tex scale">
-                                顔���繰り返�
+                                ����繰り返�
                         </text>
                         <spinner label="水平（U）" name="TexScaleU" />
                         <check_box label="�転" name="checkbox flip s" />
@@ -582,11 +582,11 @@
                         </text>
                         <spinner label="水平（U）" name="TexOffsetU" />
                         <spinner label="åž‚ç›´ (V)" name="TexOffsetV" />
-                        <text name="textbox autofix">
+                        <text name="textbox autofix" width="190">
                                 メディア・テクス�ャーを��る
 （最��ロード�る��）
                         </text>
-                        <button label="��る" label_selected="��る" left="150" name="button align" />
+                        <button label="��る" label_selected="��る" left="155" bottom="-361" name="button align" />
                 </panel>
                 <panel label="コンテンツ" name="Contents">
                         <button label="新��スクリプト" label_selected="新��スクリプト..."
@@ -605,7 +605,7 @@
                 <button label="土地を放棄..." label_selected="土地を放棄..."
                      name="button abandon land" />
                 <button label="�分割..." label_selected="�分割..." name="button subdivide land" />
-                <button label="�加�る..." label_selected="�加�る..."
+                <button label="統��る..." label_selected="統��る..."
                      name="button join land" />
                 <button label="土地情報..." label_selected="土地情報..."
                      name="button about land" />
@@ -623,7 +623,7 @@
                 土地をクリック��ボタンを押����入力��修正変更
         </text>
         <text name="status_camera">
-                ビューをクリック��ドラッグ��変更
+                クリック�ドラッグ��視界を調整
         </text>
         <text name="status_grab">
                 ﾄﾞﾗｯｸﾞ�移動､Ctrl��上�､Ctrl+Shift�ｽﾋﾟ�
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index 819a715..e59f72b 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -1,51 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="ロード中．．．">
         <text name="title_text">
                 ロード中．．．
         </text>
         <scroll_list name="objects_list">
-                <column label="æ•°" name="score" />
-                <column label="��" name="name" />
-                <column label="所有者" name="owner" />
-                <column label="ロケーション" name="location" />
-                <column label="時間" name="time" />
+                <column label="æ•°" name="score"/>
+                <column label="��" name="name"/>
+                <column label="所有者" name="owner"/>
+                <column label="ロケーション" name="location"/>
+                <column label="時間" name="time"/>
+                <column label="Monoタイム" name="mono_time"/>
         </scroll_list>
         <text name="id_text">
                 物体ID：
         </text>
-        <button label="標識を表示" name="show_beacon_btn" />
+        <button label="標識を表示" name="show_beacon_btn"/>
         <text name="obj_name_text">
                 物体�：
         </text>
-        <button label="フィルタ" name="filter_object_btn" />
+        <button label="フィルタ" name="filter_object_btn"/>
         <text name="owner_name_text">
                 所有者�：
         </text>
-        <button label="フィルタ" name="filter_owner_btn" />
-        <button label="�択内容を返�" name="return_selected_btn" />
-        <button label="���返�" name="return_all_btn" />
-        <button label="�択内容を無効化" name="disable_selected_btn" />
-        <button label="���無効化" name="disable_all_btn" />
-        <button label="æ›´æ–°" name="refresh_btn" />
-        <text name="top_scripts_title">
+        <button label="フィルタ" name="filter_owner_btn"/>
+        <button label="�択内容を返�" name="return_selected_btn"/>
+        <button label="���返�" name="return_all_btn"/>
+        <button label="�択内容を無効化" name="disable_selected_btn"/>
+        <button label="���無効化" name="disable_all_btn"/>
+        <button label="æ›´æ–°" name="refresh_btn"/>
+        <string name="top_scripts_title">
                 トップ・スクリプト
-        </text>
-        <text name="top_scripts_text">
+        </string>
+        <string name="top_scripts_text">
                 [COUNT]スクリプト全体�実行時間�[TIME]ミリ秒。
-        </text>
-        <text name="scripts_score_label">
+        </string>
+        <string name="scripts_score_label">
                 時間
-        </text>
-        <text name="top_colliders_title">
+        </string>
+        <string name="scripts_mono_time_label">
+                Monoタイム
+        </string>
+        <string name="top_colliders_title">
                 上部コライダー
-        </text>
-        <text name="top_colliders_text">
+        </string>
+        <string name="top_colliders_text">
                 上�[COUNT]個�物体�多�����能性��り��。
-        </text>
-        <text name="colliders_score_label">
+        </string>
+        <string name="colliders_score_label">
                 æ•°
-        </text>
-        <text name="none_descriptor">
+        </string>
+        <string name="none_descriptor">
                 何も見��り��ん���。
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index ef56a90..9d3ca20 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -3,9 +3,9 @@
         <text name="media_label">
                 メディア URL：
         </text>
-        <button label="OK" name="ok_btn" />
-        <button label="キャンセル" name="cancel_btn" />
-        <button label="キャンセル" name="cancel_btn2" />
+        <combo_box left="100" name="media_entry" width="360" />
+        <button label="OK" name="ok_btn" width="78"/>
+        <button label="キャンセル" name="cancel_btn" width="80"/>
         <button label="クリア" name="clear_btn" />
         <text name="loading_label">
                 ロード中．．．
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml b/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml
index 04ae1d3..8dac774 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -24,7 +24,7 @@
                 <menu_item_call label="新��パンツ" name="New Underpants" />
         </menu>
         <menu name="New Body Parts">
-                <menu_item_call label="新��形" name="New Shape" />
+                <menu_item_call label="新��シェイプ(体型)" name="New Shape" />
                 <menu_item_call label="新��スキン" name="New Skin" />
                 <menu_item_call label="新��髪" name="New Hair" />
                 <menu_item_call label="新��眼" name="New Eyes" />
@@ -37,7 +37,7 @@
         <menu_item_call label="開�" name="Open" />
         <menu_item_call label="プロパティ" name="Properties" />
         <menu_item_call label="���変更" name="Rename" />
-        <menu_item_call label="資産UUIDをコピー" name="Copy Asset UUID" />
+        <menu_item_call label="UUIDをコピー" name="Copy Asset UUID" />
         <menu_item_call label="コピー" name="Copy" />
         <menu_item_call label="貼り付�" name="Paste" />
         <menu_item_call label="削除" name="Delete" />
@@ -57,8 +57,8 @@
         <menu_item_call label="�アクティブ" name="Deactivate" />
         <menu_item_call label="自分�ら�り外�" name="Detach From Yourself" />
         <menu_item_call label="装�" name="Object Wear" />
-        <menu label="添付先" name="Attach To" />
-        <menu label="HUD�添付" name="Attach To HUD" />
+        <menu label="装�先" name="Attach To" />
+        <menu label="HUD装�先" name="Attach To HUD" />
         <menu_item_call label="装�" name="Wearable Wear" />
         <menu_item_call label="編集" name="Wearable Edit" />
         <menu_item_call label="�り外�" name="Take Off" />
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
index 3be4b21..10de376 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_avatar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Avatar Pie">
         <menu_item_call label="プロフィール..." name="Profile..." />
-        <menu_item_call label="ミュート" name="Avatar Mute" />
+        <menu_item_call label="無視" name="Avatar Mute" />
         <menu_item_call label="移動先" name="Go To" />
         <menu_item_call label="評価" name="Rate" />
         <menu_item_call label="フレンドを追加..." name="Add Friend" />
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml
index 64a8190..97161ce 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_pie_object.xml
@@ -10,14 +10,14 @@
                 <menu_item_call label="削除" name="Delete" />
                 <menu_item_call label="装�" name="Wear" />
                 <menu_item_call label="コピーを�る" name="Take Copy" />
-                <pie_menu label="HUDを添付＞" name="Object Attach HUD" />
-                <pie_menu label="添付＞" name="Object Attach" />
+                <pie_menu label="HUD装�先＞" name="Object Attach HUD" />
+                <pie_menu label="装�先＞" name="Object Attach" />
                 <menu_item_call label="返�..." name="Return..." />
                 <pie_menu label="詳細＞" name="Rate Menu">
                         <menu_item_call label="オーナーを評価..." name="Rate Owner..." />
                         <menu_item_call label="嫌�ら��報告..." name="Report Abuse..." />
                         <menu_item_call label="クリエーターを評価..." name="Rate Creator..." />
-                        <menu_item_call label="ミュート" name="Object Mute" />
+                        <menu_item_call label="無視" name="Object Mute" />
                         <menu_item_call label="検査" name="Object Inspect" />
                 </pie_menu>
                 <menu_item_call label="購入..." name="Buy..." />
diff --git a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
index ef68d38..af870a0 100644
--- a/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -1,265 +1,207 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
         <menu label="ファイル" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="画�をアップロード（L$[COST]）..." name="Upload Image" />
-                <menu_item_call label="サウンドをアップロード（L$[COST]）..." name="Upload Sound" />
-                <menu_item_call label="アニメーションをアップロード（L$[COST]）..."
-                     name="Upload Animation" />
-                <menu_item_call label="大�アップロード（L＄[COST]�ファイル）…"
-                     name="Bulk Upload" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="ウィンドウを閉�る" name="Close Window" />
-                <menu_item_call label="全��ウィンドウを閉�る" name="Close All Windows" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="テクス�ャーを別���存..." name="Save Texture As..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="スナップショットを撮る" name="Take Snapshot" />
-                <menu_item_call label="スナップショットをディスク��存"
-                     name="Snapshot to Disk" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="ウィンドウ・サイズを設定" name="Set Window Size">
-                        <menu_item_call label="320x240" name="320x240" />
-                        <menu_item_call label="640x480" name="640x480" />
-                        <menu_item_call label="800x600" name="800x600" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="720 x 480（NTSC）" name="720x480 (NTSC)" />
-                        <menu_item_call label="768 x 576（PAL）" name="768x576 (PAL)" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="終了" name="Quit" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="画�をアップロード（L$[COST]）..." name="Upload Image"/>
+                <menu_item_call label="サウンドをアップロード（L$[COST]）..." name="Upload Sound"/>
+                <menu_item_call label="アニメーションをアップロード（L$[COST]）..." name="Upload Animation"/>
+                <menu_item_call label="一括アップロード（L$[COST]�ファイル）…" name="Bulk Upload"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="ウィンドウを閉�る" name="Close Window"/>
+                <menu_item_call label="全��ウィンドウを閉�る" name="Close All Windows"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="テクス�ャーを別���存..." name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="スナップショットを撮る" name="Take Snapshot"/>
+                <menu_item_call label="スナップショットをディスク��存" name="Snapshot to Disk"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="終了" name="Quit"/>
         </menu>
         <menu label="編集" name="Edit">
-                <menu_item_call label="元�戻�" name="Undo" />
-                <menu_item_call label="やり直�" name="Redo" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="カット" name="Cut" />
-                <menu_item_call label="コピー" name="Copy" />
-                <menu_item_call label="貼り付�" name="Paste" />
-                <menu_item_call label="削除" name="Delete" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="検索..." name="Search..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="���を�択" name="Select All" />
-                <menu_item_call label="�択解除" name="Deselect" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="複製" name="Duplicate" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu label="オブジェクトを装�" name="Attach Object" />
-                <menu label="オブジェクトを�り外�" name="Detach Object" />
+                <menu_item_call label="元�戻�" name="Undo"/>
+                <menu_item_call label="やり直�" name="Redo"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="カット" name="Cut"/>
+                <menu_item_call label="コピー" name="Copy"/>
+                <menu_item_call label="貼り付�" name="Paste"/>
+                <menu_item_call label="削除" name="Delete"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="検索..." name="Search..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="���を�択" name="Select All"/>
+                <menu_item_call label="�択解除" name="Deselect"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="複製" name="Duplicate"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu label="オブジェクトを装�" name="Attach Object"/>
+                <menu label="オブジェクトを�り外�" name="Detach Object"/>
                 <menu label="�を脱�" name="Take Off Clothing">
-                        <menu_item_call label="シャツ" name="Shirt" />
-                        <menu_item_call label="ズボン" name="Pants" />
-                        <menu_item_call label="�" name="Shoes" />
-                        <menu_item_call label="�下" name="Socks" />
-                        <menu_item_call label="ジャケット" name="Jacket" />
-                        <menu_item_call label="手袋" name="Gloves" />
-                        <menu_item_call label="（下��）シャツ" name="Menu Undershirt" />
-                        <menu_item_call label="（下��）パンツ" name="Menu Underpants" />
-                        <menu_item_call label="スカート" name="Skirt" />
-                        <menu_item_call label="�����" name="All Clothes" />
+                        <menu_item_call label="シャツ" name="Shirt"/>
+                        <menu_item_call label="ズボン" name="Pants"/>
+                        <menu_item_call label="�" name="Shoes"/>
+                        <menu_item_call label="�下" name="Socks"/>
+                        <menu_item_call label="ジャケット" name="Jacket"/>
+                        <menu_item_call label="手袋" name="Gloves"/>
+                        <menu_item_call label="（下��）シャツ" name="Menu Undershirt"/>
+                        <menu_item_call label="（下��）パンツ" name="Menu Underpants"/>
+                        <menu_item_call label="スカート" name="Skirt"/>
+                        <menu_item_call label="�����" name="All Clothes"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="ジェス�ャー…" name="Gestures..." />
-                <menu_item_call label="プロフィール..." name="Profile..." />
-                <menu_item_call label="容姿..." name="Appearance..." />
-                <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="フレンド..." name="Friends..." />
-                <menu_item_call label="グループ..." name="Groups..." />
-                <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="環境設定..." name="Preferences..." />
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="ジェス�ャー…" name="Gestures..."/>
+                <menu_item_call label="プロフィール..." name="Profile..."/>
+                <menu_item_call label="容姿..." name="Appearance..."/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_check label="フレンド..." name="Friends..."/>
+                <menu_item_call label="グループ..." name="Groups..."/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_call label="環境設定..." name="Preferences..."/>
         </menu>
-        <menu label="ビュー" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="マウスルック" name="Mouselook" />
-                <menu_item_check label="建造" name="Build" />
-                <menu_item_check label="ジョイスティック・フライカム" name="Joystick Flycam" />
-                <menu_item_call label="表示をリセット" name="Reset View" />
-                <menu_item_call label="最後��ャットを閲覧" name="Look at Last Chatter" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="ツール�ー" name="Toolbar" />
-                <menu_item_check label="ローカル・�ャット" name="Chat History" />
-                <menu_item_check label="コミュニケーション" name="Instant Message" />
-                <menu_item_call label="��物" name="Inventory" />
-                <menu_item_check label="アクティブ・スピーカー" name="Active Speakers" />
-                <menu_item_check label="ミュートリスト" name="Mute List" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="カメラ・コントロール" name="Camera Controls" />
-                <menu_item_check label="移動コントロール" name="Movement Controls" />
-                <menu_item_check label="世界地図" name="World Map" />
-                <menu_item_check label="ミニマップ" name="Mini-Map" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="統計�ー" name="Statistics Bar" />
-                <menu_item_check label="土地境界線" name="Property Lines" />
-                <menu_item_check label="土地オーナー" name="Land Owners" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="ホ�リング・ヒント" name="Hover Tips">
-                        <menu_item_check label="ヒントを表示" name="Show Tips" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="土地�ヒント" name="Land Tips" />
-                        <menu_item_check label="����オブジェクト�関�るヒント"
-                             name="Tips On All Objects" />
-                </menu>
-                <menu_item_check label="Alt キー：オブジェクト表示" name="Alt Shows Physical" />
-                <menu_item_check label="標識を常�オン" name="Beacons Always On" />
-                <menu_item_check label="�明オブジェクトを強調表示" name="Highlight Transparent" />
-                <menu label="ビーコン" name="Beacons">
-                        <menu_item_check label="タッ�オンリー�スクリプトを�むオブジェクト"
-                             name="Scripted Objects With Touch Only" />
-                        <menu_item_check label="スクリプト・オブジェクト" name="Scripted Objects" />
-                        <menu_item_check label="物�的オブジェクト" name="Physical Objects" />
-                        <menu_item_check label="音�" name="Sound Sources" />
-                        <menu_item_check label="パーティクル�" name="Particle Sources" />
-                        <menu_item_check label="�イライト�レンダリング" name="Render Highlights" />
-                        <menu_item_check label="標識�レンダリング" name="Render Beacons" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_separator label="-----------" name="separator2" />
-                        <menu_item_check label="パーティクルを隠�" name="Hide Particles" />
-                        <menu_item_separator label="-----------" name="separator3" />
-                        <menu label="標識�幅" name="Beacon Width">
-                                <menu_item_call label="1" name="Beacon Width 1" />
-                                <menu_item_call label="4" name="Beacon Width 4" />
-                                <menu_item_call label="16" name="Beacon Width 16" />
-                                <menu_item_call label="32" name="Beacon Width 32" />
-                        </menu>
+        <menu label="表示" name="View">
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="一人称視点（マウスルック）" name="Mouselook"/>
+                <menu_item_check label="制作ツール" name="Build"/>
+                <menu_item_check label="ジョイスティック�作" name="Joystick Flycam"/>
+                <menu_item_call label="表示をリセット" name="Reset View"/>
+                <menu_item_call label="最後��ャットを閲覧" name="Look at Last Chatter"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="ツール�ー" name="Toolbar"/>
+                <menu_item_check label="ローカル・�ャット" name="Chat History"/>
+                <menu_item_check label="コミュニケーション" name="Instant Message"/>
+                <menu_item_call label="��物" name="Inventory"/>
+                <menu_item_check label="ボイス�ャット・ユーザー一覧" name="Active Speakers"/>
+                <menu_item_check label="無視リスト" name="Mute List"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="カメラ・コントロール" name="Camera Controls"/>
+                <menu_item_check label="移動コントロール" name="Movement Controls"/>
+                <menu_item_check label="世界地図" name="World Map"/>
+                <menu_item_check label="ミニマップ" name="Mini-Map"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="地域�統計情報" name="Statistics Bar"/>
+                <menu_item_check label="土地�境界線" name="Property Lines"/>
+                <menu_item_check label="土地オーナー" name="Land Owners"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu label="ヒント��ップアップ" name="Hover Tips">
+                        <menu_item_check label="ヒントを表示" name="Show Tips"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="土地�ヒント" name="Land Tips"/>
+                        <menu_item_check label="����オブジェクト�関�るヒント" name="Tips On All Objects"/>
                 </menu>
-                <menu_item_check label="HUD添付物を表示" name="Show HUD Attachments" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="拡大" name="Zoom In" />
-                <menu_item_call label="デフォルトを拡大" name="Zoom Default" />
-                <menu_item_call label="縮�" name="Zoom Out" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="[全画�表示]" name="Toggle Fullscreen" />
-                <menu_item_call label="UIサイズをデフォルト�設定" name="Set UI Size to Default" />
+                <menu_item_check label="�明オブジェクトを強調表示" name="Highlight Transparent"/>
+                <menu_item_check label="ビーコン(標識)" name="beacons"/>
+                <menu_item_check label="パーティクルを�表示" name="Hide Particles"/>
+                <menu_item_check label="HUD装�物を表示" name="Show HUD Attachments"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="カメラ・ズームイン" name="Zoom In"/>
+                <menu_item_call label="カメラ・デフォルト" name="Zoom Default"/>
+                <menu_item_call label="カメラ・ズームアウト" name="Zoom Out"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="[全画�表示]" name="Toggle Fullscreen"/>
+                <menu_item_call label="UIサイズを標準設定�戻�" name="Set UI Size to Default"/>
         </menu>
         <menu label="世界" name="World">
-                <menu_item_call label="�ャット" name="Chat" />
-                <menu_item_call label="ジェス�ャー�開始" name="Start Gesture" />
-                <menu_item_check label="常�走る" name="Always Run" />
-                <menu_item_check label="飛行" name="Fly" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="���ランドマークを作�" name="Create Landmark Here" />
-                <menu_item_call label="ホームを���設定" name="Set Home to Here" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="ホーム�テレ�ート" name="Teleport Home" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="退席中�設定" name="Set Away" />
-                <menu_item_call label="ビジー�設定" name="Set Busy" />
-                <menu_item_call label="アニメーションを����止" name="Stop All Animations" />
-                <menu_item_call label="キーを解除" name="Release Keys" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="�座履歴..." name="Account History..." />
-                <menu_item_call label="自分��座�管�..." name="Manage My Account..." />
-                <menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..." />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="自分�土地..." name="My Land..." />
-                <menu_item_call label="土地情報..." name="About Land..." />
-                <menu_item_call label="土地を購入..." name="Buy Land..." />
-                <menu_item_call label="地域��動産..." name="Region/Estate..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="太陽を調整�る" name="Force Sun">
-                        <menu_item_call label="日�出" name="Sunrise" />
-                        <menu_item_call label="正�" name="Noon" />
-                        <menu_item_call label="日没" name="Sunset" />
-                        <menu_item_call label="深夜" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="地域デフォルト�戻�" name="Revert to Region Default" />
-                </menu>
-                <menu label="環境設定" name="Environment Settings">
-                        <menu_item_call label="日�出" name="Sunrise" />
-                        <menu_item_call label="正�" name="Noon" />
-                        <menu_item_call label="日没" name="Sunset" />
-                        <menu_item_call label="深夜" name="Midnight" />
-                        <menu_item_call label="地域デフォルト�戻�" name="Revert to Region Default" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="環境編集" name="Environment Editor" />
+                <menu_item_call label="�ャット" name="Chat"/>
+                <menu_item_check label="常�走る" name="Always Run"/>
+                <menu_item_check label="飛行" name="Fly"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="��場所�ランドマークを作�" name="Create Landmark Here"/>
+                <menu_item_call label="ホームを���設定" name="Set Home to Here"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="ホーム�テレ�ート" name="Teleport Home"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="離席中�設定" name="Set Away"/>
+                <menu_item_call label="�り込�中�設定" name="Set Busy"/>
+                <menu_item_call label="アニメーションを����止" name="Stop All Animations"/>
+                <menu_item_call label="キー制御を解除" name="Release Keys"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="アカウント�履歴..." name="Account History...">
+                        <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ja" />
+                </menu_item_call>
+                <menu_item_call label="マイアカウント�管�..." name="Manage My Account...">
+                        <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ja" />
+                </menu_item_call>
+                <menu_item_call label="L$（リンデン・ドル）を購入" name="Buy and Sell L$..."/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="自分�土地..." name="My Land..."/>
+                <menu_item_call label="土地情報..." name="About Land..."/>
+                <menu_item_call label="土地を購入..." name="Buy Land..."/>
+                <menu_item_call label="地域��動産..." name="Region/Estate..."/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu label="環境�設定" name="Environment Settings">
+                        <menu_item_call label="日�出" name="Sunrise"/>
+                        <menu_item_call label="正�" name="Noon"/>
+                        <menu_item_call label="日没" name="Sunset"/>
+                        <menu_item_call label="深夜" name="Midnight"/>
+                        <menu_item_call label="地域�標準設定�戻�" name="Revert to Region Default"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="環境編集" name="Environment Editor"/>
                 </menu>
         </menu>
         <menu label="ツール" name="Tools">
-                <menu_item_check label="リンク�れ�パートを編集" name="Edit Linked Parts" />
-                <menu_item_separator label="-----------" name="separator7" />
                 <menu label="ツールを��" name="Select Tool">
-                        <menu_item_call label="フォーカス" name="Focus" />
-                        <menu_item_call label="移動" name="Move" />
-                        <menu_item_call label="編集" name="Edit" />
-                        <menu_item_call label="作�" name="Create" />
-                        <menu_item_call label="土地" name="Land" />
+                        <menu_item_call label="フォーカス" name="Focus"/>
+                        <menu_item_call label="移動" name="Move"/>
+                        <menu_item_call label="編集" name="Edit"/>
+                        <menu_item_call label="作�" name="Create"/>
+                        <menu_item_call label="土地" name="Land"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="自分�オブジェクト���択" name="Select Only My Objects" />
-                <menu_item_check label="移動�能�オブジェクト���択"
-                     name="Select Only Movable Objects" />
-                <menu_item_check label="環境��択" name="Select By Surrounding" />
-                <menu_item_check label="�表示��択を表示" name="Show Hidden Selection" />
-                <menu_item_check label="ライト�径一覧を表示" name="Show Light Radius for Selection" />
-                <menu_item_check label="�択ビームを表示" name="Show Selection Beam" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="グリッド�スナップ" name="Snap to Grid" />
-                <menu_item_call label="オブジェクトXYをグリッド�スナップ"
-                     name="Snap Object XY to Grid" />
-                <menu_item_call label="グリッド用�[�択]を使用" name="Use Selection for Grid" />
-                <menu_item_call label="グリッド�オプション..." name="Grid Options..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="リンク" name="Link" />
-                <menu_item_call label="リンク���" name="Unlink" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="�択をフォーカス" name="Focus on Selection" />
-                <menu_item_call label="�択範囲�ズームイン" name="Zoom to Selection" />
-                <menu_item_call label="オブジェクトを購入" name="Menu Object Take" />
-                <menu_item_call label="コピーを�る" name="Take Copy" />
-                <menu_item_call label="オブジェクトを��物�戻���存"
-                     name="Save Object Back to My Inventory" />
-                <menu_item_call
-                     label="オブジェクトをオブジェクト・コンテンツ�戻���存"
-                     name="Save Object Back to Object Contents" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="スクリプト警告�エラー・ウィンドウを表示"
-                     name="Show Script Warning/Error Window" />
-                <menu_item_call label="�択��スクリプトを�コンパイル"
-                     name="Recompile Scripts in Selection">
-                        <menu_item_call label="モノ" name="Mono" />
-                        <menu_item_call label="LSL" name="LSL" />
-                </menu_item_call>
-                <menu_item_call label="�択��スクリプトをリセット"
-                     name="Reset Scripts in Selection" />
-                <menu_item_call label="�択��スクリプトを起動�る"
-                     name="Set Scripts to Running in Selection" />
-                <menu_item_call label="�択��スクリプトを起動���"
-                     name="Set Scripts to Not Running in Selection" />
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="自分�オブジェクト���択" name="Select Only My Objects"/>
+                <menu_item_check label="移動�能�オブジェクト���択" name="Select Only Movable Objects"/>
+                <menu_item_check label="環境��択" name="Select By Surrounding"/>
+                <menu_item_check label="隠れ��置��択も表示" name="Show Hidden Selection"/>
+                <menu_item_check label="�択��も��光�範囲を表示" name="Show Light Radius for Selection"/>
+                <menu_item_check label="�択ビームを表示" name="Show Selection Beam"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="グリッド�スナップ" name="Snap to Grid"/>
+                <menu_item_call label="オブジェクト�XY移動をグリッド����る" name="Snap Object XY to Grid"/>
+                <menu_item_call label="グリッド用�[�択]を使用" name="Use Selection for Grid"/>
+                <menu_item_call label="グリッド�オプション..." name="Grid Options..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="リンク�れ�一部を編集" name="Edit Linked Parts"/>
+                <menu_item_call label="リンク" name="Link"/>
+                <menu_item_call label="リンク解除" name="Unlink"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="�択対象�視点移動" name="Focus on Selection"/>
+                <menu_item_call label="�択範囲�ズームイン" name="Zoom to Selection"/>
+                <menu_item_call label="オブジェクトを購入" name="Menu Object Take"/>
+                <menu_item_call label="コピーを�る" name="Take Copy"/>
+                <menu_item_call label="オブジェクトを��物�戻���存" name="Save Object Back to My Inventory"/>
+                <menu_item_call label="オブジェクトをオブジェクト・コンテンツ�戻���存" name="Save Object Back to Object Contents"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="スクリプト警告�エラー・ウィンドウを表示" name="Show Script Warning/Error Window"/>
+                <menu label="�択��（オブジェクト�中�）スクリプトを�コンパイル" name="Recompile Scripts in Selection">
+                        <menu_item_call label="Mono" name="Mono"/>
+                        <menu_item_call label="LSL" name="LSL"/>
+                </menu>
+                <menu_item_call label="�択��（オブジェクト�中�）スクリプトをリセット" name="Reset Scripts in Selection"/>
+                <menu_item_call label="�択��（オブジェクト�中�）スクリプトを起動�る" name="Set Scripts to Running in Selection"/>
+                <menu_item_call label="�択��（オブジェクト�中�）スクリプトを�止�る" name="Set Scripts to Not Running in Selection"/>
         </menu>
         <menu label="ヘルプ" name="Help">
-                <menu_item_call label="Second Life ヘルプ" name="Second Life Help" />
-                <menu_item_call label="インワールド・ヘルプ：" name="In-World Help" />
-                <menu_item_call label="追加ヘルプ" name="Additional Help" />
-                <menu_item_call label="�ュートリアル" name="Tutorial" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="オフィシャルLindenブログ..." name="Official Linden Blog..." />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="スクリプト・ガイド..." name="Scripting Guide..." />
-                <menu_item_call label="スクリプト・�ータル..." name="Scripting Portal..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="本日�メッセージ..." name="Message of the Day..." />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="嫌�ら��報告..." name="Report Abuse..." />
-                <menu_item_call label="���る�押���よ�当�る..."
-                     name="Bumps, Pushes &amp;amp; Hits..." />
-                <menu_item_call label="ラグ メーター" name="Lag Meter" />
-                <menu_item_separator label="-----------" name="separator7" />
+                <menu_item_call label="Second Life ヘルプ" name="Second Life Help"/>
+                <menu_item_call label="�ュートリアル" name="Tutorial"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Linden公�ブログ..." name="Official Linden Blog..."/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="スクリプト・�ータル..." name="Scripting Portal..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="嫌�ら��報告..." name="Report Abuse..."/>
+                <menu_item_call label="���記録..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="ラグ メーター" name="Lag Meter"/>
+                <menu_item_separator label="-----------" name="separator7"/>
                 <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_separator label="-----------" name="separator9" />
-                        <menu_item_call label="�グ�報告..." name="Report Bug..." />
+                        <menu_item_call label="パブリック�題トラッカー..." name="Public Issue Tracker..."/>
+                        <menu_item_call label="パブリック�題トラッカー ヘルプ..." name="Publc Issue Tracker Help..."/>
+                        <menu_item_separator label="-----------" name="separator7"/>
+                        <menu_item_call label="�グ�報告 101..." name="Bug Reporing 101..."/>
+                        <menu_item_call label="セキュリティ�題..." name="Security Issues...">
+                                <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/ja" />
+                        </menu_item_call>
+                        <menu_item_call label="�質�証関連Wiki..." name="QA Wiki..."/>
+                        <menu_item_separator label="-----------" name="separator9"/>
+                        <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" />
-                <menu_item_call label="Second Life����" name="About Second Life..." />
+                <menu_item_call label="Second Life����" name="About Second Life..."/>
         </menu>
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/ja/notify.xml b/linden/indra/newview/skins/default/xui/ja/notify.xml
index f53b6a7..f587868 100644
--- a/linden/indra/newview/skins/default/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
         <notify name="SystemMessageTip">
                 <message name="message">
@@ -74,7 +74,7 @@
         </notify>
         <notify name="InMaxGroups">
                 <message name="message">
-                        �������最大��数�グループ�属�����。 1��グループ�ら抜����新��グループを作る�������ん。
+                        ����所属��る最大数�グループ����属�����。 グループを�れ�1�抜����新��グループを作る�������ん。
                 </message>
         </notify>
         <notify name="GestureMissing">
@@ -148,9 +148,8 @@
         </notify>
         <notify name="IncompleteInventory">
                 <message name="message">
-                        �����供�るコンテンツ����場所����
-全部����ん。 少����ら�も�一度
-試������。
+                        �����供�るコンテンツ����場所����全部����ん。 
+少����らも�一度試������。
                 </message>
         </notify>
         <notify name="CannotModifyProtectedCategories">
@@ -165,12 +164,12 @@
         </notify>
         <notify name="OfferedCard">
                 <message name="message">
-                        ����[FIRST] [LAST]�コーリング・カードを贈り���。
+                        ����[FIRST] [LAST]�コーリング・カードを�り���。
                 </message>
         </notify>
         <notify name="OfferedFriendship">
                 <message name="message">
-                        ����[FIRST] [LAST]�フレンドシップを贈り���。
+                        ����[FIRST] [LAST]�フレンドシップを�り���。
                 </message>
         </notify>
         <notify name="UnableToBuyWhileDownloading">
@@ -342,15 +341,13 @@
         <notify name="OtherObjectsReturned">
                 <message name="message">
                         �択�れ��る土地�区画上����
- [FIRST] [LAST]�所有�るオブジェクト� 
-オーナー���物�返��れ���。
+ [FIRST] [LAST]�所有�るオブジェクト�オーナー���物�返��れ���。
                 </message>
         </notify>
         <notify name="OtherObjectsReturned2">
                 <message name="message">
                         �択�れ�土地�区画上��り��人�
-[NAME]�所有���オブジェクト�
-オーナー�返��れ���。
+[NAME]�所有���オブジェクト�オーナー�返��れ���。
                 </message>
         </notify>
         <notify name="GroupObjectsReturned">
@@ -379,8 +376,8 @@
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        ��土地�「llPushObjectを制����。
-土地所有者����り����他人をプッシュ�る�������ん。
+                        ��土地��「プッシング�止���。 
+土地所有者以外����他人をプッシュ�る�������ん。
                 </message>
         </notify>
         <notify name="VoiceAvailablity">
@@ -395,7 +392,7 @@
         </notify>
         <notify name="NoBuild">
                 <message name="message">
-                        ��土地�建造無効（「建造���）�設定�れ����。
+                        ��土地�オブジェクト�作��止�設定�れ����。
 ���オブジェクトを作る�������ん。
                 </message>
         </notify>
@@ -406,7 +403,7 @@
         </notify>
         <notify name="ScriptsNotRunning">
                 <message name="message">
-                        ��地域�スクリプトを1�も起動�����ん。
+                        ��地域��スクリプト�使用��止�れ����
                 </message>
         </notify>
         <notify name="NoOutsideScripts">
@@ -435,44 +432,44 @@
         </notify>
         <notify name="ObjectGiveItem">
                 <message name="message">
-                        [FIRST] [LAST]�所有���る[OBJECTFROMNAME]��付�られ�オブジェクト������[OBJECTNAME]���[OBJECTTYPE]を与����。
+                        [FIRST] [LAST]所有�[OBJECTFROMNAME]�ら�[OBJECTNAME]���[OBJECTTYPE]��られ�����。
                 </message>
                 <option name="Keep">
-                        維�
+                        ���る
                 </option>
                 <option name="Discard">
                         破棄
                 </option>
                 <option name="Mute">
-                        ミュート
+                        無視リスト�
                 </option>
         </notify>
         <notify name="ObjectGiveItemUnknownUser">
                 <message name="message">
-                        (未知�ユーザー) �所有���る[OBJECTFROMNAME]��付�られ�オブジェクト������[OBJECTNAME]���[OBJECTTYPE]を与����。
+                        (未知�ユーザー) 所有�[OBJECTFROMNAME]�ら�����[OBJECTNAME]���[OBJECTTYPE]��られ�����。
                 </message>
                 <option name="Keep">
-                        維�
+                        ���る
                 </option>
                 <option name="Discard">
                         破棄
                 </option>
                 <option name="Mute">
-                        ミュート
+                        無視リスト�
                 </option>
         </notify>
         <notify name="UserGiveItem">
                 <message name="message">
-                        [NAME]������[OBJECTNAME]������[OBJECTTYPE]を与����。
+                        [NAME]������[OBJECTNAME]������[OBJECTTYPE]を渡����。
                 </message>
                 <option name="Keep">
-                        維�
+                        ���る
                 </option>
                 <option name="Discard">
                         破棄
                 </option>
                 <option name="Mute">
-                        ミュート
+                        無視リスト�
                 </option>
         </notify>
         <notify name="GodMessage">
@@ -492,13 +489,12 @@
                         辞退
                 </option>
                 <option name="Info">
-                        インフォ
+                        情報
                 </option>
         </notify>
         <notify name="JoinGroupOfficerNoFee">
                 <message name="message">
-                        [NAME]�����をオフィサー
-���グループ�招待�����。
+                        [NAME]�����をオフィサー���グループ�招待�����。
 �加費用���り��ん。
  
 [MESSAGE]
@@ -510,14 +506,13 @@
                         辞退
                 </option>
                 <option name="Info">
-                        インフォ
+                        情報
                 </option>
         </notify>
         <notify name="JoinGroupMember">
                 <message name="message">
                         [NAME]�����を一般メン�ー���グループ�招待�����。
-グループ���加費用�L$[COST]
-��。
+グループ���加費用�L$[COST]��。
 [MESSAGE]
                 </message>
                 <option name="Join">
@@ -527,7 +522,7 @@
                         辞退
                 </option>
                 <option name="Info">
-                        インフォ
+                        情報
                 </option>
         </notify>
         <notify name="JoinGroupMemberNoFee">
@@ -544,13 +539,12 @@
                         辞退
                 </option>
                 <option name="Info">
-                        インフォ
+                        情報
                 </option>
         </notify>
         <notify name="OfferTeleport">
                 <message name="message">
-                        [NAME]����をテレ�ート
-�呼�寄�よ�������：
+                        [NAME]����をテレ�ート�呼�寄�よ�������：
  
 [MESSAGE]
                 </message>
@@ -575,7 +569,7 @@
         </notify>
         <notify name="OfferFriendship">
                 <message name="message">
-                        [NAME]��フレンドを贈�����。
+                        [NAME]��フレンド 登録を申�込ん����。
  
 [MESSAGE]
  
@@ -590,7 +584,7 @@
         </notify>
         <notify name="OfferFriendshipNoMessage">
                 <message name="message">
-                        [NAME]��フレンドシップを贈�����。
+                        [NAME]��フレンド 登録を申�込ん����。
 
 (デフォルト��互��オンライン・ステータスを見る�����るよ���り��。)
                 </message>
@@ -603,17 +597,17 @@
         </notify>
         <notify name="FriendshipAccepted">
                 <message name="message">
-                        [NAME]��フレンドシップを��入れ���。
+                        [NAME]��フレンド 登録を��入れ���。
                 </message>
         </notify>
         <notify name="FriendshipDeclined">
                 <message name="message">
-                        [NAME]��フレンドシップを断り���。
+                        [NAME]��フレンド 登録を断り���。
                 </message>
         </notify>
         <notify name="OfferCallingCard">
                 <message name="message">
-                        [FIRST] [LAST]�コーリング・カードを贈�����。
+                        [FIRST] [LAST]�コーリング・カードを��������。
 �れ�より�������物�ブックマーク�追加�れ�
 ���人���や�IM�る�������。
                 </message>
@@ -626,14 +620,14 @@
         </notify>
         <notify name="RegionRestartMinutes">
                 <message name="message">
-                        ��地域�[MINUTES]分後�リスタート�れ��。
-��地域�外�出����強制ログアウト��り��。
+                        ��地域�[MINUTES]分後��起動�れ��。
+強制ログアウト��り�������地域�外�出�����。
                 </message>
         </notify>
         <notify name="RegionRestartSeconds">
                 <message name="message">
-                        ��地域�[SECONDS]秒後�リスタート�れ��。
-��地域�外�出����強制ログアウト��り��。
+                        ��地域�[SECONDS]秒後��起動�れ��。
+強制ログアウト��り�������地域�外�出�����。
                 </message>
         </notify>
         <notify name="LoadWebPage">
@@ -699,7 +693,7 @@
         </notify>
         <notify name="AttachToYourAvatar">
                 <message name="message">
-                        ����ア�ター�添付
+                        ����ア�ター�装�
                 </message>
         </notify>
         <notify name="ReleaseOwnership">
@@ -746,7 +740,7 @@
                         ���
                 </option>
                 <option name="Mute">
-                        ミュート
+                        無視リスト�追加
                 </option>
         </notify>
         <notify name="ScriptQuestionCautionChatGranted">
@@ -769,7 +763,7 @@
                         &apos;[OBJECTNAME]&apos;�所有�るオブジェクト&apos;[NAME]&apos;��次���を求�����：
  
 [QUESTIONS]
-��オブジェクト�制作者を�����信用���場���リクエストを拒�������。追加情報��詳細ボタンをクリック������。
+��オブジェクト�制作者�信用����場���リクエストを拒�������。追加情報��詳細ボタンをクリック������。
 
 ��リクエストを許�����？
                 </message>
@@ -803,17 +797,15 @@
         </notify>
         <notify name="FirstBalanceIncrease">
                 <message name="message">
-                        今�L$[AMOUNT]を���り���。
-オブジェクト�他�ユーザー������金を払�
-�も�れ��ん。����残高�
-画���上�表示�れ����。
+                        L$[AMOUNT]を���り���。
+オブジェクト�よ�他�ユーザー������金を支払��よ���。
+����残高�画���上�表示�れ� ���。
                 </message>
         </notify>
         <notify name="FirstBalanceDecrease">
                 <message name="message">
-                        今�L$[AMOUNT]を支払����。
-����残高�画���上�
-表示�れ����。
+                        L$[AMOUNT]を支払����。
+����残高�画���上�表示�れ� ���。
                 </message>
         </notify>
         <notify name="FirstSit">
@@ -850,49 +842,47 @@
         <notify name="FirstTeleport">
                 <message name="message">
                         ��地域����イント間�テレ�ート���られ����ん���最も近�テレ�ブ周辺�移動����。 
-����目的地��大��ビーコン�標�れ����。赤�矢��続��進む�ビーコン�辿り����。
-矢�をクリック�る�ビーコンを消���
+����目的地��大��標識（ビーコン）�表示�れ����。赤�矢������進む�標識（ビーコン）�辿り����。
+矢�をクリック�る�標識（ビーコン）を消���
                 </message>
         </notify>
         <notify name="FirstOverrideKeys">
                 <message name="message">
                         ����移動キーをオブジェクト��作�����。  
 矢��AWSD�キー�動作を確�������。  
-銃���オブジェクト���マウスルック�移行�る必���り��。 
-Mキーを押��移行���。
+銃���オブジェクト���一人称視点（マウスルック）�変更�る必���り��。 
+Mキーを押��変更���。
                 </message>
         </notify>
         <notify name="FirstAppearance">
                 <message name="message">
                         ����容姿を編集中��。  
 回転�ズーム�る��矢�キーを使���。 
-編集�終���ら[全�を�存]をクリック��
-容姿を�存��終了���。  
+編集�終���ら[����存]をクリック��容姿を�存��終了���。  
 容姿�編集�何度�も行���。
                 </message>
         </notify>
         <notify name="FirstInventory">
                 <message name="message">
-                        �れ��オブジェクト�ノートカード�����他�所有物����入����物��。
-*オブジェクトや�装フォルダを装��る���マウス�ア�ター�ドラッグ���。
-*オブジェクトを世界���込む���地��上�ドラッグ���。
+                        �れ��オブジェクト�ノートカード�����他����所有物����入��「��物���。
+*マウス�ア�ター�オブジェクトや�装フォルダをドラッグ��装����。
+*オブジェクトを地��上�ドラッグ�る��周囲�世界�表示����。（Rez）
 *ノートカードを読む���ダブルクリック���。
                 </message>
         </notify>
         <notify name="FirstSandbox">
                 <message name="message">
                         ���サンドボックス��。
-�������作��オブジェクト�����
-立�去��後�削除�れる�も�れ��ん。サンドボックス�定期的�清掃�れ��。詳細������画�上部�地域��隣�情報を�照������。
+�������作��オブジェクト�����立�去��後�削除�れる�も�れ��ん。サンドボックス�定期的�清掃�れ��。詳細������画�上部�地域��隣�情報を�照������。
  
-サンドボックス�一般的����目��サイン�������。.
+サンドボックス�特別�エリア��目��サイン�������。
                 </message>
         </notify>
         <notify name="FirstFlexible">
                 <message name="message">
                         ��オブジェクト� フレキシブル��。 
-フレキシブル・�ェックボックス��ェック�外�れる����オブジェクト�
-物�的���ファントム���れ��り��ん。
+フレキシブル・�ェックボックス��ェック�外�れる����
+オブジェクト�物�的���ファントム���れ��り��ん。
                 </message>
         </notify>
         <notify name="FirstDebugMenus">
@@ -904,9 +894,9 @@ Mキーを押��移行���。
         </notify>
         <notify name="FirstSculptedPrim">
                 <message name="message">
-                        変形�れ�プリムを編集�����。  
-変形�れ�プリム��形状を指定�る���特別�テクス�ャー�必���。  
-��物ライブラリ��変形�れ�テクス�ャー�サンプルを�照����。
+                        スカルプトプリムを編集�����。  
+スカルプトプリム��形状を指定�る���特別�テクス�ャー�必���。  
+��物ライブラリ��スカルプトテクス�ャー�サンプルを�照����。
                 </message>
         </notify>
         <notify name="FirstMedia">
@@ -916,8 +906,7 @@ Mキーを押��移行���。
         </notify>
         <notify name="MaxListSelectMessage">
                 <message name="message">
-                        ��リスト�ら� [MAX_SELECT] 個���アイテムを
-�択����。
+                        ��リスト�ら� [MAX_SELECT] 個���アイテムを�択����。
                 </message>
         </notify>
         <notify name="VoiceInviteP2P">
@@ -937,17 +926,17 @@ Mキーを押��移行���。
         </notify>
         <notify name="AutoUnmuteByIM">
                 <message name="message">
-                        [FIRST] [LAST]�インスタント・メッセージ��信�れ�ミュート�自動的�解除�れ���。
+                        [FIRST] [LAST]�インスタント・メッセージ��信�れ� 無視設定�自動的�解除�れ���。
                 </message>
         </notify>
         <notify name="AutoUnmuteByMoney">
                 <message name="message">
-                        [FIRST] [LAST]��金�与�られ�ミュート�自動的�解除�れ���。
+                        [FIRST] [LAST]��金を渡����� 無視設定�自動的�解除�れ���。
                 </message>
         </notify>
         <notify name="AutoUnmuteByInventory">
                 <message name="message">
-                        [FIRST] [LAST]���物�与�られ�ミュート�自動的�解除�れ���。
+                        [FIRST] [LAST]���物を渡����� 無視設定�自動的�解除�れ���。
                 </message>
         </notify>
         <notify name="VoiceInviteGroup">
@@ -1062,7 +1051,7 @@ Mキーを押��移行���。
         </notify>
         <notify name="ServerVersionChanged">
                 <message name="message">
-                        入力��地域�異�るシミュレーター��ージョン�実行�れ����。 詳細�������メッセージをクリック������。
+                        到���地域�異�るシミュレーター��ージョン�実行�れ����。 詳細�������メッセージをクリック������。
                 </message>
         </notify>
         <notify name="UnableToOpenCommandURL">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_audio.xml
index 3b3227b..ceb667f 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_audio.xml
@@ -6,6 +6,6 @@
         <slider label="メディア" name="Media Volume" label_width="80" />
         <slider label="ボイス" name="Voice Volume" label_width="80" />
         <slider label="サウンド" name="SFX Volume" label_width="80" />
-        <slider label="アンビエント" name="Wind Volume" label_width="80" />
+        <slider label="風�音�" name="Wind Volume" label_width="80" />
         <slider label="UI" name="UI Volume" label_width="80" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index 04f802a..8b04d32 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -20,7 +20,7 @@
                                 Linden Lab従業員
                         </string>
                         <string name="PaymentInfoUsed">
-                                使用�る支払�情報
+                                支払�情報登録済
                         </string>
                         <string name="PaymentInfoOnFile">
                                 支払�情報登録済�
@@ -70,17 +70,17 @@
                         <text name="Give item:">
                                 �目を贈る：
                         </text>
-                        <text name="Give inventory" tool_tip="��人���物�目を与�る������ドロップ���">
+                        <text name="Give inventory" tool_tip="���物�目をドロップ����人�贈り��">
                                 ��物アイテムを���ドロップ���
                         </text>
                         <check_box label="検索�表示" name="allow_publish" tool_tip="検索��詳細やイメージ���ら�るプロフィール情報を公開�る。"/>
                         <button label="?" label_selected="?" name="?"/>
                         <button label="地図上�検索" label_selected="地図上�検索" name="Find on Map"/>
-                        <button label="テレ�ートを贈る..." label_selected="テレ�ートを贈る..." name="Offer Teleport..."/>
-                        <button label="フレンドを追加..." label_selected="フレンドを追加..." name="Add Friend..."/>
-                        <button label="支払�..." label_selected="支払�..." name="Pay..."/>
-                        <button label="インスタント・メッセージ..." label_selected="インスタント・メッセージ..." name="Instant Message..." tool_tip="インスタント メッセージ (IM)"/>
-                        <button label="ミュート" label_selected="ミュート" name="Mute"/>
+                        <button label="テレ�ートを贈る" label_selected="テレ�ートを贈る" name="Offer Teleport..."/>
+                        <button label="フレンドを追加" label_selected="フレンドを追加" name="Add Friend..."/>
+                        <button label="支払�" label_selected="支払�" name="Pay..."/>
+                        <button label="ｲ�ｽﾀ�ﾄ･ﾒｯｾｰｼﾞ" label_selected="ｲ�ｽﾀ�ﾄ･ﾒｯｾｰｼﾞ" name="Instant Message..." tool_tip="インスタント・メッセージ (IM)"/>
+                        <button label="無視�る" label_selected="無視�る" name="Mute"/>
                 </panel>
                 <panel label="ウェブ" name="WebProfile">
                         <flyout_button label="ロード" label_selected="ロード" name="load" tool_tip="プロファイル・ページを内蔵ブラウザー�ロード���。">
@@ -95,33 +95,33 @@
                         <check_box label="ウェブ・プロフィール自動ロード" name="auto_load" tool_tip="プロフィール��る����ウェブ・ページを確����自動的�ロード�る"/>
                 </panel>
                 <panel label="興味" name="Interests">
-                        <text name="I Want To:">
+                        <text name="I Want To:" width="74">
                                 �����：
                         </text>
-                        <check_box label="作��る" name="chk0"/>
-                        <check_box label="探検�る" name="chk1"/>
-                        <check_box label="会�" name="chk2"/>
-                        <check_box label="雇用�れる" name="chk6"/>
+                        <check_box label="作�" name="chk0"/>
+                        <check_box label="探検" name="chk1"/>
+                        <check_box label="出会�" name="chk2"/>
+                        <check_box label="就�" name="chk6"/>
                         <check_box label="グループ" name="chk3"/>
-                        <check_box label="購入�る" name="chk4"/>
-                        <check_box label="販売�る" name="chk5"/>
-                        <check_box label="雇用�る" name="chk7"/>
+                        <check_box label="購入" name="chk4"/>
+                        <check_box label="販売" name="chk5"/>
+                        <check_box label="雇用" name="chk7"/>
                         <text name="Skills:">
                                 スキル：
                         </text>
                         <check_box label="テクス�ャー" name="schk0"/>
-                        <check_box label="ｱｰｷﾃｸ�ｬ" name="schk1"/>
+                        <check_box label="アーキテク�ャ" name="schk1"/>
                         <check_box label="イベント計画" name="schk2"/>
                         <check_box label="モデル" name="schk3"/>
                         <check_box label="スクリプト" name="schk4"/>
-                        <check_box label="カスタム・キャラクター" name="schk5"/>
+                        <check_box label="キャラクター�カスタム" name="schk5"/>
                         <text name="Languages:">
                                 言語：
                         </text>
                 </panel>
                 <panel label="ピック" name="Picks">
                         <text name="Tell everyone about your favorite places in Second Life.">
-                                Second Life��気入り�場所を皆�話������
+                                Second Life��気入り�場所を皆�教������
                         </text>
                         <button label="新�..." label_selected="新�..." name="New..."/>
                         <button label="削除..." label_selected="削除..." name="Delete..."/>
@@ -156,10 +156,9 @@
                                 ロード中．．．
                         </string>
                         <text name="label">
-                                ��スペース����人物�関�るメモを記録���。  進行中��引�
-共�プロジェクト��を記録。メモを見る�����る��
-�������。  本人を���他�人��メモを見る�������ん。
-                        </text>
+                                ��スペース���進行中��引�共�プロジェクト����人物�関
+�るメモを記録������。 本人を���他人��見る������
+��������メモ帳��。</text>
                 </panel>
         </tab_container>
         <button label="OK" label_selected="OK" name="OK"/>
@@ -170,8 +169,7 @@
         <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="���人�カスタマー・サービス・ツールを開���。"/>
         <string name="ShowOnMapNonFriend">
                 地図上�ロケーションを表示���。
-����相手�フレンドシップを交���������
-表示����ん。
+相手�フレンドシップを交���������表示����ん。
         </string>
         <string name="ShowOnMapFriendOffline">
                 地図上�ロケーションを表示���。
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml
index cb1d103..1296f65 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_chat_bar.xml
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
         <panel/>
         <button label="周辺�ャット" name="History" tool_tip="�去�発言を表示�る�����をクリック"/>
-        <line_editor width="95" label="�ャットを開始�る�����をクリック���。" name="Chat Editor" tool_tip="話���Enterを押������Ctrl＋Enterを押���。"/>
-        <flyout_button left_delta="100" label="発言" name="Say" tool_tip="(Enter)">
+        <line_editor label="�ャットを開始�る�����をクリック���。" name="Chat Editor" tool_tip="話���Enterを押������Ctrl＋Enterを押���。" width="95"/>
+        <flyout_button label="発言" left_delta="100" name="Say" tool_tip="(Enter)">
+                <flyout_button_item name="shout_item">
+                        ��
+                </flyout_button_item>
                 <flyout_button_item name="say_item">
                         発言
                 </flyout_button_item>
-                <flyout_button_item name="shout_item">
-                        ��
+                <flyout_button_item name="whisper_item">
+                        ��や�
                 </flyout_button_item>
         </flyout_button>
-        <combo_box width="100" label="ジェス�ャー" name="Gesture"/>
+        <combo_box label="ジェス�ャー" name="Gesture" width="100"/>
         <string name="gesture_label">
                 ジェス�ャー
         </string>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_classified.xml b/linden/indra/newview/skins/default/xui/ja/panel_classified.xml
index 22113f7..385ed96 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_classified.xml
@@ -8,7 +8,7 @@
         <button label="テレ�ート" name="classified_teleport_btn" />
         <button label="地図上�表示" name="classified_map_btn" />
         <button label="プロフィール" name="classified_profile_btn" />
-        <check_box label="�人" name="classified_mature_check">
+        <check_box label="�人" name="classified_mature_check"  width="160">
                 <combo_item name="select_mature">
                         -�熟度を�択-
                 </combo_item>
@@ -25,7 +25,7 @@
                 広告掲載： [DATE]�L$[AMT] 支払�済�
         </string>
         <text name="update_txt">
-                アップデート
+                æ›´æ–°
         </text>
         <text name="publish_txt">
                 公開．．．
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_event.xml b/linden/indra/newview/skins/default/xui/ja/panel_event.xml
index 3132024..889e1da 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_event.xml
@@ -7,7 +7,7 @@
                 （��）
         </text>
         <text name="event_category_label">
-                入力�る:
+                タイプ:
         </text>
         <text name="event_category" left="150">
                 （��）
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml
index bed2bed..db81e18 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_general.xml
@@ -1,21 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_tab">
-        <text name="help_text">
+        <string name="help_text">
                 [一般]タブ�����グループ�関�る
 一般情報�オーナー�表示�能�メン�ー�リスト 
 一般的�[グループ環境設定]�メン�ー�オプション���れ��。
 
 オプション�上�マウスカーソルを動����ヘルプ情報を得られ��。
-        </text>
+        </string>
         <string name="group_info_unchanged">
                 グループ設定�変更�れ���。
         </string>
-        <button label="?" label_selected="?" name="help_button" />
-        <line_editor label="����新��グループ�を記入������"
-             name="group_name_editor">
-                新��グループ�を���入力������。
-        </line_editor>
-        <text name="group_name">
+        <button label="?" label_selected="?" name="help_button"/>
+        <line_editor label="新��グループ�を���入力������。" name="group_name_editor" width="330"/>
+        <text name="group_name" width="330">
                 新��グループ�を���入力������。
         </text>
         <text name="prepend_founded_by">
@@ -25,62 +22,34 @@
                 （待機中）
         </text>
         <text name="group_charter_label">
-                グループ特権
+                グループ�念
         </text>
-        <texture_picker label="グループ記章" name="insignia"
-             tool_tip="写真をクリック���択" />
+        <texture_picker label="グループ記章" name="insignia" tool_tip="写真をクリック���択"/>
         <text_editor name="charter">
-                グループ特権
+                グループ��念�指�を記入������
         </text_editor>
-        <button label="�加�る（L$0）" label_selected="�加�る（L$0）"
-             name="join_button" />
-        <button label="詳細表示" label_selected="詳細表示" name="info_button" />
-        <text>
-                オーナー��視メン�ー
-        </text>
-        <text>
-                （オーナー�太字）
-        </text>
+        <button label="�加�る（L$0）" label_selected="�加�る（L$0）" name="join_button"/>
+        <button label="詳細表示" label_selected="詳細表示" name="info_button"/>
         <text name="text_owners_and_visible_members">
-                オーナー��視メン�ー
+                オーナー�公開メン�ー
         </text>
         <text name="text_owners_are_shown_in_bold">
                 （オーナー�太字�表示�れ����）
         </text>
         <name_list name="visible_members">
-                <column label="Member Name" name="name" />
-                <column label="Title" name="title" />
-                <column label="Last Login" name="online" />
+                <column label="メン�ー�" name="name"/>
+                <column label="タイトル" name="title"/>
+                <column label="最終ログイン" name="online"/>
         </name_list>
         <text name="text_group_preferences">
                 グループ環境設定
         </text>
-        <text name="incomplete_member_data_str">
-                メン�ー・データを検索
-        </text>
-        <text name="confirm_group_create_str">
-                ��グループ�作���L$100��り��。 
-��グループ�作��L$100も��金を���も�����ん�？ 慎��判断������。
-48 時間以内�誰も��グループ��加�����場��グループ�解体�れ�グループ����今後使用�����り��。
-        </text>
-        <text>
-                グループ�環境設定
-        </text>
         <panel name="preferences_container">
-                <check_box label="検索�表示" name="show_in_group_list"
-                     tool_tip="検索�果����グループを人�見�る" />
-                <check_box label="ウェブ上�公開" name="publish_on_web"
-                     tool_tip="��グループ�情報をウェブ上�公開��るよ���る����を指定���。" />
-                <check_box label="会員募集" name="open_enrollement"
-                     tool_tip="��グループ�招待状���新��メン�ーを��入れる����を指定���。" />
-                <check_box label="入会費：L$" name="check_enrollment_fee"
-                     tool_tip="��グループ���加�入会費を必須��る����を指定���。" />
-                <spinner name="spin_enrollment_fee"
-                     tool_tip="「入会費���ェック�れ��る場��新�会員�入会時���費用を支払�必���り��。" />
-                <check_box label="�人��グループ" name="mature"
-                     tool_tip="����グループ情報��人������れる����を指定���。" />
-                <combo_box name="group_mature_check"
-                     tool_tip="����グループ情報��人������れる����を指定���。">
+                <check_box label="検索�表示" name="show_in_group_list" tool_tip="��グループを検索�果�表示����"/>
+                <check_box label="会員募集" name="open_enrollement" tool_tip="招待状���自由���グループ�加入�る��を許��る����を指定���"/>
+                <check_box label="入会費：L$" name="check_enrollment_fee" tool_tip="��グループ���加�入会費を必須��る����を指定���"/>
+                <spinner name="spin_enrollment_fee" tool_tip="「入会費���ェック�れ��る場��新�会員�入会時����指定�れ�金�を支払�必���り��"/>
+                <combo_box name="group_mature_check" tool_tip="����グループ情報��人������れる����を指定���">
                         <combo_item name="select_mature">
                                 -�熟度を�択-
                         </combo_item>
@@ -95,13 +64,17 @@
                         <text name="active_title_label">
                                 ��アクティブ・タイトル
                         </text>
-                        <combo_box name="active_title"
-                             tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
+                        <combo_box name="active_title" tool_tip="��グループをアクティブ設定���際ア�ター��ームタグ�表示�れるタイトル�設定"/>
                 </panel>
-                <check_box label="グループ通知を�信" name="receive_notices"
-                     tool_tip="グループ�ら�通知を�����信�る����を指定���。 ��グループ�スパム行為を���る場�����ボックス��ェックを外������。" />
-                <check_box label="ﾌﾟﾛﾌｨｰﾙ�ｸﾞﾙｰﾌﾟをﾘｽﾄ�る"
-                     name="list_groups_in_profile"
-                     tool_tip="��グループを����プロフィール�リスト�る����を設定���。" />
+                <check_box label="グループ通知を�信" name="receive_notices" tool_tip="グループ�ら�通知を�信�る����を指定���。 ��グループ�スパム行為を���る場�����ボックス��ェックを外������"/>
+                <check_box label="ﾌﾟﾛﾌｨｰﾙ�ｸﾞﾙｰﾌﾟを表示" name="list_groups_in_profile" tool_tip="��グループを����プロフィール�表示�る����を設定���"/>
         </panel>
+        <string name="incomplete_member_data_str">
+                メン�ー・データを検索
+        </string>
+        <string name="confirm_group_create_str">
+                ��グループ�作���L$100��り��。 
+��グループ�作��L$100も��金を���も�����ん�？ 慎��判断������。
+48時間以内�誰も��グループ��加�����場��グループ�解体�れ�グループ����今後使用�����り��。
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
index 53ea61a..9331071 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_land_money.xml
@@ -1,19 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="土地�L$" name="land_money_tab">
-        <text name="help_text">
-                グループ所有�区画�資金�供�詳細�共�リスト�示�れ��。
- 土地利用��計��
-資金�供��計以下��る��警告�表示�れ��。
- プランニング�詳細�販売��タブ���
-グループ財政�関�る情報�表示�れ��。
-        </text>
-        <button label="?" name="help_button" />
-        <text name="cant_view_group_land_text">
+        <string name="help_text">
+                グループ所有�土地�貢献値�詳細�共�表示�れ��。土地利用��計�寄付����れ以下��る���警告�表示�れ��。「詳細��「販売�タブ�グループ�資金�関�る情報�表示�れ��。
+        </string>
+        <button label="?" name="help_button"/>
+        <string name="cant_view_group_land_text">
                 ����グループ所有�土地表示を許�れ����ん。
-        </text>
-        <text name="cant_view_group_accounting_text">
+        </string>
+        <string name="cant_view_group_accounting_text">
                 ����グループ�会計情報�表示を許�れ����ん。
-        </text>
+        </string>
         <string name="loading_txt">
                 ロード中．．．
         </string>
@@ -21,37 +17,33 @@
                 グループ��有地
         </text>
         <scroll_list name="group_parcel_list">
-                <column label="Parcel Name" name="name" />
-                <column label="Region" name="location" />
-                <column label="Area" name="area" />
-                <column label="" name="hidden" />
+                <column label="区画�" name="name"/>
+                <column label="地域（リージョン）" name="location"/>
+                <column label="��" name="area"/>
+                <column label="" name="hidden"/>
         </scroll_list>
-        <button label="地図上�表示" label_selected="地図上�表示"
-             name="map_button" />
+        <button label="地図上�表示" label_selected="地図上�表示" name="map_button"/>
         <text name="total_contributed_land_label">
                 寄付��：
         </text>
-        <text name="total_contributed_land_value">
-                ［AREA］平方メートル
+        <text name="total_contributed_land_value" width="150">
+                [AREA]平方メートル
         </text>
         <text name="total_land_in_use_label">
                 土地利用��計：
         </text>
-        <text name="total_land_in_use_value">
-                ［AREA］平方メートル
+        <text name="total_land_in_use_value" width="150">
+                [AREA]平方メートル
         </text>
         <text name="land_available_label">
                 利用��土地：
         </text>
-        <text name="land_available_value">
-                ［AREA］平方メートル
+        <text name="land_available_value" width="150">
+                [AREA]平方メートル
         </text>
         <text name="your_contribution_label">
                 ����貢献：
         </text>
-        <text name="your_contribution_max_value_append">
-                平方ﾒｰﾄﾙ
-        </text>
         <string name="land_contrib_error">
                 土地�出資設定を行��������ん���。
         </string>
@@ -65,28 +57,19 @@
                 グループL$
         </text>
         <tab_container name="group_money_tab_container">
-                <panel label="計画" name="group_money_planning_tab">
-                        <text_editor name="group_money_planning_text">
-                                計算中…
-                        </text_editor>
-                </panel>
                 <panel label="詳細" name="group_money_details_tab">
                         <text_editor name="group_money_details_text">
                                 計算中…
                         </text_editor>
-                        <button label="＜�" label_selected="＜�" name="earlier_details_button"
-                             tool_tip="時間を戻�" />
-                        <button label="���＞" label_selected="���＞" name="later_details_button"
-                             tool_tip="時間を進�る" />
+                        <button label="��週" label_selected="��週" name="earlier_details_button" tool_tip="��週�履歴"/>
+                        <button label="次�週" label_selected="次�週" name="later_details_button" tool_tip="次�週�履歴"/>
                 </panel>
                 <panel label="販売" name="group_money_sales_tab">
                         <text_editor name="group_money_sales_text">
                                 計算中…
                         </text_editor>
-                        <button label="＜�" label_selected="＜�" name="earlier_sales_button"
-                             tool_tip="時間を戻�" />
-                        <button label="���＞" label_selected="���＞" name="later_sales_button"
-                             tool_tip="時間を進�る" />
+                        <button label="��週" label_selected="��週" name="earlier_sales_button" tool_tip="��週�履歴"/>
+                        <button label="次�週" label_selected="次�週" name="later_sales_button" tool_tip="次�週�履歴"/>
                 </panel>
         </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index 2bdc45f..35b072a 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -1,45 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="通知" name="notices_tab">
-        <text name="help_text">
+        <string name="help_text">
                 通知機能を使���グループ内���や�情報を������。
 複数���先�メッセージを�信��る���
-必��応��アイテムをメッセージ�添付�る��も����。 通知��
-�信アビリティ��る役割�グループ・メン�ー����信�れ��。
- 通知をオフ��る���一般タブを使���。
-        </text>
-        <text name="no_notices_text">
+必��応��アイテムをメッセージ�添付�る��も����。 
+通知���信アビリティ��る役割�グループ・メン�ー����信�れ��。
+通知をオフ��る���一般タブを使���。
+        </string>
+        <string name="no_notices_text">
                 �去�通知��り��ん。
-        </text>
-        <button label="?" label_selected="?" name="help_button" />
+        </string>
+        <button label="?" label_selected="?" name="help_button"/>
         <text name="lbl">
                 グループ通知アーカイブ
         </text>
         <text name="lbl2">
-                通知��14日間�存�れ��。閲覧���通知をクリック������。
+                通知�14日間�存�れ��。閲覧���通知をクリック������。
 新��通知を�ェック�る���[更新]ボタンをクリック���。
 �����グループ�通知リスト�1日��り200通�制��れ��。
         </text>
         <scroll_list name="notice_list">
-                <column label="" name="icon" />
-                <column label="Subject" name="subject" />
-                <column label="From" name="from" />
-                <column label="Date" name="date" />
+                <column label="" name="icon"/>
+                <column label="件�" name="subject"/>
+                <column label="�り主" name="from"/>
+                <column label="日付" name="date"/>
         </scroll_list>
         <text name="notice_list_none_found">
                 何も見��り��ん���。
         </text>
-        <button label="新��通知を作�" label_selected="新��通知を作�"
-             name="create_new_notice" />
-        <button label="更新" label_selected="リスト更新" name="refresh_notices" />
+        <button label="新��通知を作�" label_selected="新��通知を作�" name="create_new_notice"/>
+        <button label="更新" label_selected="リスト更新" name="refresh_notices"/>
         <panel label="新��通知を作�" name="panel_create_new_notice">
                 <text name="lbl">
                         通知を作�
                 </text>
                 <text name="lbl2">
-                        通知を�る���件�を入力���。 ��物�アイテムを
-1����パ�ル�ドラッグ���通知�添付
-����。 添付��る���コピー�譲渡�能�アイテ
-ム��フォルダー��る�������ん。
+                        件�を入力��通知を�り��。
+��物�アイテムを1���パ�ル�ドラッグ���
+通知�添付�る�������。 添付��る��コピー�
+譲渡��能�アイテム��フォルダを�る�������ん。
                 </text>
                 <text name="lbl3">
                         件�：
@@ -50,11 +49,9 @@
                 <text name="lbl5">
                         添付：
                 </text>
-                <button label="添付物を削除" label_selected="添付物を削除"
-                     name="remove_attachment" />
-                <button label="通知を�信" label_selected="通知を�信" name="send_notice" />
-                <panel name="drop_target"
-                     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+                <button label="添付物を削除" label_selected="添付物を削除" name="remove_attachment"/>
+                <button label="通知を�信" label_selected="通知を�信" name="send_notice"/>
+                <panel name="drop_target" tool_tip="��物�らアイテムをメッセージ欄�ドラッグ������。通知�一緒��信�れ��。�信�る��コピー�譲渡��能�オブジェクト��る必���り��。"/>
         </panel>
         <panel label="�去�通知を表示" name="panel_view_past_notice">
                 <text name="lbl">
@@ -69,7 +66,6 @@
                 <text name="lbl4">
                         メッセージ：
                 </text>
-                <button label="添付物を開�" label_selected="添付物を開�"
-                     name="open_attachment" />
+                <button label="添付物を開�" label_selected="添付物を開�" name="open_attachment"/>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index 4640600..79f4e74 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="メン�ー�役割" name="roles_tab">
-        <text name="default_needs_apply_text">
+        <string name="default_needs_apply_text">
                 �在�サブタブ��未�用�変更��り��。
-        </text>
-        <text name="want_apply_text">
+        </string>
+        <string name="want_apply_text">
                 �れら�変更を�用����？
-        </text>
-        <text name="cant_delete_role">
-                「全員��「オーナー��特別�役割����削除����ん。
-        </text>
-        <button label="?" name="help_button" />
+        </string>
+        <button label="?" name="help_button"/>
         <panel name="members_header">
                 <text name="static">
                         メン�ー�役割
@@ -27,7 +24,7 @@
                         下��る役割を�択������。  役割����説明�メン�ー・タイトルを修正�る�������。
                 </text>
                 <text name="role_properties_not_modifiable">
-                        以下�役割を�択�､役割�ﾌﾟﾛﾊﾟﾃｨ､ﾒ�ﾊﾞｰ､�よ�許��れ�能力を確
+                        役割�を�択�る�､説明�メン�ー�能力を確��る�������。
                 </text>
                 <text name="role_actions_modifiable">
                         ����役割�能力を割り当�る��も����。
@@ -47,52 +44,52 @@
         </panel>
         <tab_container name="roles_tab_container">
                 <panel label="メン�ー" name="members_sub_tab" tool_tip="Members">
-                        <button label="検索" name="search_button" />
-                        <button label="全�を表示" name="show_all_button" />
+                        <button label="検索" name="search_button"/>
+                        <button label="全�を表示" name="show_all_button"/>
                         <name_list name="member_list">
-                                <column label="メン�ー�" name="name" />
-                                <column label="Donated Tier" name="donated" />
-                                <column label="�回�ログイン" name="online" />
+                                <column label="メン�ー�" name="name"/>
+                                <column label="寄付�れ�Tier" name="donated"/>
+                                <column label="最終ログイン" name="online"/>
                         </name_list>
-                        <button label="新��人を招待..." name="member_invite" />
-                        <button label="グループ�ら追放" name="member_eject" />
-                        <text name="help_text">
+                        <button label="新��人を招待..." name="member_invite"/>
+                        <button label="グループ�ら追放" name="member_eject"/>
+                        <string name="help_text">
                                 ����メン�ー�割り当�られ�役割を付加�削除����。
 Ctrl キーを押���らメン�ー�をクリック�る�
 複数�人を�択����。
-                        </text>
+                        </string>
                 </panel>
                 <panel label="役割" name="roles_sub_tab">
-                        <button label="検索" name="search_button" />
-                        <button label="���を表示" name="show_all_button" />
+                        <button label="検索" name="search_button"/>
+                        <button label="���を表示" name="show_all_button"/>
                         <scroll_list name="role_list">
-                                <column label="役割�" name="name" />
-                                <column label="Title" name="title" />
-                                <column label="メン�ー" name="members" />
+                                <column label="役割�" name="name"/>
+                                <column label="肩書�" name="title"/>
+                                <column label="メン�ー" name="members"/>
                         </scroll_list>
-                        <button label="新��役割を作�..." name="role_create" />
-                        <button label="役割を削除" name="role_delete" />
-                        <text name="help_text">
+                        <button label="新��役割を作�..." name="role_create"/>
+                        <button label="役割を削除" name="role_delete"/>
+                        <string name="help_text">
                                 役割��タイトル��り�メン�ー�行使�能�
 能力�リスト�定義�れ��。 メン�ー��
 1����複数�役割�属�る�������。 1��グループ�対��
 「全員��「オーナー��役割を���最高�10�役割を���る�������。
-                        </text>
+                        </string>
                         <string name="cant_delete_role">
                                 「全員��「オーナー��特別�役割����削除����ん。
                         </string>
                 </panel>
                 <panel label="能力" name="actions_sub_tab">
-                        <button label="検索" name="search_button" />
-                        <button label="���を表示" name="show_all_button" />
+                        <button label="検索" name="search_button"/>
+                        <button label="���を表示" name="show_all_button"/>
                         <scroll_list name="action_list" tool_tip="能力を�択��詳細を表示���。">
-                                <column label="" name="icon" />
-                                <column label="" name="action" />
+                                <column label="" name="icon"/>
+                                <column label="" name="action"/>
                         </scroll_list>
-                        <text name="help_text">
+                        <string name="help_text">
                                 ��グループ内�役割を与�られ��るメン�ー�実行��る�作��
 能力�よ��決�り��。 �����能力�用��れ����。
-                        </text>
+                        </string>
                 </panel>
         </tab_container>
         <panel name="members_footer">
@@ -103,13 +100,12 @@ Ctrl キーを押���らメン�ー�をクリック�る�
                         許��れ�能力
                 </text>
                 <scroll_list name="member_assigned_roles">
-                        <column label="" name="checkbox" />
-                        <column label="" name="role" />
+                        <column label="" name="checkbox"/>
+                        <column label="" name="role"/>
                 </scroll_list>
-                <scroll_list name="member_allowed_actions"
-                     tool_tip="許��れ�能力�詳細�「能力�タブを�覧����。">
-                        <column label="" name="icon" />
-                        <column label="" name="action" />
+                <scroll_list name="member_allowed_actions" tool_tip="許��れ�能力�詳細�「能力�タブを�覧����。">
+                        <column label="" name="icon"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="roles_footer">
@@ -134,17 +130,14 @@ Ctrl キーを押���らメン�ー�をクリック�る�
                 <text name="static4">
                         割当られ�メン�ー
                 </text>
-                <text name="static5"
-                     tool_tip="�在�択�れ��る役割�実行��る能力�リスト">
+                <text name="static5" tool_tip="�在�択�れ��る役割�実行��る能力�リスト">
                         許��れ�能力
                 </text>
-                <check_box label="メン�ー��視状態" name="role_visible_in_list"
-                     tool_tip="��役割�メン�ーをグループ外�人�一般タブ�表示�る����を設定���。" />
-                <scroll_list name="role_allowed_actions"
-                     tool_tip="許��れ�能力�詳細�「能力�タブを�覧����。">
-                        <column label="" name="icon" />
-                        <column label="" name="checkbox" />
-                        <column label="" name="action" />
+                <check_box label="メン�ー�公開状態" name="role_visible_in_list" tool_tip="��役割�メン�ーをグループ外�人�一般タブ�表示�る����を設定���。"/>
+                <scroll_list name="role_allowed_actions" tool_tip="許��れ�能力�詳細�「能力�タブを�覧����。">
+                        <column label="" name="icon"/>
+                        <column label="" name="checkbox"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="actions_footer">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 4a672c7..785fd86 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="groups">
         <text name="groupdesc">
-                �在アクティブ�グループ��太字�表示�れ����。
+                ｱｸﾃｨﾌﾞ�ｸﾞﾙｰﾌﾟ��太字�表示�れ����
         </text>
         <text name="groupcount">
-                ����[COUNT]グループ�所属����� (最大[MAX])。
+                ����[COUNT] ｸﾞﾙｰﾌﾟ�所属����� (最大[MAX])
         </text>
         <button label="IM/コール" name="IM"
              tool_tip="インスタントメッセージ・セッションを開�" />
-        <button label="インフォ" name="Info" />
+        <button label="情報" name="Info" />
         <button label="アクティブ" name="Activate" />
-        <button label="立�去る" name="Leave" />
+        <button label="抜�る" name="Leave" />
         <button label="作�..." name="Create" />
         <button label="検索..." name="Search..." />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_login.xml b/linden/indra/newview/skins/default/xui/ja/panel_login.xml
index fd97d5d..f90b012 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-        <text name="first_name_text">
+        <text name="first_name_text" left="20">
                 ファースト�ーム：
         </text>
-        <text name="last_name_text">
+        <line_editor left="20" name="first_name_edit" width="126" />
+        <text name="last_name_text" left="158">
                 ラスト�ーム：
         </text>
+        <line_editor left="158" name="last_name_edit" width="126" />
         <text name="password_text">
                 パスワード：
         </text>
-        <text name="start_location_text">
+        <text name="start_location_text" left="20" >
                 ログイン�置：
         </text>
-        <combo_box name="start_location_combo">
+        <combo_box name="start_location_combo" left_delta="92" width="172">
                 <combo_item name="MyHome">
                         自宅（ホーム）
                 </combo_item>
                 <combo_item name="MyLastLocation">
-                        最後�ロケーション
+                        最後�ログアウト��場所
                 </combo_item>
                 <combo_item name="Typeregionname">
-                        &lt;地域���入力&gt;
+                        &lt; 地域���入力 &gt;
                 </combo_item>
         </combo_box>
-        <check_box label="パスワードを記憶" name="remember_check"/>
+        <check_box label="パスワードを記憶" name="remember_check" left_delta="180"/>
         <text name="full_screen_text">
                 ログイン時��フルスクリーン表示��り��
         </text>
@@ -40,7 +42,7 @@
         <text name="channel_text">
                 [CHANNEL] [VERSION]
         </text>
-        <text name="forgot_password_text">
+        <text name="forgot_password_text" left="-230" width="220">
                 �����パスワードを�忘れ���?
         </text>
         <text name="forgot_password_url">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_place.xml b/linden/indra/newview/skins/default/xui/ja/panel_place.xml
index 7339a05..1fa0d02 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_place.xml
@@ -33,7 +33,7 @@
                 土地情報��利用���サー�ー�アップデート�必���。
         </text>
         <text name="server_error_text">
-                �在�所在地�����情報��在�利用����ん。時間を�����度�試������。
+                ��ロケーション�情報��在�利用����ん。時間を����度�試�����。
         </text>
         <text name="server_forbidden_text">
                 �在�所在地�����情報��アクセス制����利用����ん。区画所有者�許���る�����確�����。
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml b/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml
index 32e3520..1b5e6e0 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_place_small.xml
@@ -33,7 +33,7 @@
                 土地情報��利用���サー�ー�アップデート�必���。
         </text>
         <text name="server_error_text">
-                �在�所在地�����情報��在�利用����ん。時間を�����度�試������。
+                ��ロケーション�情報��在�利用����ん。時間を����度�試�����。
         </text>
         <text name="server_forbidden_text">
                 �在�所在地�����情報��アクセス制�����利用����ん。区画所有者�許���る�����確�����。
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
index dca2be9..9a8d175 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_audio.xml
@@ -39,7 +39,7 @@
         <slider label="�隔�因" name="Distance Factor" />
         <slider label="ロールオフ係数" name="Rolloff Factor" />
         <spinner label="L$変更基準点" name="L$ Change Threshold" />
-        <spinner label="�康変化基準点" name="Health Change Threshold" />
+        <spinner label="ヘルス変化基準点" name="Health Change Threshold" />
         <text type="string" length="1" name="doppler_effect_text">
                 オーディオ環境設定：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index 1ad08fb..e22aca4 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -3,7 +3,7 @@
         <text length="1" name="text_box" type="string">
                 �ャット�フォント：
         </text>
-        <radio_group name="chat font size">
+        <radio_group name="chat_font_size">
                 <radio_item length="1" name="radio" type="string">
                         å°�
                 </radio_item>
@@ -17,13 +17,13 @@
         <text length="1" name="text_box2" type="string">
                 �ャット・カラー：
         </text>
-        <color_swatch label="è²´æ–¹" name="user"/>
-        <color_swatch label="��他" name="agent"/>
+        <color_swatch label="è²´æ–¹" name="user" width="56"/>
+        <color_swatch label="��他" name="agent" left_delta="60"/>
         <color_swatch label="IM" name="im"/>
         <color_swatch label="ｼｽﾃﾑ" name="system"/>
         <color_swatch label="�ャット" name="users"/>
-        <color_swatch label="所有者" name="objects"/>
-        <color_swatch label="所有者" name="owner"/>
+        <color_swatch label="ｵﾌﾞｼﾞｪｸﾄ" name="objects" width="56"/>
+        <color_swatch label="所有者" name="owner" left_delta="60"/>
         <color_swatch label="�出�" name="background"/>
         <color_swatch label="URL" name="links"/>
         <text length="1" name="text_box3" type="string">
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index dabf9e8..4c00e9d 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -1,26 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="一般" name="general_panel">
-        <combo_box name="location_combobox">
-                <combo_item name="MyHome">
-                        自宅（ホーム）
-                </combo_item>
-                <combo_item name="MyLastLocation">
-                        最後�ロケーション
-                </combo_item>
-        </combo_box>
-        <check_box label="ログイン画��開始ロケーションを表示"
-             name="show_location_checkbox" />
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        ��
+        <radio_group name="default_start_location">
+                <radio_item name="MyHome" tool_tip="常�自宅（ホーム）�ログイン">
+                        自宅(ホーム)
                 </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        一時的�表示
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        ��も
+                <radio_item name="MyLastLocation" tool_tip="常�最後���場所�ログイン">
+                        最後�ログアウト��場所
                 </radio_item>
         </radio_group>
+        <check_box label="ログイン画��ログイン�置を表示" name="show_location_checkbox"/>
         <combo_box name="fade_out_combobox">
                 <combo_item name="Never">
                         ��
@@ -32,100 +20,95 @@
                         ��も
                 </combo_item>
         </combo_box>
-        <check_box label="画�上�自分���を隠�" name="show_my_name_checkbox" />
+        <check_box label="���ア�ター�" name="small_avatar_names_checkbox"/>
+        <check_box label="画�上�自分���を隠�" name="show_my_name_checkbox"/>
         <text name="group_titles_textbox">
                 グループ・タイトル：
         </text>
-        <check_box label="グループ・タイトルを����表示"
-             name="show_all_title_checkbox" />
-        <check_box label="自分�グループ・タイトルを隠�"
-             name="show_my_title_checkbox" />
-        <check_box label="���ア�ター�" name="small_avatar_names_checkbox" />
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="カラー・ピッカーをクリック��開�" />
+        <check_box label="グループ・タイトルを����表示" name="show_all_title_checkbox"/>
+        <check_box label="画�上�自分�グループ・タイトルを隠�" name="show_my_title_checkbox"/>
+        <color_swatch label="" name="effect_color_swatch" tool_tip="カラー・ピッカーをクリック��開�"/>
         <text name="UI Size:">
                 UI サイズ：
         </text>
-        <check_box label="解�度独立スケールを使用" name="ui_auto_scale" />
-        <spinner label="退席���時間：" name="afk_timeout_spinner" />
-        <check_box label="オンライン・フレンド通知を表示"
-             name="friends_online_notify_checkbox" />
-        <check_box label="ミニマップを回転" name="rotate_mini_map_checkbox" />
-        <check_box label="リンデン・ドル（L$）�支払�/���りを通知"
-             name="notify_money_change_checkbox" />
-        <check_box label="次回起動時グラフィックカード自動検出"
-             name="probe_hardware_checkbox"
-             tool_tip="Second Life�������ードウェア�基���������グラフィック設定を自動的�構����。  新���ードウェアをインストール��場���Second Life��度検出��るよ��������。" />
-        <check_box label="デフォルト・システム�カラー�択を使用"
-             name="use_system_color_picker_checkbox"
-             tool_tip="Second Life内蔵����デフォルト・システム�カラー�択を使用" />
-        <check_box label="オー�ーレイ・�ー�検索パ�ルを表示"
-             name="show_search_panel"
-             tool_tip="組�込��検索パ�ルを表示���。" />
-        <text type="string" length="1" name="start_location_textbox">
+        <check_box label="解�度独立スケールを使用" name="ui_auto_scale"/>
+        <spinner label="退席���時間：" name="afk_timeout_spinner"/>
+        <check_box label="ミニマップを回転" name="rotate_mini_map_checkbox"/>
+        <check_box label="リンデン・ドル（L$）�支払�/���りを通知" name="notify_money_change_checkbox"/>
+        <check_box label="デフォルト・システム�カラー�択を使用" name="use_system_color_picker_checkbox" tool_tip="Second Life内蔵����デフォルト・システム�カラー�択を使用"/>
+        <check_box label="オー�ーレイ・�ー�検索パ�ルを表示" name="show_search_panel" tool_tip="組�込��検索パ�ルを表示���。"/>
+        <text length="1" name="start_location_textbox" type="string">
                 ログイン�置：
         </text>
-        <text type="string" length="1" name="show_names_textbox">
+        <text length="1" name="show_names_textbox" type="string">
                 ��を表示：
         </text>
-        <text type="string" length="1" name="effects_color_textbox">
+        <text length="1" name="effects_color_textbox" type="string">
                 自分�効果�色：
         </text>
-        <text type="string" length="1" name="seconds_textbox">
+        <text length="1" name="seconds_textbox" type="string">
                 秒
         </text>
-        <text type="string" length="1" name="crash_report_textbox">
+        <text length="1" name="crash_report_textbox" type="string">
                 クラッシュ報告：
         </text>
-        <text type="string" length="1" name="language_textbox">
+        <text length="1" name="language_textbox" type="string">
                 言語：
         </text>
-        <text type="string" length="1" name="language_textbox2">
+        <text length="1" name="language_textbox2" type="string">
                 （�起動���映）
         </text>
-        <text name="region_name_prompt">
+        <string name="region_name_prompt">
                 &lt;地域���入力&gt;
-        </text>
+        </string>
         <combo_box name="crash_behavior_combobox">
-                <combo_item type="string" length="1" name="Askbeforesending">
+                <combo_item length="1" name="Askbeforesending" type="string">
                         �る��確��る
                 </combo_item>
-                <combo_item type="string" length="1" name="Alwayssend">
+                <combo_item length="1" name="Alwayssend" type="string">
                         常��信
                 </combo_item>
-                <combo_item type="string" length="1" name="Neversend">
+                <combo_item length="1" name="Neversend" type="string">
                         �信���
                 </combo_item>
         </combo_box>
         <combo_box name="language_combobox">
-                <combo_item type="string" length="1" name="System Default Language">
+                <combo_item length="1" name="System Default Language" type="string">
                         システム・デフォルト
                 </combo_item>
-                <combo_item type="string" length="1" name="English">
+                <combo_item length="1" name="English" type="string">
                         English (英語)
                 </combo_item>
-                <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語(中国語) – ベータ
+                <combo_item length="1" name="Danish" type="string">
+                        Dansk (デンマーク語) – ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="Deutsch(German)">
+                <combo_item length="1" name="Deutsch(German)" type="string">
                         Deutsch (ドイツ語) – ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="French">
+                <combo_item length="1" name="Spanish" type="string">
+                        Español (スペイン語) – ベータ
+                </combo_item>
+                <combo_item length="1" name="French" type="string">
                         Français (フランス語) – ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 – ベータ
+                <combo_item name="Hungarian">
+                        Magyar (�ンガリー語) - ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (韓国語) – ベータ
+                <combo_item name="Polish">
+                        Polski (�ーランド語) - ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="Portugese">
+                <combo_item length="1" name="Portugese" type="string">
                         Português (�ルトガル語) – ベータ
                 </combo_item>
-                <combo_item type="string" length="1" name="Spanish">
-                        Español (スペイン語) – ベータ
+                <combo_item length="1" name="Chinese" type="string">
+                        中文 (简体) (中国語) - ベータ
+                </combo_item>
+                <combo_item length="1" name="(Japanese)" type="string">
+                        日本語 – ベータ
+                </combo_item>
+                <combo_item length="1" name="(Korean)" type="string">
+                        한국어 (韓国語) – ベータ
                 </combo_item>
         </combo_box>
-        <check_box label="言語をオブジェクト�共有" name="language_is_public"
-             tool_tip="優先言語をインワールド�オブジェクト��識�る" />
+        <check_box label="言語をオブジェクト�共有" name="language_is_public" tool_tip="優先言語をインワールド�オブジェクト��識�る"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index e7311d0..167bc2a 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -69,12 +69,12 @@
         </text>
         <check_box label="解�度�独スケールを使用" name="ui_auto_scale" />
         <spinner label="�画�離：" name="draw_distance" />
-        <check_box label="ア�ターをマウスルック�表示" name="avfp" />
+        <check_box label="ア�ターを一人称視点（マウスルック）�表示" name="avfp" />
         <text name="HigherText">
                 �質�よ�
         </text>
         <text name="QualityText">
-                実行：
+                パフォーマンス：
         </text>
         <text name="FasterText">
                 速�
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
index 551d862..16e11ab 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_im.xml
@@ -8,7 +8,7 @@
                 IMオプション：
         </text>
         <text name="log_in_to_change">
-                変更時�ログイン
+                ログイン��変更������
         </text>
         <check_box label="IMを電�メール（[EMAIL]）��信" name="send_im_to_email"/>
         <check_box label="ローカル�ャット�IMを��る" name="include_im_in_chat_history"/>
@@ -26,6 +26,7 @@
         <check_box label="タイムスタンプ�日付を加�る" name="log_date_timestamp"/>
         <button label="パス変更" label_selected="パス変更" name="log_path_button"/>
         <text length="1" name="text_box3" type="string">
-                ログインオプション：
+                �り込�中
+応答メッセージ：
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
index b24b01e..c84ae62 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_input.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="�作�カメラ" name="Input panel">
         <text name=" Mouselook Options:">
-                マウスルック：
+                一人称視点
+（マウスルック）：
         </text>
         <text name=" Mouse Sensitivity:">
                 感度：
         </text>
-        <check_box label="上下を�転" name="invert mouse"/>
+        <check_box label="上下を�転" name="invert_mouse"/>
         <text name=" Auto Fly Options:">
                 自動飛行オプション：
         </text>
-        <check_box label="上下矢�キー�長押��飛行��地" name="automatic fly"/>
+        <check_box label="上下矢�キー�長押��飛行��地" name="automatic_fly"/>
         <text name=" Camera Options:">
                 カメラ・オプション：
         </text>
@@ -23,15 +24,15 @@
         <text name="Camera Smoothing:">
                 カメラ・スムージング：
         </text>
-        <check_box label="編集カメラ�自動移動" name="edit camera movement" tool_tip="編集モード�開始�終了時�カメラ自動�置調整を使用"/>
-        <check_box label="容姿カメラ�自動移動" name="appearance camera movement" tool_tip="編集モード���カメラ自動�置調整を使用"/>
+        <check_box label="編集カメラ�自動移動" name="edit_camera_movement" tool_tip="編集モード�開始�終了時�カメラ自動�置調整を使用"/>
+        <check_box label="容姿カメラ�自動移動" name="appearance_camera_movement" tool_tip="編集モード���カメラ自動�置調整を使用"/>
         <text name="text2">
                 ア�ター表示：
         </text>
-        <check_box label="ア�ターをマウスルック�表示" name="avfp"/>
+        <check_box label="ア�ターを一人称視点（マウスルック）�表示" name="first_person_avatar_visible"/>
         <text name="text5">
                 ジョイスティック
 オプション：
         </text>
-        <button label="ジョイスティック設定" name="joystic_setup_button"/>
+        <button label="ジョイスティック設定" name="joystick_setup_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml
index 1c65481..729a1f8 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_network.xml
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="�ットワーク" name="network">
-        <text type="string" length="1" name="text_box">
+        <text length="1" name="text_box" type="string">
                 最大帯域幅：
         </text>
-        <text type="string" length="1" name="text_box2">
-                Kbps
+        <text length="1" name="text_box2" type="string">
+                kbps
         </text>
-        <text type="string" length="1" name="cache_size_label_l">
+        <text length="1" name="cache_size_label_l" type="string">
                 キャッシュ：
         </text>
-        <button label="クリア" name="clear_cache" />
-        <text type="string" length="1" name="cache_location_label">
+        <text name="text_box5">
+                MB
+        </text>
+        <button label="クリア" name="clear_cache"/>
+        <text length="1" name="cache_location_label" type="string">
                 キャッシュ�場所：
         </text>
-        <button label="設定" label_selected="設定" name="set_cache" />
-        <button label="ﾘｾｯﾄ" label_selected="設定" name="reset_cache" />
-        <check_box label="カスタム・�ート接続" name="connection_port_enabled" />
-        <spinner label="�ート番�：" name="connection_port" />
+        <button label="設定" label_selected="設定" name="set_cache"/>
+        <button label="ﾘｾｯﾄ" label_selected="設定" name="reset_cache"/>
+        <check_box label="カスタム・�ート接続" name="connection_port_enabled"/>
+        <spinner label="�ート番�：" name="connection_port"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
index 17305db..c5fde2c 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="ボイス�ャット" name="chat">
         <text_editor name="voice_unavailable">
                 ボイス�ャットを利用����ん
         </text_editor>
-        <check_box label="ボイス�ャットを有効��る" name="enable_voice_check" />
+        <check_box label="ボイス�ャットを有効��る" name="enable_voice_check"/>
         <radio_group name="ear_location">
                 <radio_item name="0">
                         カメラ��置�らボイス�ャットを��。
@@ -18,24 +18,20 @@
         <text_editor name="voice_chat_description">
                 メモ： 「機器�設定����「ボイス・�ャット�設定�を実行�る��一時的�ボイス・�ャット�ら切断�れ��。
         </text_editor>
-        <check_box label="プッシュ・トゥ・トークモード�ビュアーを起動"
-             name="push_to_talk_check" />
-        <check_box label="切り替�モード��プッシュ・トゥ・トークを使用"
-             name="push_to_talk_toggle_check" />
+        <check_box label="プッシュ・トゥ・トークモード�ビュアーを起動" name="push_to_talk_check"/>
+        <check_box label="切り替�モード��プッシュ・トゥ・トークを使用" name="push_to_talk_toggle_check"/>
         <text name="push_to_talk_label">
                 プッシュ・トゥ・トークトリガー：
         </text>
-        <button label="セットキー" name="set_voice_hotkey_button" />
-        <button label="ミドルマウスボタン" name="set_voice_middlemouse_button" />
+        <button label="キー設定" name="set_voice_hotkey_button"/>
+        <button label="ミドルマウスボタン" name="set_voice_middlemouse_button"/>
         <text name="privacy_heading">
                 プライ�シーオプション
         </text>
-        <check_box
-             label="自分�フレンドリスト��る人�ら���ボイスコールを��付�る"
-             name="voice_call_friends_only_check" />
+        <check_box label="自分�フレンドリスト��る人�ら���ボイスコールを��付�る" name="voice_call_friends_only_check"/>
         <text_editor name="device_settings_text">
-                注�：「機器�設定�を実行�る��一時的�ボイス・�ャット�ら切断�れ��。
+                注�：「機器�設定�を実行�る��一時的�ボイス・�ャット�ら切断�れ��。変更��座��用�れ��。
         </text_editor>
-        <button label="機器�設定" name="device_settings_btn" />
-        <button label="ボイス・�ャット�設定" name="launch_voice_wizard_button" />
+        <button label="機器�設定" name="device_settings_btn"/>
+        <button label="ボイス・�ャット�設定" name="launch_voice_wizard_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
index 94e3664..45ebcc6 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
@@ -3,17 +3,17 @@
         <radio_group name="use_external_browser">
                 <radio_item name="external"
                      tool_tip="ヘルプ�Webリンク�������外部Webブラウザを使用���。フル画��実行���る場���推奨����ん。">
-                        外部�ウェブ・ブラウザー (Firefox, Safari, Internet Explorer) を使用
+                        外部�ウェブ・ブラウザ (Firefox, Safari, Internet Explorer) を使用
                 </radio_item>
                 <radio_item name="internal"
                      tool_tip="ヘルプやWebリンク�埋�込�Webブラウザを使用���。ブラウザ�Second Life�新��ウィンドウ���開���。">
-                        内蔵�ウェブ・ブラウザーを使用
+                        内蔵�ウェブ・ブラウザを使用
                 </radio_item>
         </radio_group>
         <text name="cache_size_label_l">
                 キャッシュ：
         </text>
-        <button label="今��クリア" name="clear_cache" />
+        <button label="今��クリア" name="clear_cache" width="105" />
         <text name="cookie_label">
                 クッキー：
         </text>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index 5a3a334..4e6bae7 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="デ�ッグ" name="Debug">
         <text name="region_text_lbl">
                 地域：
@@ -6,44 +6,35 @@
         <text name="region_text">
                 未知
         </text>
-        <check_box label="スクリプト無効化" name="disable_scripts_check"
-             tool_tip="��地域�スクリプトを���無効化" />
-        <button label="?" name="disable_scripts_help" />
-        <check_box label="��を無効化" name="disable_collisions_check"
-             tool_tip="��地域��ア�ター��を無効化" />
-        <button label="?" name="disable_collisions_help" />
-        <check_box label="物�作用を無効化" name="disable_physics_check"
-             tool_tip="��地域�物�作用を���無効化" />
-        <button label="?" name="disable_physics_help" />
-        <button label="�用" name="apply_btn" />
+        <check_box label="スクリプト無効化" name="disable_scripts_check" tool_tip="��地域�スクリプトを���無効化"/>
+        <button label="?" name="disable_scripts_help"/>
+        <check_box label="��を無効化" name="disable_collisions_check" tool_tip="��地域��ア�ター��を無効化"/>
+        <button label="?" name="disable_collisions_help"/>
+        <check_box label="物�作用を無効化" name="disable_physics_check" tool_tip="��地域�物�作用を���無効化"/>
+        <button label="?" name="disable_physics_help"/>
+        <button label="�用" name="apply_btn"/>
+        <text name="objret_text_lbl" width="120" >
+                オブジェクト�返�
+        </text>
+        <text name="resident_text_lbl">
+                �人:
+        </text>
         <line_editor name="target_avatar_name">
                 (��)
         </line_editor>
-        <button label="�択..." name="choose_avatar_btn" />
-        <button
-             label="人�土地�ア�ター・スクリプト・オブジェクトを返�"
-             name="return_scripted_other_land_btn" />
-        <button label="ア�ター�スクリプト・オブジェクトを���返�"
-             name="return_scripted_all_btn" />
-        <check_box label="スクリプト��るオブジェクト��を返�"
-             name="return_scripts"
-             tool_tip="スクリプト��るオブジェクト��を返�" />
-        <check_box label="他人�土地��るオブジェクト��を返�"
-             name="return_other_land"
-             tool_tip="他人�属�る土地��るオブジェクト��を返�" />
-        <check_box label="���動産��地域�オブジェクトを返�"
-             name="return_estate_wide"
-             tool_tip="���動産���れ��る����地域�オブジェクトを返�" />
-        <button label="返�" name="return_btn" />
-        <button label="上部コライダー�得" name="top_colliders_btn"
-             tool_tip="���る�能性�最も高�オブジェクト�リスト" />
-        <button label="?" name="top_colliders_help" />
-        <button label="上部スクリプト�得" name="top_scripts_btn"
-             tool_tip="スクリプト�実行�最も時間を費や���るオブジェクト�リスト" />
-        <button label="?" name="top_scripts_help" />
-        <button label="地域�起動" name="restart_btn"
-             tool_tip="2分間�カウントダウン後�地域を�起動" />
-        <button label="?" name="restart_help" />
-        <button label="�起動を�延" name="cancel_restart_btn"
-             tool_tip="地域��起動を１時間�延�る" />
+        <button label="�択..." name="choose_avatar_btn"/>
+        <text name="options_text_lbl">
+                オプション:
+        </text>
+        <check_box label="スクリプト��るオブジェクト��を返�" name="return_scripts" tool_tip="スクリプト��るオブジェクト��を返�"/>
+        <check_box label="他人�土地��るオブジェクト��を返�" name="return_other_land" tool_tip="他人�属�る土地��るオブジェクト��を返�"/>
+        <check_box label="���動産��地域�オブジェクトを返�" name="return_estate_wide" tool_tip="���動産���れ��る����地域�オブジェクトを返�"/>
+        <button label="返�" name="return_btn"/>
+        <button label="上部コライダー�得" name="top_colliders_btn" tool_tip="���る�能性�最も高�オブジェクト�リスト"/>
+        <button label="?" name="top_colliders_help"/>
+        <button label="上部スクリプト�得" name="top_scripts_btn" tool_tip="スクリプト�実行�最も時間を費や���るオブジェクト�リスト"/>
+        <button label="?" name="top_scripts_help"/>
+        <button label="地域�起動" name="restart_btn" tool_tip="2分間�カウントダウン後�地域を�起動"/>
+        <button label="?" name="restart_help"/>
+        <button label="�起動を�延" name="cancel_restart_btn" tool_tip="地域��起動を１時間�延�る"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 26b3432..186820f 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="�動産" name="Estate">
         <text name="estate_help_text">
-                ��タブ�設定を変更�る����動産内�全��地域�影響を与���。
+                ��タブ�設定を変更�る����動産内
+�全��地域�影響を与���。
         </text>
         <text name="estate_text">
                 �動産：
@@ -19,7 +20,7 @@
                 次��アクセスを制�：
         </text>
         <check_box label="支払�情報登録済���人" name="limit_payment"
-             tool_tip="年齢未確���人を排除�る" />
+             tool_tip="支払�情報未登録��人を排除�る" />
         <check_box label="年齢確�済���人" name="limit_age_verified"
              tool_tip="年齢確�を済�������人を排除�る詳細������support.secondlife.comを�照������。" />
         <check_box label="ボイス�ャットを許�" name="voice_chat_check" />
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
index 0708c9c..a0e72b3 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_region_general.xml
@@ -3,20 +3,20 @@
         <text name="region_text_lbl">
                 地域：
         </text>
-        <text name="region_text">
+        <text name="region_text" left="90">
                 未知
         </text>
-        <text name="version_channel_text_lbl">
-                �ージョン:
+        <text name="version_channel_text_lbl" width="100">
+                �ージョン：
         </text>
-        <text name="version_channel_text">
+        <text name="version_channel_text" left="90">
                 �明
         </text>
         <check_box label="土地整備をブロック" name="block_terraform_check" />
         <button label="?" name="terraform_help" />
         <check_box label="飛行をブロック" name="block_fly_check" />
         <button label="?" name="fly_help" />
-        <check_box label="�害を許�" name="allow_damage_check" />
+        <check_box label="ダメージを許�" name="allow_damage_check" />
         <button label="?" name="damage_help" />
         <check_box label="プッシュを制�" name="restrict_pushobject" />
         <button label="?" name="restrict_pushobject_help" />
@@ -27,7 +27,7 @@
         <check_box label="土地�検索表示をブロック" name="block_parcel_search_check"
              tool_tip="検索�果����地域�区画を人�見�る" />
         <button label="?" name="parcel_search_help" />
-        <spinner label="人物�制�" name="agent_limit_spin" />
+        <spinner label="ア�ター数上�" name="agent_limit_spin" />
         <button label="?" name="agent_limit_help" />
         <spinner label="物体ボーナス" name="object_bonus_spin" />
         <button label="?" name="object_bonus_help" />
@@ -46,6 +46,6 @@
         <button label="�用" name="apply_btn" />
         <button label="ユーザー1人ホームテレ�ート" name="kick_btn" />
         <button label="ユーザー全員ホームテレ�ート" name="kick_all_btn" />
-        <button label="メッセージを領域��信..." name="im_btn" />
+        <button label="メッセージを地域��信..." name="im_btn" />
         <button label="テレ�ブ�管�..." name="manage_telehub_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index bfbb2c1..08c6618 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-        <text type="string" length="1" name="ParcelNameText"
-             tool_tip="����立���る土地区画���。 「土地情報�をクリック������。">
+        <text length="1" name="ParcelNameText" tool_tip="����立���る土地区画�� �。クリック�る�「土地情報��開���。" type="string">
                 区画������
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="�座残高">
+        <text length="1" name="BalanceText" tool_tip="�座残高" type="string">
                 ローディング．．．
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="貨幣�購入" />
-        <text type="string" length="12" name="TimeText" tool_tip="�在時刻（太平洋時）">
+        <button label="" label_selected="" name="buycurrency" tool_tip="貨幣�購入"/>
+        <text length="12" name="TimeText" tool_tip="�在時刻（太平洋時）" type="string">
                 12：00 AM
         </text>
         <text name="StatBarDaysOfWeek">
@@ -17,29 +16,27 @@
         <text name="StatBarMonthsOfYear">
                 1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
         </text>
-        <button label="" label_selected="" name="scriptout"
-             tool_tip="スクリプト警告�よ�エラー" />
-        <button label="" label_selected="" name="health" tool_tip="�康状態" />
-        <text type="string" length="1" name="HealthText" tool_tip="�康状態">
+        <button label="" label_selected="" name="scriptout" tool_tip="スクリプト警告�よ�エラー"/>
+        <button label="" label_selected="" name="health" tool_tip="�康状態"/>
+        <text length="1" name="HealthText" tool_tip="�康状態" type="string">
                 100%
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="飛行�止" />
-        <button label="" label_selected="" name="build" tool_tip="作��止" />
-        <button label="" label_selected="" name="scripts" tool_tip="スクリプト��" />
-        <button name="no_fly" tool_tip="飛行�止" />
-        <button name="no_build" tool_tip="制作/ＲＥＺ�止" />
-        <button name="no_scripts" tool_tip="スクリプト�止" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="llPushObject制�" />
-        <button name="status_voice" tool_tip="ボイス有効" />
-        <button name="status_no_voice"
-             tool_tip="����ボイスを使用����ん。" />
-        <button label="" label_selected="" name="buyland" tool_tip="��区画を購入" />
+        <button label="" label_selected="" name="fly" tool_tip="飛行�止"/>
+        <button label="" label_selected="" name="build" tool_tip="作��止"/>
+        <button label="" label_selected="" name="scripts" tool_tip="スクリプト��"/>
+        <button name="no_fly" tool_tip="飛行�止"/>
+        <button name="no_build" tool_tip="制作�Rez�止"/>
+        <button name="no_scripts" tool_tip="スクリプト�止"/>
+        <button label="" label_selected="" name="restrictpush" tool_tip="プッシングを制�"/>
+        <button name="status_voice" tool_tip="ボイス有効"/>
+        <button name="status_no_voice" tool_tip="����ボイスを使用����ん。"/>
+        <button label="" label_selected="" name="buyland" tool_tip="��区画を購入"/>
         <text name="packet_loss_tooltip">
                 パケット�失
         </text>
         <text name="bandwidth_tooltip">
                 帯域幅
         </text>
-        <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索" />
-        <button name="search_btn" tool_tip="Second Lifeを検索" />
+        <line_editor label="検索" name="search_editor" tool_tip="Second Lifeを検索"/>
+        <button name="search_btn" tool_tip="Second Lifeを検索"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml
index 56d0407..60536fc 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_toolbar.xml
@@ -5,24 +5,24 @@
         </string>
         <layout_stack name="toolbar_stack">
                 <button label="IM" name="im_btn"
-                     tool_tip="フレンド�インスタント・メッセージ" />
+                     tool_tip="�人�インスタント・メッセージ" />
                 <button label="コミュニケート" name="communicate_btn"
-                     tool_tip="フレンドやグループ�コミュケート。" />
+                     tool_tip="�人やグループ��交�" />
                 <button label="" name="chat_btn"
-                     tool_tip="�ャット・�ーを表示���。(Enter)" />
+                     tool_tip="�ャット・�ーを表示���(Enter)" />
                 <button label="フレンド" name="friends_btn"
-                     tool_tip="フレンドを探��会話�る" />
+                     tool_tip="�人を探��会話�る" />
                 <button label="飛行" label_selected="飛行を�止" name="fly_btn"
-                     tool_tip="飛行開始。 Eキー���PageUpキー�上昇�Cキー���PageDownキー�下�。" />
+                     tool_tip="飛行開始 Eキー���PageUpキー�上昇�Cキー���PageDownキー�下�" />
                 <button label="スナップショット" name="snapshot_btn"
-                     tool_tip="スクリーンショットをディスク�����物��存���。" />
+                     tool_tip="スクリーンショットをディスク�����物��存���" />
                 <button label="検索" name="directory_btn"
-                     tool_tip="場所�イベント�人��������対象を検索����。" />
-                <button label="建造" name="build_btn" tool_tip="オブジェクト新�作�" />
+                     tool_tip="場所�イベント�人��������対象を検索����" />
+                <button label="制作" name="build_btn" tool_tip="オブジェクト新�作�" />
                 <button label="ミニマップ" name="radar_btn"
-                     tool_tip="����周辺領域�地図。 （Ctrl＋Shift＋M）" />
-                <button label="地図" name="map_btn" tool_tip="世界地図。 （Ctrl＋M）" />
+                     tool_tip="����周辺領域�地図 （Ctrl＋Shift＋M）" />
+                <button label="地図" name="map_btn" tool_tip="世界地図 （Ctrl＋M）" />
                 <button label="��物" name="inventory_btn"
-                     tool_tip="����アイテム。 (Ctrl-I)" />
+                     tool_tip="����アイテム (Ctrl-I)" />
         </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ja/role_actions.xml b/linden/indra/newview/skins/default/xui/ja/role_actions.xml
index 2ad6607..57e6d62 100644
--- a/linden/indra/newview/skins/default/xui/ja/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/ja/role_actions.xml
@@ -39,11 +39,11 @@
                      name="role change actions" value="10" />
         </action_set>
         <action_set
-             description="�れら�能力���グループ�公開性や憲章�記章�変更�����グループ�アイデンティティを修正�る権����れ��。"
+             description="�れら�能力���グループ�公開性や�念�記章�変更�����グループ�アイデンティティを修正�る権����れ��。"
              name="Group Identity">
                 <action
-                     description="特権�記章�「Web上�公開���よ�グループ情報内��視�メン�ーを変更。"
-                     longdescription="特権�記章�「Web上�公開���よ�グループ情報内��視�メン�ーを変更���。 ���作���一般タブを使用���。"
+                     description="�念�記章�「Web上�公開���よ�グループ情報内�公開�メン�ーを変更。"
+                     longdescription="�念�記章�「Web上�公開���よ�グループ情報内�公開�メン�ーを変更���。 ���作���一般タブを使用���。"
                      name="group change identity" value="11" />
         </action_set>
         <action_set
diff --git a/linden/indra/newview/skins/default/xui/ja/strings.xml b/linden/indra/newview/skins/default/xui/ja/strings.xml
index 13cb67f..f81a238 100644
--- a/linden/indra/newview/skins/default/xui/ja/strings.xml
+++ b/linden/indra/newview/skins/default/xui/ja/strings.xml
@@ -435,9 +435,9 @@
         </string>
         <!-- Chat -->
         <string name="whisper">
-                ��や�:
+                ���や�:
         </string>
         <string name="shout">
-                ��:
+                ���:
         </string>
 </strings>
diff --git a/linden/indra/newview/skins/default/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 2f64bc2..938b6d2 100644
--- a/linden/indra/newview/skins/default/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
@@ -2099,6 +2099,9 @@ www.secondlife.com으로 �아가 신규 계정� 만드시겠습니까?
 
 [NAME]�게 친구 추가를 요청하시겠습니까?
                 </message>
+                <editline name="editline">
+                        저와 친구가 �시겠습니까?
+                </editline>
                 <option name="Offer">
                         제공
                 </option>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_about.xml b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
index bebb237..354d749 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="세컨드��프 정보">
         <text_editor name="credits_editor">
-                세컨드��프 제작�들: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, 그 외� 많� 분들� 수고해 주셨습니다.
+                세컨드��프 제작�들: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, 그 외� 많� 분들� 수고해 주셨습니다.
 
-  현재 버전� 최�� 버전� � 수 있�� �와주신 여러분께 �사드립니다: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+  현재 버전� 최�� 버전� � 수 있�� �와주신 여러분께 �사드립니다: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
   3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
   APR Copyright (C) 2000-2004 The Apache Software Foundation
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml b/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml
index 01b3072..0eb42ad 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about_land.xml
@@ -169,9 +169,6 @@
                         <text type="string" length="1" name="Simulator primitive usage:">
                                 시뮬레�터 프림 사용률:
                         </text>
-                        <text type="string" length="1" name="0 out of 0 available">
-                                14055개 중 0개(14055개 사용 가능)
-                        </text>
                         <text name="objects_available">
                                 [MAX] 중  [COUNT]   ([AVAILABLE] 사용 가능)
                         </text>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_mute.xml b/linden/indra/newview/skins/default/xui/ko/floater_mute.xml
index 6acc4ce..9dccb0e 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_mute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="주민 � 오브�트 차단">
+<floater name="mute floater" title="주민 � 오브�트 차단" short_title="차단 목�">
         <scroll_list name="mutes" tool_tip="현재 차단� 주민들" />
         <button label="차단할 주민" label_selected="차단할 주민"
              name="Mute resident..." tool_tip="차단할 주민 선�" />
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml
index fda53bc..1327873 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_preview_gesture.xml
@@ -30,12 +30,14 @@
         <text name="steps_label">
                 단계:
         </text>
+        <!-- Revert translations as interim fix to VWR-9985 while the code is not properly internationalized
         <scroll_list name="library_list">
                 애니메�션 
 사운드 
 채팅 
 대기
         </scroll_list>
+        -->
         <button label="추가 &gt;&gt;" name="add_btn"/>
         <button label="위로 ��" name="up_btn"/>
         <button label="아래로 ��" name="down_btn"/>
diff --git a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
index c48a850..5ce9981 100644
--- a/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/ko/menu_viewer.xml
@@ -144,8 +144,12 @@
                 <menu_item_call label="모든 애니메�션 중지" name="Stop All Animations" />
                 <menu_item_call label="키 해제" name="Release Keys" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="계정 기�" name="Account History..." />
-                <menu_item_call label="내 계정 관리" name="Manage My Account..." />
+                <menu_item_call label="계정 기�" name="Account History..." >
+                        <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=ko" />
+                </menu_item_call>
+                <menu_item_call label="내 계정 관리" name="Manage My Account..." >
+                        <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=ko" />
+                </menu_item_call>
                 <menu_item_call label="린든달러(L$) 구매" name="Buy and Sell L$..." />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="내 토지" name="My Land..." />
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml
index e94c428..1f9bdbc 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_chat.xml
@@ -3,7 +3,7 @@
         <text length="1" name="text_box" type="string">
                 글� �기:
         </text>
-        <radio_group name="chat font size">
+        <radio_group name="chat_font_size">
                 <radio_item length="1" name="radio" type="string">
                         소
                 </radio_item>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml
index b7283de..af8cfa7 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_general.xml
@@ -99,7 +99,7 @@
                         English (�어)
                 </combo_item>
                 <combo_item type="string" length="1" name="Chinese">
-                        汉语/漢語(중국어) - 베타
+                        中文 (简体) (중국어) - 베타
                 </combo_item>
                 <combo_item type="string" length="1" name="Deutsch(German)">
                         Deutsch (��어) - 베타
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml
index f391b2b..06edb21 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_preferences_input.xml
@@ -6,11 +6,11 @@
         <text name=" Mouse Sensitivity:">
                 마우스 민�성:
         </text>
-        <check_box label="마우스 반전" name="invert mouse"/>
+        <check_box label="마우스 반전" name="invert_mouse"/>
         <text name=" Auto Fly Options:">
                 �� 비행 옵션:
         </text>
-        <check_box label="PageUp/Down 키로 �착륙" name="automatic fly"/>
+        <check_box label="PageUp/Down 키로 �착륙" name="automatic_fly"/>
         <text name=" Camera Options:">
                 카메� 옵션:
         </text>
@@ -23,14 +23,14 @@
         <text name="Camera Smoothing:">
                 카메� 스무딩:
         </text>
-        <check_box label="��편집 카메� 설정" name="edit camera movement" tool_tip="편집 모드를 시작하거나 종료할 때 카메� �� 위치 설정 사용"/>
-        <check_box label="내 모습 변경시 카메� �� 설정" name="appearance camera movement" tool_tip="편집 모드� 때 카메� �� 위치 설정 사용"/>
+        <check_box label="��편집 카메� 설정" name="edit_camera_movement" tool_tip="편집 모드를 시작하거나 종료할 때 카메� �� 위치 설정 사용"/>
+        <check_box label="내 모습 변경시 카메� �� 설정" name="appearance_camera_movement" tool_tip="편집 모드� 때 카메� �� 위치 설정 사용"/>
         <text name="text2">
                 아바타 디스플레� 옵션:
         </text>
-        <check_box label="1�칭 시�으로 시작" name="avfp"/>
+        <check_box label="1�칭 시�으로 시작" name="first_person_avatar_visible"/>
         <text name="text5">
                 조�스틱 설정:
         </text>
-        <button label="조�스틱 설치" name="joystic_setup_button"/>
+        <button label="조�스틱 설치" name="joystick_setup_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/alerts.xml b/linden/indra/newview/skins/default/xui/pt/alerts.xml
index cd0db86..5ddeda0 100644
--- a/linden/indra/newview/skins/default/xui/pt/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/pt/alerts.xml
@@ -1,5 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <alerts>
+        <global name="skipnexttime">
+                Não exibir isso novamente
+        </global>
+        <global name="alwayschoose">
+                Sempre escolher essa opção
+        </global>
         <alert name="MissingAlert">
                 <message name="message">
                         [ALERT_NAME] não encontrado no alerts.xml
@@ -16,10 +22,13 @@
                         OK
                 </option>
         </alert>
-        <alert name="MOTD" title="Mensagem do dia">
+        <alert name="TutorialNotFound">
                 <message name="message">
-                        [MOTD]
+                        Nenhum tutorial está disponível no momento.
                 </message>
+                <option name="OK">
+                        OK
+                </option>
         </alert>
         <alert name="GenericAlert">
                 <message name="message">
@@ -44,7 +53,10 @@
         </alert>
         <alert name="ConnectTimeout">
                 <message name="message">
-                        Não foi possível conectar-se ao [SECOND_LIFE]. O sistema pode estar desativado. Por favor, tente novamente em alguns minutos, ou clique em Ajuda para mais informações e exibir a situação da página da web.
+                        Impossibilitado de se conectar ao [SECOND_LIFE].
+O sistema pode ter caído.
+
+Por favor, tente novamente em alguns minutos ou clique Ajuda para sugestões e um link para a página web de status do sistema.
                 </message>
                 <option name="OK">
                         OK
@@ -67,34 +79,6 @@
                         Cancelar
                 </option>
         </alert>
-        <alert name="RemoveWearableSave">
-                <message name="message">
-                        Salvar alterações de roupas/partes do corpo atuais?
-                </message>
-                <option name="Save">
-                        Salvar
-                </option>
-                <option name="Don&apos;tSave">
-                        Não Salvar
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-        </alert>
-        <alert name="SetWearableSave">
-                <message name="message">
-                        Salvar alterações de roupas/ partes do corpo atuais?
-                </message>
-                <option name="Save">
-                        Salvar
-                </option>
-                <option name="Don&apos;tSave">
-                        Não Salvar
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-        </alert>
         <alert name="CompileQueueSaveText">
                 <message name="message">
                         Houve um problema com o carregamento do texto para um script devido a seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
@@ -104,7 +88,6 @@
                 <message name="message">
                         Houve um problema durante o carregamento de um script compilado devido a seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
                 </message>
-
         </alert>
         <alert name="WriteAnimationFail">
                 <message name="message">
@@ -152,7 +135,20 @@
         </alert>
         <alert name="GrantModifyRights">
                 <message name="message">
-                        Permite que um outro residente modifique QUALQUER objeto que você tenha no Second Life. Seja muito cuidadoso quando lidar com essa permissão. Você deseja garantir os direitos de edição para  [FIRST_NAME] [LAST_NAME]?
+                        Conceder direitos de modificar a outros residentes lhes permite trocar, deletar ou pegar QUAISQUER objetos que você possa ter no mundo. Seja MUITO cuidadoso(a) quando passar esta permissão.
+Você deseja conceder direitos de modificar para [FIRST_NAME] [LAST_NAME]?
+                </message>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
+        <alert name="GrantModifyRightsMultiple">
+                <message name="message">
+                        Conceder direitos para modificar seus objetos a outro residente permite ele mudar QUAISQUER objetos que você possa ter no mundo. Tenha muito cuidado quando conceder essa permissão.
+Você deseja permitir que os residentes selecionados tenham direito de edição?
                 </message>
                 <option name="Yes">
                         Sim
@@ -172,6 +168,17 @@
                         Não
                 </option>
         </alert>
+        <alert name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        Você quer revogar direitos para modificar dos residentes selecionados?
+                </message>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
         <alert name="RemoveFriend">
                 <message name="message">
                         Você quer remover [FIRST] [LAST] dos seus amigos?
@@ -253,9 +260,6 @@
                 <message name="message">
                         Você está para adicionar membros do grupo a função de [ROLE_NAME]. Membros não podem ser removidos dessa função. Os membros devem sair por si mesmos. Deseja continuar?
                 </message>
-                <ignore>
-                        Quando adicionar membros do grupo a funçõa de Proprietário.
-                </ignore>
                 <ignore name="ignore">
                         Quando adcionar membro ao grupo como dono.
                 </ignore>
@@ -295,7 +299,16 @@
         </alert>
         <alert name="ClickPublishHelpLand">
                 <message name="message">
-                        Selecionar a opção &quot;Publicar na Web&quot; nos permitirá publicar o nome, descrição, imagens e localização deste terreno no website [SECOND_LIFE]. Você é responsável por indicar se algum dos conteúdos acima for considerado Adulto de acordo com as Regras da Comunidade.
+                        Selecionando &quot;Publicar na Busca&quot; 
+Clicando neste Box, será mostrado:
+- este terreno nos resultados de busca
+- os objetos públicos deste terreno
+- este terreno na busca da web
+                </message>
+        </alert>
+        <alert name="ClickPublishHelpLandDisabled">
+                <message name="message">
+                        Você não pode fazer essa parcela vista na Busca porque está localizada numa região que proíbe isso.
                 </message>
         </alert>
         <alert name="ClickPublishHelpPostcard">
@@ -305,12 +318,20 @@
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        Selecionar a opção &quot;Publicar na Web&quot; nos permitirá publicar seu nome, imagem e textos no website [SECOND_LIFE].
+                        Selecionando &quot;Mostrar na Busca&quot; será mostrado:
+- meu perfil nos resultados de busca
+- um link para meu perfil nas páginas de grupos públicos
                 </message>
         </alert>
         <alert name="ClickWebProfileHelpAvatar">
                 <message name="message">
-                        Se esse residente tem um perfil URL na web então você pode: *Clique em Carregar para carregar a página como um web browser encaixado. * Clique em Abrir para ver extrenamente no seu web browser padrão. Quando visualizar seu perfil você pode entrar com qualquer URL que especificar quando eles acessarem seu perfil.
+                        Se este Residente definiu uma URL de perfil na web, então você pode:
+ * Clicar em &apos;Carregar&apos; para ver a página na aba Web.
+ * Clicar Carregar &gt; &apos;Em navegador externo&apos; para ver a página no seu navegador de web padrão.
+ * Clicar Carregar &gt; &apos;URL de Casa&apos; para voltar ao perfil do Residente na web se você navegou adiante.
+ 
+Quando você está vendo seu próprio perfil, você pode entrar com qualquer URL como sendo seu perfil na web e clicar OK para defini-la.
+Outros residentes podem visitar a URL que você definiu, quando eles olharem seu perfil.
                 </message>
         </alert>
         <alert name="ClickWebProfileNoWebHelpAvatar">
@@ -378,7 +399,8 @@
         </alert>
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
-                        Unir-se a esse grupo custa L$[COST]. Você não tem fundos suficientes para se unir a esse grupo.
+                        Associar-se a este grupo custa L$[COST].
+Você não tem L$ suficientes para associar-se a este grupo.
                 </message>
         </alert>
         <alert name="LandBuyPass">
@@ -413,6 +435,20 @@
                         Cancelar
                 </option>
         </alert>
+        <alert name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+                        ATENÇÃO: Ao clicar em &apos;vender para qualquer um&apos; torna a sua terra disponível para toda a comunidade Second Life, mesmo aqueles que não estão nesta região.
+
+A área de [LAND_SIZE] m2 de terra selecionada está posta para venda.
+Seu preço de venda será L$ [SALE_PRICE] e está autorizado para [NAME].
+                </message>
+                <option name="Continue">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
+        </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
                         Você tem certeza de que quer retornar todos os objetos compartterrenodos com o grupo &apos;[NAME]&apos; neste lote para o inventário do seu antigo Proprietário? *AVISO* Isso irá apagar os objetos não transferíveis para o grupo! Objetos: [N]
@@ -467,7 +503,6 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ReturnAllTopObjects">
                 <message name="message">
@@ -479,7 +514,6 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="DisableAllTopObjects">
                 <message name="message">
@@ -491,7 +525,6 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ReturnObjectsNotOwnedByGroup">
                 <message name="message">
@@ -503,107 +536,98 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="UnableToDisableOutsideScripts">
                 <message name="message">
                         Não é possível desabilitar scripts externos. Toda esta região possui dano habilitado. Scripts devem ser permitidos para fazer as armas funcionarem.
                 </message>
-
         </alert>
         <alert name="MustBeInParcel">
                 <message name="message">
                         Você deve permanecer dentro do lote para o Landing Point.
                 </message>
-
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
                         Por favor, insira o endereço de e-mail do destinatário.
                 </message>
-
         </alert>
         <alert name="PromptSelfEmail">
                 <message name="message">
                         Por favor, insira seu endereço de e-mail.
                 </message>
-
+        </alert>
+        <alert name="PromptMissingSubjMsg">
+                <message name="message">
+                        Enviar por email uma foto instantânea com o assunto ou mensagem padrão?
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="ErrorProcessingSnapshot">
                 <message name="message">
                         Erro processando dados de imagem.
                 </message>
-
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
                         Erro encoding imagem!
                 </message>
-
         </alert>
         <alert name="ErrorUploadingPostcard">
                 <message name="message">
-                        Houve um problema ao carregar um cartão postal devido a seguinte razão: [REASON]
+                        Houve um problema ao enviar a foto instantânea devido à seguinte razão: [REASON]
                 </message>
-
         </alert>
         <alert name="ErrorUploadingReportScreenshot">
                 <message name="message">
                         Houve um problema ao carregar um reporte de imagem devido a seguinte razão: [REASON]
                 </message>
-
         </alert>
         <alert name="MustAgreeToLogIn">
                 <message name="message">
                         Você deve concordar com os Termos de Serviço para continuar a entrar no [SECOND_LIFE].
                 </message>
-
         </alert>
         <alert name="CouldNotPutOnOutfit">
                 <message name="message">
                         Não foi possível inserir no visual. A pasta visual não contém roupas, partes do corpo ou acessórios.
                 </message>
-
         </alert>
         <alert name="CannotWearTrash">
                 <message name="message">
                         Não é possível usar roupas ou partes do corpo que estão no lixo.
                 </message>
-
         </alert>
         <alert name="CannotWearInfoNotComplete">
                 <message name="message">
                         Não é possível usar um item uma vez que sua configuração ainda não esteja disponível. Por favor, tente novamente em um minuto.
                 </message>
-
-        </alert>
-        <alert name="MustHaveAccountToLogInNoLinks">
-                <message name="message">
-                        Você deve ter uma conta para conectar ao [SECOND_LIFE].
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-
         </alert>
         <alert name="MustHaveAccountToLogIn">
                 <message name="message">
-                        Você deve ter uma conta para conectar ao [SECOND_LIFE]. Ir ao www.secondlife.com para criar uma nova conta?
+                        Oops! Alguma coisa foi deixada em branco.
+Você precisa entrar com ambos os Nome e Sobrenome do seu avatar.
+
+Você precisa de uma conta para entrar no [SECOND_LIFE]. Você gostaria de criar uma conta agora?
                 </message>
                 <option name="OK">
-                        OK
+                        Criar uma nova conta
                 </option>
                 <option name="Cancel">
-                        Cancelar
+                        Tentar novamente
                 </option>
-
         </alert>
         <alert name="AddClassified">
                 <message name="message">
-                        Anúncios postados aparecem na seção &quot;Classificados&quot; do diretório de Busca por uma semana. Preencha seu formulário, então clique em &quot;Publicar&quot; para adicioná-lo ao diretório. Você receberá uma notificação de cobrança após clicar em Publicar. Pagar mais fará seu anúncio aparecer mais ao topo da lista e também quando as pessoas procurarem por palavras chave.
+                        Anúncios classificados aparecem na seção &apos;Classificados&apos; do diretório de Busca e no www.secondlife.com por uma semana.
+Preencha seu anúncio e então clique &apos;Publicar...&apos; para adicioná-lo ao diretório.
+Será solicitado a você um preço a ser pago, quando você clicar Publicar.
+Pagando mais, faz com que seu anúncio apareça em posição mais alta na lista e também em posição mais alta, quando as pessoas buscarem por palavras-chave.
                 </message>
                 <option name="OK">
                         OK
@@ -611,10 +635,9 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-                <ignore>
-                        Quando adicionar um anúncio
+                <ignore name="ignore">
+                        Quando adicionando um Classificado novo
                 </ignore>
-
         </alert>
         <alert name="DeleteClassified">
                 <message name="message">
@@ -626,7 +649,20 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
+        </alert>
+        <alert name="ClassifiedSave">
+                <message name="message">
+                        Salvar as mudanças no classificado [NAME]?
+                </message>
+                <option name="Save">
+                        Salvar
+                </option>
+                <option name="Don&apos;tSave">
+                        Não Salvar
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="DeleteAvatarPick">
                 <message name="message">
@@ -638,7 +674,6 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="DisplayChangeRestart">
                 <message name="message">
@@ -650,7 +685,6 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="PromptGoToEventsPage">
                 <message name="message">
@@ -662,35 +696,41 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="MustSelectCandidate">
                 <message name="message">
                         Você deve selecionar um candidato antes de votar.
                 </message>
-
         </alert>
         <alert name="SelectItemToView">
                 <message name="message">
                         Por favor, selecione um item para visualizar.
                 </message>
-
         </alert>
         <alert name="SelectProposalToView">
                 <message name="message">
                         Por favor, selecione uma proposta para votar.
                 </message>
-
         </alert>
         <alert name="SelectHistoryItemToView">
                 <message name="message">
                         Por favor, selecione o histórico de itens para exibí-lo.
                 </message>
-
         </alert>
         <alert name="ResetShowNextTimeDialogs">
                 <message name="message">
-                        Resetar tudo. Reset all &apos;Show next time&apos; dialogs?
+                        Você gostaria de reabilitar todas estas pop ups que você indicou previamente como &apos;Não me mostrar novamente&apos;? 
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
+        </alert>
+        <alert name="SkipShowNextTimeDialogs">
+                <message name="message">
+                        Você gostaria de desabilitar todas as popups que podem ser puladas?
                 </message>
                 <option name="OK">
                         OK
@@ -698,13 +738,11 @@
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="CacheWillClear">
                 <message name="message">
                         O cache será limpo uma vez resetada.
                 </message>
-
         </alert>
         <alert name="CacheWillBeMoved">
                 <message name="message">
@@ -717,6 +755,11 @@ Nota: Isto limpará o cache.
                         Configuração de porta terá efeito após reiniciar [SECOND_LIFE].
                 </message>
         </alert>
+        <alert name="ChangeSkin">
+                <message name="message">
+                        A nova pele será exibida após reiniciar [SECOND_LIFE].
+                </message>
+        </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
                         Ir para a página do [SECOND_LIFE] para ver os detalhes do leilão ou fazer um lance?
@@ -727,7 +770,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="SaveChanges">
                 <message name="message">
@@ -742,43 +784,36 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="GestureSaveFailedTooManySteps">
                 <message name="message">
                         Falha ao salvar Gesto. Este gesto possui muitos passos.Tente remover alguns passos e salve-o novamente.
                 </message>
-
         </alert>
         <alert name="GestureSaveFailedTryAgain">
                 <message name="message">
                         Falha ao salvar Gesto. Por favor, tente em uma minuto.Gesture save failed.
                 </message>
-
         </alert>
         <alert name="GestureSaveFailedObjectNotFound">
                 <message name="message">
                         Não foi possível salvar um Gesto pois o objeto ou o objeto associado ao inventário não foi encontrado. O objeto pode estar fora de alcance. Objeto pode estar fora de alcance ou estar deletado.
                 </message>
-
         </alert>
         <alert name="GestureSaveFailedReason">
                 <message name="message">
                         Houve um problema em salvar um gesto devido a seguinte razão: [REASON].  Por favor, tente salvar o Gesto depois.
                 </message>
-
         </alert>
         <alert name="SaveNotecardFailObjectNotFound">
                 <message name="message">
                         Não foi possível salvar uma nota pois o objeto ou o objeto associado ao inventário não pôde ser encontrado.
                 </message>
-
         </alert>
         <alert name="SaveNotecardFailReason">
                 <message name="message">
                         Houve um problema em salvar uma nota devido a seguinte razão: [REASON].  Por favor, tente re-salvar a nota mais tarde.
                 </message>
-
         </alert>
         <alert name="ScriptCannotUndo">
                 <message name="message">
@@ -790,55 +825,46 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="SaveScriptFailReason">
                 <message name="message">
                         Houve um problema em salvar um script devido a seguinte razão: [REASON].  Por favor, tente salvar novamente o script.
                 </message>
-
         </alert>
         <alert name="SaveScriptFailObjectNotFound">
                 <message name="message">
                         Não foi possível salvar o script pois o objeto ativo não pôde ser encontrado. O objeto pode estar fora de alcance ou ter sido deletado.
                 </message>
-
         </alert>
         <alert name="SaveBytecodeFailReason">
                 <message name="message">
                         Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON].  Por favor, tente salvar novamente o script.
                 </message>
-
         </alert>
         <alert name="CouldNotStartStopScript">
                 <message name="message">
                         Não foi possível iniciar o script pois o objeto ativo não pôde ser encontrado. O objeto pode estar fora de alcance ou ter sido deletado.
                 </message>
-
         </alert>
         <alert name="CannotDownloadFile">
                 <message name="message">
                         Não foi possível baixar o arquivo.
                 </message>
-
         </alert>
         <alert name="CannotWriteEncode">
                 <message name="message">
                         Não foi possível encoder o arquivo [[FILE]]
                 </message>
-
         </alert>
         <alert name="CannotWriteFile">
                 <message name="message">
                         Não foi possível escrever o arquivo [[FILE]]
                 </message>
-
         </alert>
         <alert name="CannotLoadWearable">
                 <message name="message">
                         Desculpe, não foi possível carregar o arquivo utilizado.
                 </message>
-
         </alert>
         <alert name="ConfirmDeleteComplicated">
                 <message name="message">
@@ -850,13 +876,70 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="DisplaySettingsSafe">
                 <message name="message">
                         Os ajustes de display foram configurados para os níveis de segurança, porque você especificou - opção salvar.
                 </message>
+        </alert>
+        <alert name="UnsupportedGLRequirements">
+                <message name="message">
+                        Você não parece ter requisitos de hardware recomendados para Second Life. Second Life exige uma placa gráfica OpenGL que tem apoio a multi- texturas. Se este for o caso, você pode se certificar de que tem os drivers mais recentes para sua placa gráfica, e os patches e pacotes de serviços para seu sistema operacional. 
 
+Se continuar com problemas, por favor visite: http://www.secondlife.com/support
+                </message>
+        </alert>
+        <alert name="UnsupportedHardware">
+                <message name="message">
+                        Aviso: Seu sistema não é compatível com os requisitos mínimos exigidos pelo Second Life. Se você continuar usando o Second Life pode experimentar uma performance ruim. Infelizmente não podemos oferecer suporte técnico para configurações de sistema não suportado. 
+
+MINSPECS
+Você deseja visitar [_URL] para maiores informações?
+                </message>
+                <ignore name="ignore">
+                        Ao detectar hardware não suportado
+                </ignore>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
+        <alert name="UnsupportedGPU">
+                <message name="message">
+                        - A sua placa de vídeo parece não atender os requisitos mínimos exigidos.
+                </message>
+        </alert>
+        <alert name="UnsupportedCPU">
+                <message name="message">
+                        - A velocidade da sua CPU não suporta os requisitos mínimos exigidos.
+                </message>
+        </alert>
+        <alert name="UnsupportedCPUAmount">
+                <message name="message">
+                        796
+                </message>
+        </alert>
+        <alert name="UnsupportedRAM">
+                <message name="message">
+                        - A memória do seu sistema não suporta os requisitos mínimos exigidos.
+                </message>
+        </alert>
+        <alert name="UnsupportedRAMAmount">
+                <message name="message">
+                        510
+                </message>
+        </alert>
+        <alert name="UnknownGPU">
+                <message name="message">
+                        Seu sistema possui uma placa gráfica que nos é desconhecido neste momento.
+Freqüentemente neste caso com um novo hardware, não tivemos a chance de testar. Second Life vai muito provavelmente executar corretamente, mas talvez seja necessária ajustar suas configurações de gráficos para algo mais apropriado. 
+(Menu Editar &gt; Preferências &gt; Gráficos).
+                </message>
+                <ignore name="ignore">
+                        Ao detectar uma placa de vídeo desconhecida
+                </ignore>
         </alert>
         <alert name="DisplaySettingsRecommended">
                 <message name="message">
@@ -865,21 +948,20 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="DisplaySettingsNoShaders">
                 <message name="message">
-                        [SECOND_LIFE] teve uma falha tentando inicializar os drivers gráficos.
-                        As sombras serão desabilitadas para evitar erros de drivers
-                        Recomendamos que você atualize seu drive de vídeo.
-                        A sombras poderam ser abilitadas novamente nas Preferências.
+                        [SECOND_LIFE] travou quando inicializava os drivers gráficos.
+A Qualidade Gráfica será ajustada para baixa, para evitar alguns erros comuns de drivers.
+Isto irá desabilitar alguns atributos gráficos.
+Nós recomendamos a atualização dos drivers de sua placa gráfica.
+A Qualidade Gráfica pode ser aumentada no Preferências &gt; Gráficos.
                 </message>
         </alert>
         <alert name="CannotRequestDomain">
                 <message name="message">
                         Não foi possível conectar ao servidor. Requisição do domínio [HOST] impossível.
                 </message>
-
         </alert>
         <alert name="CannotFindDomain">
                 <message name="message">
@@ -891,49 +973,41 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
         </alert>
         <alert name="PromptSelectServer">
                 <message name="message">
                         Por favor, selecione um servidor. Não foi possível se conectar ao [SERVER]
                 </message>
-
         </alert>
         <alert name="CannotConnectDNSError">
                 <message name="message">
                         Não foi possível conectar-se ao [SECOND_LIFE]. DNS por não encontrar o nome do host. Por favor, verifique se você pode conectar-se ao www.secondlife.com. Caso consiga, mas continue a receber esse erro, por favor entre em contato com o suporte e relate este problema.
                 </message>
-
         </alert>
         <alert name="CannotConnectSecurityError">
                 <message name="message">
                         Não foi possível estabelecer uma conexão segura com o servidor de entrada. Geralmente isso significa que o relógio de seu computador está configurado incorretamente. Por favor, vá até ao Painel de Controle e certifique-se que a data/hora estejam corretas. Se continuar a receber esse erro, por favor informe a Equipe de Suporte.
                 </message>
-
         </alert>
         <alert name="CannotConnectVerificationError">
                 <message name="message">
                         Não foi possível conectar-se ao [SECOND_LIFE]. O servidor de entrada não pôde verificá-lo via SSL. Caso você continue a receber este erro, por favor informar a Equipe de Suporte.
                 </message>
-
         </alert>
         <alert name="CannotConnectUnknownErrorWindows">
                 <message name="message">
                         Não foi possível conectar-se ao [SECOND_LIFE]. Apesar dos nossos esforços, algo inesperado aconteceu. Por favor, vá a seção de Suporte e reporte este problema a Equipe de Suporte. Se possível, inclua seu arquivo de log do SL (C:\Documents and Settings\(name)\Application Data\SecondLife\logs. Obrigado.
                 </message>
-
         </alert>
         <alert name="CannotConnectUnknownErrorDarwin">
                 <message name="message">
                         Não foi possível conectar-se ao [SECOND_LIFE]. Apesar dos nossos esforços, algo inesperado aconteceu. Por favor, vá a seção de Suporte e reporte este problema a Equipe de Suporte. Se possível, inclua seu arquivo de log (~/Library/Application Support/SecondLife/logs). Obrigado.
                 </message>
-
         </alert>
         <alert name="CannotResolveLoginToken">
                 <message name="message">
                         Houve um problema ao realizar a autenticação de seu login. Por favor, tente entrar novamente. Caso continue a receber esse erro, por favor vá a seção de Suporte e reporte esse problema a Equipe de Suporte.
                 </message>
-
         </alert>
         <alert name="CannotConnectNoMessage">
                 <message name="message">
@@ -945,7 +1019,6 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
         </alert>
         <alert name="CannotConnectNoReplyFromLogin">
                 <message name="message">
@@ -957,13 +1030,11 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
         </alert>
         <alert name="CannotConnectLoginTimeout">
                 <message name="message">
                         Login terminado por aguardar por sua localização dentro do mundo. Por favor, tente novamente.
                 </message>
-
         </alert>
         <alert name="FirstRunDialog">
                 <message name="message">
@@ -975,31 +1046,16 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="ClothingStillDownloading">
                 <message name="message">
                         Suas roupas ainda estão carregando. Você pode explorar o mundo normalmente, e os outros residentes irão vê-lo corretamente.
                 </message>
-
         </alert>
         <alert name="CannotResolveDomain">
                 <message name="message">
                         Não foi possível conectar-se ao servidor. Não encontrado o nome do domínio: [DOMAIN]. Por favor, confira sua conexão de rede.
                 </message>
-
-        </alert>
-        <alert name="CannotConnectLoginPacket">
-                <message name="message">
-                        Não foi possível conectar-se. O pacote de entrada não fi recebido pelo servidor de entrada. Por favor, tente novamente em poucos minutos ou clique em Ajuda para maiores informações sobre o status do sistema.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Help">
-                        Ajuda
-                </option>
-
         </alert>
         <alert name="WelcomeToSecondLife">
                 <message name="message">
@@ -1011,7 +1067,6 @@ Nota: Isto limpará o cache.
                 <option name="Female">
                         Feminino
                 </option>
-
         </alert>
         <alert name="WelcomeToSecondLifeSimple">
                 <message name="message">
@@ -1023,25 +1078,11 @@ Nota: Isto limpará o cache.
                 <option name="Female">
                         Feminino
                 </option>
-
-        </alert>
-        <alert name="ConfirmQuit">
-                <message name="message">
-                        Deseja sair?
-                </message>
-                <option name="Yes">
-                        Sim
-                </option>
-                <option name="No">
-                        Não
-                </option>
-
         </alert>
         <alert name="RegionNoTerraforming">
                 <message name="message">
                         A região [REGION] não permite ser plainada. Você precisará comprar um lote em outra parte do mundo para fazê-lo.
                 </message>
-
         </alert>
         <alert name="CannotCopyWarning">
                 <message name="message">
@@ -1053,31 +1094,26 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="CannotGiveItem">
                 <message name="message">
                         Não foi possível entregar o item.
                 </message>
-
         </alert>
         <alert name="TransactionCancelled">
                 <message name="message">
                         Transação cancelada.
                 </message>
-
         </alert>
         <alert name="TooManyItems">
                 <message name="message">
                         Não é possível passar muitos itens entre inventários em uma transação simples.
                 </message>
-
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        Você não pode dar itens.
+                        Você não tem permissão para transferir os itens selecionados.
                 </message>
-
         </alert>
         <alert name="CannotCopyCountItems">
                 <message name="message">
@@ -1089,13 +1125,11 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="CannotGiveCategory">
                 <message name="message">
-                        Não foi possível entregar esta categoria de item.
+                        Você não tem permissão para transferir a pasta selecionada.
                 </message>
-
         </alert>
         <alert name="FreezeAvatar">
                 <message name="message">
@@ -1110,7 +1144,21 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
+        </alert>
+        <alert name="FreezeAvatarFullname">
+                <message name="message">
+                        Congelar [AVATAR_NAME]?
+Ele ou ela vai ficar temporariamente incapaz de se mover, 
usar o bate-papo, ou interagir com o mundo.
+                </message>
+                <option name="Freeze">
+                        Congelar
+                </option>
+                <option name="Unfreeze">
+                        Descongelar
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="EjectAvatar">
                 <message name="message">
@@ -1125,25 +1173,35 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
+        </alert>
+        <alert name="EjectAvatarFullname">
+                <message name="message">
+                        Ejetar [AVATAR_NAME] das suas terras?
+                </message>
+                <option name="Eject">
+                        Ejetar
+                </option>
+                <option name="EjectandBan">
+                        Ejetar e Banir
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="InvalidUUID">
                 <message name="message">
                         UUID inválido
                 </message>
-
         </alert>
         <alert name="AcquireErrorTooManyObjects">
                 <message name="message">
                         ACQUIRE ERROR: Muitos objetos selecionados.
                 </message>
-
         </alert>
         <alert name="AcquireErrorObjectSpan">
                 <message name="message">
                         ACQUIRE ERROR: Objetos criados em mais de uma região. Por favor, mova todos os objetos para serem adquiridos em uma mesma região.
                 </message>
-
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
@@ -1155,11 +1213,12 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="PromptGoToCurrencyPage">
                 <message name="message">
-                        [EXTRA]  Ir para [URL] para informações sobre adquirir moeda?
+                        [EXTRA]
+
+Vá para [URL] para informação sobre compra de dinheiro.
                 </message>
                 <option name="GotoPage">
                         Ir até a página
@@ -1167,37 +1226,37 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="UnableToLinkObjects">
                 <message name="message">
                         Não é possível unir estes [COUNT] objetos. Você pode unir um máximo de [MAX] objetos. Tente selecionar menos objetos.
                 </message>
-
         </alert>
         <alert name="CannotLinkIncompleteSet">
                 <message name="message">
                         Você pode unir apenas conjuntos de objetos, e deve selecionar mais que um objeto.
                 </message>
-
         </alert>
         <alert name="CannotLinkModify">
                 <message name="message">
-                        Não é possível unir, pois você não tem permissão para alterar todos os objetos. Certifique-se de que nenhum deles esteja trancado e que todos objetos sejam de sua posse.
-                </message>
+                        Impossibilitado de unir, porque você não tem permissão para modificar todos os objetos. 
 
+Por favor, certifique-se de que nenhum deles está travado e que você é dono de todos eles.
+                </message>
         </alert>
         <alert name="CannotLinkDifferentOwners">
                 <message name="message">
-                        Não é possível unir, pois os objetos não têm o mesmo proprietário. Certifique-se de possuir todos os objetos.
-                </message>
+                        Impossibilitado de unir porque nem todos os objetos são do mesmo dono. 
 
+Por favor, certifique-se de que você é o dono de todos os objetos selecionados.
+                </message>
         </alert>
         <alert name="NoFileExtension">
                 <message name="message">
-                        Sem arquivos de extensão para o arquivo &apos;[FILE]&apos; Por favor, certifique-se de que o arquivo tenha a extensão correta.
-                </message>
+                        Nenhuma extensão para o arquivo: &apos;[FILE]&apos;
 
+Por favor, certifique-se de que o arquivo tem uma extensão de arquivo correta.
+                </message>
         </alert>
         <alert name="InvalidFileExtension">
                 <message name="message">
@@ -1206,235 +1265,218 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="CannotUploadSoundFile">
                 <message name="message">
                         Não é possível ler o arquivo de som para leitura: [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileNotRIFF">
                 <message name="message">
                         O arquivo não aparenta ser um arquivo do tipo RIFF WAVE: [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileNotPCM">
                 <message name="message">
                         O arquivo não aparenta ser um arquivo de áudio PCM WAVE: [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileInvalidChannelCount">
                 <message name="message">
                         O arquivo possui um número de canais inválidos (deve ser mono ou stereo): [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileInvalidSampleRate">
                 <message name="message">
                         O arquivo não aparenta ser um exemplo de freqüência suportada (deve ser 44.1k): [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileInvalidWordSize">
                 <message name="message">
                         O arquivo não aparenta ser um tamanho de palavra suportada (deve ser 8 ou 16 bit): [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileInvalidHeader">
                 <message name="message">
                         Não pode ser encontrado dado, bloco em cabeçalho WAV: [FILE]
                 </message>
-
         </alert>
         <alert name="SoundFileInvalidTooLong">
                 <message name="message">
                         Arquivo de áudio é muito longo (no máximo 10 segundos): [FILE]
                 </message>
-
         </alert>
         <alert name="ProblemWithFile">
                 <message name="message">
                         Problemas com o arquivo [FILE]: [ERROR]
                 </message>
-
         </alert>
         <alert name="CannotOpenTemporarySoundFile">
                 <message name="message">
                         Não pode abrir o arquivo de som comprimido para inscrição: [FILE]
                 </message>
-
         </alert>
         <alert name="UnknownVorbisEncodeFailure">
                 <message name="message">
                         Falha desconhecida de codificação vorbis: [FILE]
                 </message>
-
         </alert>
         <alert name="CorruptResourceFile">
                 <message name="message">
                         Fonte do arquivo corrompida: [FILE]
                 </message>
-
         </alert>
         <alert name="UnknownResourceFileVersion">
                 <message name="message">
                         Arquivo de recurso de versão Linden desconhecido: [FILE]
                 </message>
-
         </alert>
         <alert name="UnableToCreateOutputFile">
                 <message name="message">
                         Incapaz de criar arquivo de saída: [FILE]
                 </message>
-
         </alert>
         <alert name="DoNotSupportBulkAnimationUpload">
                 <message name="message">
                         Atualmente, não suportamos o envio de arquivos de animação em massa.
                 </message>
-
         </alert>
         <alert name="CannotAccessOutputFile">
                 <message name="message">
                         Incapaz de acessar o arquivo de saída: [FILE]
                 </message>
-
         </alert>
         <alert name="InsufficientFundsToUploadFile">
                 <message name="message">
                         Valor insuficiente para carregar o arquivo: O valor é L$[COST], seu saldo é L$ [BALANCE].
                 </message>
-
         </alert>
         <alert name="InsufficientFundsToFinishUpload">
                 <message name="message">
                         Valor insuficiente para terminar carregamento do arquivo [FILE]: valor é L$ [COST], o seu saldo é L$[BALANCE]:
                 </message>
-
         </alert>
         <alert name="CannotUploadReason">
                 <message name="message">
                         Incapaz de carregar [FILE] devido ao seguinte motivo: [REASON] Por favor tente novamente.
                 </message>
-
         </alert>
         <alert name="CannotCreateLandmarkNotOwner">
                 <message name="message">
                         Você não pode criar um ponto de referência porque o proprietário do terreno não permite. Tente novamente a alguns metros de distância.
                 </message>
-
         </alert>
         <alert name="CannotRecompileSelectObjectsNoScripts">
                 <message name="message">
                         Não é possível realizar compilação. Selecione os objetos com scripts válidos.
                 </message>
-
         </alert>
         <alert name="CannotRecompileSelectObjectsNoPermission">
                 <message name="message">
-                        Não é possível realizar compilação. Selecione objetos com scripts que você tenha permissão de modificar.
-                </message>
+                        Impossibilitado de executar &apos;recompilação&apos;.
 
+Selecione objetos com scripts que você tem permissão para modificar.
+                </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoScripts">
                 <message name="message">
-                        Não é possível recomeçar. Selecione objetos com script que possam ser modificados.
-                </message>
+                        Impossibilitado de executar &apos;redefinir&apos;.
 
+Selecione objetos com scripts.
+                </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoPermission">
                 <message name="message">
-                        Não é possível recomeçar. Selecione objetos com script que você tenha permissão de modificar.
-                </message>
+                        Impossibilitado de executar &apos;redefinir&apos;.
 
+Selecione objetos com scripts que você tem permissão para modificar.
+                </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoScripts">
                 <message name="message">
-                        Não é possível usar scripts de corrida. Selecione objetos com scripts válidos.
-                </message>
+                        Impossibilitado de definir quaisquer scripts para &apos;rodando&apos;.
 
+Selecione objetos com scripts.
+                </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoPermission">
                 <message name="message">
                         Não é possível usar scripts de corrida. Selecione objetos com scripts que você tenha a permissão de modificar.
                 </message>
-
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoScripts">
                 <message name="message">
-                        Não é possível usar scripts não funcionais. Selecione objetos com scripts válidos.
-                </message>
+                        Impossibilitado de definir quaisquer scripts para &apos;não rodando&apos;.
 
+Selecione objetos com scripts.
+                </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoPermission">
                 <message name="message">
                         Não é possível usar scripts não funcionais. Selecione objetos com scripts que você tem permissão de modificar.
                 </message>
-
         </alert>
         <alert name="NoFrontmostFloater">
                 <message name="message">
                         No frontmost floater to save&gt;
                 </message>
+        </alert>
+        <alert name="SeachFilteredOnShortWords">
+                <message name="message">
+                        Sua pesquisa foi alterada e os Palavras que eram demasiado curtas foram removidas.
 
+Pesquisava por: [FINALQUERY]
+                </message>
+        </alert>
+        <alert name="SeachFilteredOnShortWordsEmpty">
+                <message name="message">
+                        Os termos de sua pesquisa eram muito curtos então nenhuma pesquisa foi feita.
+                </message>
         </alert>
         <alert name="ColladaExportFailedUnknownServerError">
                 <message name="message">
                         Falha na exportação Collada: Falha desconhecida no servidor.
                 </message>
-
         </alert>
         <alert name="ColladaExportFailedInvalidPermissions">
                 <message name="message">
                         Falha na exportação Collada: Permissão inválida ou objeto bloqueado!
                 </message>
-
         </alert>
         <alert name="ColladaExportFailedUnknownError">
                 <message name="message">
                         Falha na exportação Collada: Erro desconhecido.
                 </message>
-
         </alert>
         <alert name="ObjectImportFailedTransfer">
                 <message name="message">
                         Falha na importação do objeto. Não é possível a transferência de arquivos.
                 </message>
-
         </alert>
         <alert name="ObjectImportFailedBadFormat">
                 <message name="message">
                         Falha na importação do objeto. O arquivo não é compatível com o formato SL Object.
                 </message>
-
         </alert>
         <alert name="ObjectImportFailedUnknownError">
                 <message name="message">
                         Falha na importação do objeto. Erro desconhecido.
                 </message>
-
         </alert>
         <alert name="CouldNotTeleportReason">
                 <message name="message">
                         Não é possível teletransportar-se. [REASON]
                 </message>
-
         </alert>
         <alert name="CannotSetLandOwnerNothingSelected">
                 <message name="message">
                         Incapaz de estabelecer o proprietário do terreno: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotSetLandOwnerMultipleRegions">
                 <message name="message">
                         Não é possível exigir a posse do terreno porque a seleção alcançou múltiplas regiões. Por favor, selecione uma área menor e tente novamente.
                 </message>
-
         </alert>
         <alert name="ForceOwnerAuctionWarning">
                 <message name="message">
@@ -1446,107 +1488,76 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="CannotContentifyNothingSelected">
                 <message name="message">
                         Conteúdo não encontrado: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotContentifyNoRegion">
                 <message name="message">
                         Conteúdo não encontrado: Sem região.
                 </message>
-
         </alert>
         <alert name="CannotReleaseLandNothingSelected">
                 <message name="message">
                         Não é possível abandonar terreno: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotReleaseLandNoRegion">
                 <message name="message">
                         Não é possível abandonar terreno: Não é possível encontrar região.
                 </message>
-
         </alert>
         <alert name="CannotBuyLandNothingSelected">
                 <message name="message">
                         Não é possível comprar terreno: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotBuyLandNoRegion">
                 <message name="message">
                         Não é possível comprar terreno: O terreno não pode ser encontrado nesta região.
                 </message>
-
+        </alert>
+        <alert name="CannotCloseFloaterBuyLand">
+                <message name="message">
+                        Você não pode fechar a janela de Compra de Terreno até que o Second Life calcule o preço dessa transação.
+                </message>
         </alert>
         <alert name="CannotDeedLandNothingSelected">
                 <message name="message">
                         Não é possível transferir posse do terreno: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotDeedLandNoGroup">
                 <message name="message">
                         Não é possível transferir posse do terreno: Sem grupo.
                 </message>
-
         </alert>
         <alert name="CannotDeedLandNoRegion">
                 <message name="message">
                         Não é possível transferir posse do terreno: O terreno não pode encontrado nesta região. Por favor, use a Ferramenta: Reporte de Bug para corrigir isso.
                 </message>
-
-        </alert>
-        <alert name="CannotSetLandOwnerNothingSelected">
-                <message name="message">
-                        Não é possível identificar proprietário: Nada selecionado.
-                </message>
-
-        </alert>
-        <alert name="CannotBuyLandMultipleRegions">
-                <message name="message">
-                        Não é possível comprar terreno porque a seleção alcançou múltiplas regiões. Por favor selecione uma área menor e tente novamente.
-                </message>
-
-        </alert>
-        <alert name="CannotBuyLandMultipleSelected">
-                <message name="message">
-                        Não é possível comprar terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
-                </message>
-
         </alert>
         <alert name="CannotDeedLandMultipleSelected">
                 <message name="message">
-                        Não é possível transferir posse do terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
+                        Impossibilitado de passar a propriedade da terra:
+Selecionados vários terrenos.
+Tente selecionar um único terreno.
                 </message>
-
         </alert>
         <alert name="RegionNotFound">
                 <message name="message">
                         Região não encontrada.
                 </message>
-
-        </alert>
-        <alert name="ParcelCanPlayMusic">
-                <message name="message">
-                        Esta região pode tocar música por streaming. Tocar música requer um conexão de 768 kbps ou superior. Tocar música quando disponível?
-                </message>
-                <option name="PlayMusic">
-                        Tocar música
-                </option>
-                <option name="Disable">
-                        Desabilitar
-                </option>
-
         </alert>
         <alert name="ParcelCanPlayMedia">
                 <message name="message">
-                        Esta região pode exibir vídeos por streaming. Para exibir vídeos requer um conexão de 768 kbps ou superior. Exibir quando disponível?
+                        Esta localidade pode executar fluxo de mídia.
+Fluxo de mídia necessita de uma conexão de Internet rápida.
+ 
+Executar fluxo de mídia quando disponível?
+(Você pode mudar esta opção mais tarde no Preferências &gt; �udio &amp; Vídeo.)
                 </message>
                 <option name="PlayMedia">
                         Exibir vídeo
@@ -1554,107 +1565,70 @@ Nota: Isto limpará o cache.
                 <option name="Disable">
                         Desabilitar
                 </option>
-
-        </alert>
-        <alert name="CannotBuyLandWaitingForServer">
-                <message name="message">
-                        Não é possível comprar terreno: Espere o servidor demonstrar o valor. Tente novamente em alguns segundos.
-                </message>
-
         </alert>
         <alert name="CannotDeedLandWaitingForServer">
                 <message name="message">
-                        Não é possível transferir posse do terreno: Espere o servidor demonstrar o proprietário. Tente novamente em alguns segundos.
-                </message>
-
-        </alert>
-        <alert name="CannotBuyLandNoPublic">
-                <message name="message">
-                        Não é possível comprar terreno: A seleção não contém qualquer terreno público.
-                </message>
-
-        </alert>
-        <alert name="CannotBuyLandLandOwned">
-                <message name="message">
-                        Não é possível comprar terreno: O terreno selecionado é de outro proprietário. Tente selecionar uma área menor.
-                </message>
-
-        </alert>
-        <alert name="CannotButLandRegionNotFound">
-                <message name="message">
-                        Não é possível comprar terreno: O terreno não pode ser encontrado nesta região. Por favor, use a Ferramenta: Reporte de Bug para corrigir isso.
-                </message>
+                        Impossibilitado de passar a propriedade da terra:
+Esperando pelo servidor informar de quem é a propriedade.
 
-        </alert>
-        <alert name="CannotBuyLandNoTransfer">
-                <message name="message">
-                        Não é possível comprar terreno: A região [REGION] não permite transferência do terreno.
+Por favor, tente novamente.
                 </message>
-
         </alert>
         <alert name="CannotDeedLandNoTransfer">
                 <message name="message">
                         Não é possível transferir posse do terreno: A região [REGION] não permite transferência do terreno.
                 </message>
-
-        </alert>
-        <alert name="CannotBuyLandForGroupNotOfficer">
-                <message name="message">
-                        Não é possível comprar o terreno de um grupo: Você não é um dos supervisores do grupo atual. Por favor, ative outro grupo usando Editar Grupos.
-                </message>
-
-        </alert>
-        <alert name="CannotBuyLandInsufficientFunds">
-                <message name="message">
-                        Comprar esta [AREA] por metros quadrados custará L$[PRICE]. Você tem somente L$ [BALANCE].
-                </message>
-
-        </alert>
-        <alert name="CannotReleaseLandNothingSelected">
-                <message name="message">
-                        Não é possível abandonar terreno: Nada selecionado.
-                </message>
-
         </alert>
         <alert name="CannotReleaseLandWatingForServer">
                 <message name="message">
-                        Não é possível abandonar terreno: Espere o servidor demonstrar o valor. Tente novamente em alguns segundos.
-                </message>
+                        Impossibilitado de abandonar a terra:
+Esperando o servidor atualizar as informações do terreno.
 
+Tente novamente em alguns segundos.
+                </message>
         </alert>
         <alert name="CannotReleaseLandSelected">
                 <message name="message">
-                        Não é possível abandonar terreno: Partes múltiplas foram selecionadas. Tente selecionar uma área menor.
-                </message>
+                        Impossibilitado de abandonar a terra:
+Você não é dono de todos os terrenos selecionados.
 
+Por favor, selecione um único terreno.
+                </message>
         </alert>
         <alert name="CannotReleaseLandDontOwn">
                 <message name="message">
                         Não é possível abandonar terreno: Você não tem permissão de renunciar esse lote. Aqueles que você possui estão em verde.
                 </message>
-
         </alert>
         <alert name="CannotReleaseLandRegionNotFound">
                 <message name="message">
-                        Não é possível abandonar terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
-                </message>
+                        Impossibilitado de abandonar a terra:
+Não consegue achar a região em que esta terra se encontra.
 
+Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
+                </message>
         </alert>
         <alert name="CannotReleaseLandNoTransfer">
                 <message name="message">
                         Não é possível abandonar terreno: A região [REGION] não permite transferência de terreno.
                 </message>
-
         </alert>
         <alert name="CannotReleaseLandPartialSelection">
                 <message name="message">
-                        Não é possível abandonar terreno: Você deve selecionar um lote inteiro para renunciá-lo. Tente dar um clique duplo para selecionar um lote inteiro ou primeiramente faça a divisão.
-                </message>
+                        Impossibilitado de abandonar a terra:
 
+Você deve selecionar um terreno inteiro para liberá-lo.
+
+Selecione um terreno inteiro ou primeiro divida seu terreno.
+                </message>
         </alert>
         <alert name="ReleaseLandWarning">
                 <message name="message">
-                        Você está preste a renunciar [AREA] metros do seu terreno. Ao renunciar esse lote, haverá a perda do controle sobre ele, mas isso não irá creditar nenhum L$. Renunciar este terreno?
+                        Você está para liberar [AREA] m2 de terra.
+Liberando este terreno, o liberará de suas posses,
+ mas não lhe concederá quaisquer L$.
+
+Liberar esta terra?
                 </message>
                 <option name="Release">
                         Renunciar
@@ -1662,19 +1636,21 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="CannotDivideLandNothingSelected">
                 <message name="message">
-                        Não é possivel dividir terreno: Nada selecionado.
-                </message>
+                        Impossibilitado de dividir a terra:
 
+Nenhum terreno selecionado.
+                </message>
         </alert>
         <alert name="CannotDivideLandPartialSelection">
                 <message name="message">
-                        Não é possivel dividir terreno: Você tem um lote inteiro selecionado. Tente selecionar uma área menor ao clicar e arrastar.
-                </message>
+                        Impossibilitado de dividir a terra:
 
+Você selecionou um terreno inteiro.
+Tente selecionar uma parte do terreno.
+                </message>
         </alert>
         <alert name="LandDivideWarning">
                 <message name="message">
@@ -1686,41 +1662,50 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="CannotDivideLandNoRegion">
                 <message name="message">
-                        Não é possivel dividir terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
-                </message>
+                        Impossibilitado de dividir a terra:
+Não consegue achar a região em que esta terra se encontra.
 
+Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
+                </message>
         </alert>
         <alert name="CannotJoinLandNoRegion">
                 <message name="message">
-                        Não é possível unir terreno: O terreno não pode ser encontrado nesta região. Por favor, use a opção Ferramenta, Reporar Bug para corrigir isso.
-                </message>
+                        Impossibilitado de unir a terra:
+Não consegue achar a região em que esta terra se encontra.
 
+Por favor, usar Ferramentas &gt; Reportar Bug, para reportar este erro.
+                </message>
         </alert>
         <alert name="CannotJoinLandNothingSelected">
                 <message name="message">
                         Não é possível unir terreno: Nada selecionado.
                 </message>
-
         </alert>
         <alert name="CannotJoinLandEntireParcelSelected">
                 <message name="message">
-                        Não é possível unir terreno: Você selecionou um lote inteiro. Tente seleciona uma área maior quando clicar e arrastar.
-                </message>
+                        Impossibilitado de unir a terra:
+Você selecionou apenas um terreno.
 
+Selecione a terra através de ambos os terrenos.
+                </message>
         </alert>
         <alert name="CannotJoinLandSelection">
                 <message name="message">
-                        Não é possível unir terreno: Você deve selecionar mais um lote. Tente seleciona uma área maior quando clicar e arrastar.
-                </message>
+                        Impossibilitado de unir a terra:
+Você deve selecionar mais de um terreno.
 
+Selecione a terra através de ambos os terrenos.
+                </message>
         </alert>
         <alert name="JoinLandWarning">
                 <message name="message">
-                        A união deste terreno criará um lote maior que pode cruzar com a área retangular selecionada. Você vai precisar colocar os novos nomes e opções dos lotes. Deseja unir o terreno?
+                        Aderir esta terra vai criar uma grande parcela fora de todas as parcelas que intersectam o retângulo selecionado.
+Você vai ter de repor o nome e as opções de 
nova parcela.
+
+Aderir a terra?
                 </message>
                 <option name="Join">
                         Unir
@@ -1728,7 +1713,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ConfirmNotecardSave">
                 <message name="message">
@@ -1740,7 +1724,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ConfirmLandmarkCopy">
                 <message name="message">
@@ -1752,7 +1735,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ConfirmItemCopy">
                 <message name="message">
@@ -1764,37 +1746,34 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ResolutionSwitchFail">
                 <message name="message">
                         Falha ao trocar a resolução para [RESX] por [RESY]
                 </message>
-
         </alert>
         <alert name="ErrorUndefinedGrasses">
                 <message name="message">
                         Erro: Gramado indefinido; [SPECIES]
                 </message>
-
         </alert>
         <alert name="ErrorUndefinedTrees">
                 <message name="message">
                         Erro: �rvores indefinidas: [SPECIES]
                 </message>
-
         </alert>
         <alert name="CannotSaveWearableOutOfSpace">
                 <message name="message">
                         Não é possível salvar &apos;[NAME]&apos; para um arquivo implantado. Você precisa liberar algum espaço no seu computador e salvar o arquivo novamente.
                 </message>
-
         </alert>
         <alert name="CannotSaveToAssetStore">
                 <message name="message">
-                        Não é possível salvar [NAME] na ASSET STORE principal.  Este é uma falha temporária. Por favor personalize e salve o implantado(wearable) novamente em alguns minutos. Se o problema persistir, por favor clique em Ferramentas – Reporte de Bug. Encontre o menu e informe sobre os detalhes da configuração da sua rede.
-                </message>
+                        Impossibilitado de salvar [NAME] e armazenar na central ativa.
+Isso é geralmente uma falha temporária. Por favor personalize e salve novamente a vestimenta em poucos minutos.
 
+Se o problema persistir, por favor clicar sobre &apos;Ferramentas &gt; Bug Report&apos; menu superior e fornecer detalhes sobre a configuração de sua rede.
+                </message>
         </alert>
         <alert name="AppEarlyExit">
                 <message name="message">
@@ -1803,38 +1782,30 @@ Nota: Isto limpará o cache.
                 <option name="Quit">
                         Sair
                 </option>
-
         </alert>
         <alert name="YouHaveBeenLoggedOut">
                 <message name="message">
-                        Você se desconectou do [SECOND_LIFE]: [MESSAGE]. Clique em Continuar para observar mensagens existentes ou bate-papo. Você não será capaz de realizar nenhuma operação. Clique em Sair para fechar [SECOND_LIFE] imediatamente.
+                        Você foi deslogado do [SECOND_LIFE]:
+            [MESSAGE]
+Você ainda pode olhar para o bate-papo e mensagens instantâneas existentes, clicando em &apos;Exibir IM &amp; bate-papo&apos;. Caso contrário, clique em &apos;Sair&apos; para sair do [SECOND_LIFE] imediatamente.
                 </message>
                 <option name="Continue">
-                        Continuar
+                        Ver Mensagem Instantânea &amp; Bate- Papo
                 </option>
                 <option name="Quit">
                         Sair
                 </option>
-
-        </alert>
-        <alert name="SelectSingleRate">
-                <message name="message">
-                        Selecionar um único objeto para avaliação.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-
         </alert>
         <alert name="OnlyOfficerCanBuyLand">
                 <message name="message">
                         Não é possível comprar o terreno para o grupo: Você não tem permissão para comprar o terreno para o seu grupo ativado. Por favor ative outro grupo usando Editar -&gt;
                 </message>
-
         </alert>
         <alert name="AddFriend" title="Adicionar amigo">
                 <message name="message">
-                        Amigos podem dar permissão para se encontrarem no mapa e receber informações de status online. Oferecer amizade para [NAME]?
+                        Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.  
+
+Oferecer amizade para [NAME]?
                 </message>
                 <option name="Offer">
                         Oferecer
@@ -1842,7 +1813,22 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
+        </alert>
+        <alert modal="true" name="AddFriendWithMessage" title="Add Friend">
+                <message name="message">
+                        Amigos podem dar permissões de rastrear um ao outro pelo mapa e receber atualizações de status online.  
 
+Oferecer amizade para [NAME]?
+                </message>
+                <editline name="editline">
+                        Quer ser meu amigo?
+                </editline>
+                <option name="Offer">
+                        Oferecer
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="RemoveFromFriends">
                 <message name="message">
@@ -1854,7 +1840,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="RemoveMultipleFromFriends">
                 <message name="message">
@@ -1866,11 +1851,12 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="GodDeleteAllScriptedPublicObjectsByUser">
                 <message name="message">
-                        Está certo que deseja apagar todos os objetos com scripts possuídos pelo **[AVATAR_NAME]** em todos as outros terrenos neste SIM?
+                        Você tem certeza que deseja excluir todos os objetos scriptados de propriedade de
+** [AVATAR_NAME] **
+sobre todos os outros terrenos deste sim?
                 </message>
                 <option name="DELETE!!">
                         APAGAR!!
@@ -1878,11 +1864,12 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar Cancel
                 </option>
-
         </alert>
         <alert name="GodDeleteAllScriptedObjectsByUser">
                 <message name="message">
-                        Está certo de que deseja APAGAR TODOS os objetos programados (scripted) possuídos pelo ** [AVATAR_NAME] ** em TODAS os TERRENOS deste setor?
+                        Você tem certeza que deseja excluir todos os objetos scriptados de propriedade de
+** [AVATAR_NAME] **
+sobre TODOS OS TERRENOS deste sim?
                 </message>
                 <option name="!!DELETEALL!!">
                         !!APAGAR TUDO!!
@@ -1890,11 +1877,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="GodDeleteAllObjectsByUser">
                 <message name="message">
-                        Está certo de que deseja APAGAR TODOS os objetos programados (scripted) ou não, possuídos pelo ** [AVATAR_NAME] ** em TODAS as TERRENOS deste setor?
+                        Você tem certeza que deseja excluir TODOS os objetos (Scriptados ou não)
+De propriedade de
+** [AVATAR_NAME] **
+sobre TODOS OS TERRENOS deste sim?
                 </message>
                 <option name="!!DELETEALL!!">
                         !!APAGAR TUDO!!
@@ -1902,37 +1891,26 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="PublishGroupInfoToWeb">
                 <message name="message">
                         Selecionando a opção &quot;Publicar na Web&quot; nos permitirá publicar o nome do grupo, símbolo, cartas, títulos e fundador no website [SECOND_LIFE]. Você é responsável por informar se algum dos conteúdos acima conter tema Adulto de acordo com as Regras da Comunidade.
                 </message>
-
-        </alert>
-        <alert name="ErrorEncodingSnapshot">
-                <message name="message">
-                        Erro de codificação da imagem.
-                </message>
-
         </alert>
         <alert name="BlankClassifiedName">
                 <message name="message">
                         Você deve especificar um título qualquer para seu anúncio.
                 </message>
-
         </alert>
         <alert name="MinClassifiedPrice">
                 <message name="message">
                         Preço mínimo a pagar para incluir na listagem de L$[MIN_PRICE]. Por favor, insira um valor maior.
                 </message>
-
         </alert>
         <alert name="CantLoadVertexShaders">
                 <message name="message">
                         Incapaz de carregar Vertex Shaders.
                 </message>
-
         </alert>
         <alert name="ConfirmObjectDeleteLock">
                 <message name="message">
@@ -1944,7 +1922,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteNoCopy">
                 <message name="message">
@@ -1956,7 +1933,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteNoOwn">
                 <message name="message">
@@ -1968,7 +1944,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopy">
                 <message name="message">
@@ -1980,7 +1955,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteLockNoOwn">
                 <message name="message">
@@ -1992,7 +1966,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteNoCopyNoOwn">
                 <message name="message">
@@ -2004,7 +1977,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
                 <message name="message">
@@ -2016,7 +1988,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectTakeLock">
                 <message name="message">
@@ -2028,7 +1999,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectTakeNoOwn">
                 <message name="message">
@@ -2040,11 +2010,14 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="ConfirmObjectTakeLockNoOwn">
                 <message name="message">
-                        Pelo menos um objeto está trancado ou você não possui todos os objetos que está manipulando. Caso continue, as permissões do próximo proprietário serão aplicadas aos objetos e há possibilidade de restringir sua habilidade em modificá-lo ou copiá-lo no futuro. Contudo, você pode utilizar a seleção. Deseja continuar?
+                        Pelo menos um objeto está bloqueado. 
Você não possui todos os objetos que você está pegando.
+Se continuar, as permissões do proprietário serão eventualmente aplicadas e restringirão a capacidade de modificar ou copiá-las.
+No entanto, pode pegar a seleção atual. 
+
+Tem certeza de que deseja pegar estes itens?
                 </message>
                 <option name="Yes">
                         Sim
@@ -2052,17 +2025,20 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="CantBuyLandAcrossMultipleRegions">
                 <message name="message">
-                        Não foi possível adquirir o lote devido ao várias seleções de regiões múltiplas. Por favor, selecione uma área menor e tente novamente.
-                </message>
+                        Não foi possível comprar terrenos, pois a seleção abrange várias regiões.
 
+Por favor, selecione uma área menor e tente novamente.
+                </message>
         </alert>
         <alert name="DeedLandToGroup">
                 <message name="message">
-                        Por tornar este lote uma ação, o grupo será consultado a ter e manter fundos suficientes. O preço de aquisição do lote não será reembolsado ao proprietário. Caso um lote acionado for vendido, o preço de venda será dividido entre os membros do grupo. Acionar estes [AREA] metros quadrados de terra para o grupo &apos;[GROUP_NAME]&apos;?
+                        Na transferência de propriedade desta parcela, será exigido do grupo créditos suficientes para manter seu uso.
+O preço de aquisição dos terrenos não é restituído ao o proprietário. Se uma parcela transferida é vendida, o preço de venda dividido igualmente entre os membros do grupo. 
+
+Transferir propriedade de [AREA] m2 do terreno ao grupo &apos;[GROUP_NAME]&apos;?
                 </message>
                 <option name="Deed">
                         Acionar
@@ -2070,11 +2046,15 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="DeedLandToGroupWithContribution">
                 <message name="message">
-                        Por tornar este lote uma ação, o grupo será consultado a ter e manter fundos suficientes. A ação incluirá contribuições de terra simultâneas para o grupo do &apos;[FIRST_NAME] [LAST_NAME]&apos;. O preço de aquisição do lote não será reembolsado ao proprietário. Caso um lote acionado for vendido, o preço de venda será dividido entre os membros do grupo. Acionar estes [AREA] metros quadrados de terra para o grupo &apos;[GROUP_NAME]&apos;?
+                        Transferindo Propriedade desta parcela, será exigido do grupo créditos suficientes para manter seu uso. 
+A Transferência incluirá simultaneamente Terreno e contribuição de &apos;[FIRST_NAME] [LAST_NAME]&apos; para o grupo.
+O preço da compra não será restituído ao proprietário. Se uma parcela da Transferência for vendida, o preço da venda será eventualmente dividido entre os membros do grupo. 
+ 
+Transferir propriedade destes [AREA] m2 de terreno para o grupo
+&apos;[GROUP_NAME]&apos;?
                 </message>
                 <option name="Deed">
                         Acionar
@@ -2082,25 +2062,21 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="DisplaySetToSafe">
                 <message name="message">
                         Configurações de display foram ajustadas para nível de segurança porque você especificou -- opção de segurança.
                 </message>
-
         </alert>
         <alert name="DisplaySetToRecommended">
                 <message name="message">
                         Configurações de display foram ajustadas para nível recomendado basedo na configuração do seu sistema.
                 </message>
-
         </alert>
         <alert name="UnableToConnect">
                 <message name="message">
                         Incapaz de conectar ao servidor. Não foi possível encontrar o nome do domínio: [HOST_NAME]
                 </message>
-
         </alert>
         <alert name="CanNotFindServer">
                 <message name="message">
@@ -2112,13 +2088,11 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
         </alert>
         <alert name="PleaseSelectServer">
                 <message name="message">
                         Por favor, selecione um servidor. Incapaz de conectar ao [IP_ADDRESS]
                 </message>
-
         </alert>
         <alert name="SystemMayBeDown">
                 <message name="message">
@@ -2130,29 +2104,33 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
         </alert>
         <alert name="ErrorMessage">
                 <message name="message">
                         [ERROR_MESSAGE]
                 </message>
-
         </alert>
         <alert name="AvatarMoved">
                 <message name="message">
-                        Sua [TYPE] localização atual é inválida. [HELP] Você será movido a uma região próxima.
+                        Sua [TYPE] localização não está disponível no momento. [HELP] 
+Você foi movido para uma região vizinha.
                 </message>
-
         </alert>
         <alert name="ClothingLoading">
                 <message name="message">
-                        Suas roupas ainda estão carregando. Você pode explorar o mundo normalmente e os outros residentes irão vê-lo corretamente.
+                        Sua vestimenta ainda está baixando. 
+Você pode usar o [SECOND_LIFE] normalmente e os outros o visualizarão corretamente.
                 </message>
-
+                <ignore name="ignore">
+                        Quando o vestuário está levando muito tempo para fazer download
+                </ignore>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
-                        [SECOND_LIFE] instalação completa. Caso seja sua primeira vez utilizando o [SECOND_LIFE], você precisará criar uma conta antes de ingressar. Ir até www.secondlife.com para criar uma nova conta?
+                        A instalação do [SECOND_LIFE] está completa.
+
+Se esta é a primeira vez usando o[SECOND_LIFE], será necessário que você crie uma conta antes de poder se logar.  
+Retornar a www.secondlife.com para criar uma nova conta?
                 </message>
                 <option name="NewAccount...">
                         Nova conta..
@@ -2160,17 +2138,18 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="SetByHostFail">
                 <message name="message">
                         Incapaz de conectar-se ao servidor. Não foi possível encontrar o nome do domínio: [HOST_NAME] Por favor, verifique sua conexão.
                 </message>
-
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        Incapaz de conectar-se. Pacote de entrada não recebido pelo servidor de entrada. Por favor, tente novamente em alguns minutos ou clique em Ajuda para maiores informações sobre a disponibilidade de sistema.
+                        Estamos com problemas de conexão. 
+Pode ser problema com a conexão de sua internet ou com os servidores do Second Life. 
+
+Voce tanto pode checar a conexão de sua internet e tentar novamente em alguns minutos, ou clicar em Teletransporte para tentar teletransportar-se para sua casa.
                 </message>
                 <option name="OK">
                         OK
@@ -2178,17 +2157,26 @@ Nota: Isto limpará o cache.
                 <option name="Help">
                         Ajuda
                 </option>
-
+                <option name="Teleport">
+                        Teleportar
+                </option>
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
-                        Seu avatar aparecerá em alguns minutos. Utilize as setas para mover-se. Pressione F1 a qualquer momento para aprender mais sobre [SECOND_LIFE].
-                </message>
+                        Seu personagem irá aparecer num momento. 
 
+Use as teclas de seta para andar. 
+Pressione a tecla F1 para ajuda ou aprender mais sobre [SECOND_LIFE].
+                </message>
         </alert>
         <alert name="WelcomeChooseSex">
                 <message name="message">
-                        Seu avatar aparecerá em alguns minutos. Utilize as setas para mover-se. Pressione F1 a qualquer momento para aprender mais sobre [SECOND_LIFE]. Por favor, escolha um personagem masculino ou feminino. Você pode mudar de idéia depois.
+                        Seu personagem irá aparecer num momento. 
+
+Use as teclas de seta para andar. 
+Pressione a tecla F1 para ajuda ou aprender mais sobre  [SECOND_LIFE].
+Por favor, escolha se o seu avatar é feminino ou masculino. 
+Você pode mudar de idéia depois.
                 </message>
                 <option name="Male">
                         Masculino
@@ -2196,29 +2184,27 @@ Nota: Isto limpará o cache.
                 <option name="Female">
                         Feminino
                 </option>
-
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] Você não possui fundos suficientes para isso.
+                        [NAME] L$ [PRICE] Você não possui suficientes L$ para fazer isso.
                 </message>
-
         </alert>
         <alert name="GrantedModifyRights">
                 <message name="message">
                         Foi garantido à você o privilégio de alterar o(s) objeto(s) [FIRST_NAME] [LAST_NAME]&apos;
                 </message>
-
         </alert>
         <alert name="RevokedModifyRights">
                 <message name="message">
                         Seu privilégio para alterar o(s) objeto(s) [FIRST_NAME] [LAST_NAME]&apos;s foi removido.
                 </message>
-
         </alert>
         <alert name="FlushMapVisibilityCaches">
                 <message name="message">
-                        Isso irá descarregar os caches de mapa dessa região. Pode seu útil somente para debugar. (Em andamento, aguarde 5 minutos, então todos os mapas serão atualizados após reentrarem)
+                        Isto irá descarregar os caches de mapa relativos a esta região.
+Isso é realmente útil apenas para depuração.
+(Na produção, aguarde 5 minutos e, então, o mapa de todos será atualizado depois que relogar.)
                 </message>
                 <option name="OK">
                         OK
@@ -2226,7 +2212,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="OnlyCopyContentsOfSingleItem">
                 <message name="message">
@@ -2238,7 +2223,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="KickUsersFromRegion">
                 <message name="message">
@@ -2250,49 +2234,38 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
-        </alert>
-        <alert name="ReturnScriptedOnOthersLand">
-                <message name="message">
-                        Tem certeza de que deseja retornar todos os objetos programados (scripted) possuídos pelo(a) ** [USER_NAME] ** que estejam em terrenos de outros?
-                </message>
-                <option name="Return">
-                        Retornar
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-
         </alert>
-        <alert name="ReturnScriptedOnAllLand">
+        <alert name="EstateObjectReturn">
                 <message name="message">
-                        Tem certeza de que deseja retornar TODOS os objetos programados (scripted) possuídos pelo(a) ** [USER_NAME] ** desta Região?
+                        Você tem certeza que deseja retornar os objetos pertencentes a [USER_NAME] ?
                 </message>
                 <option name="Return">
-                        Retornar
+                        OK
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="InvalidTerrainBitDepth">
                 <message name="message">
-                        Não foi possível configurar as texturas da região. Texturas de terreno [TEXTURE_NUM] possui um número inválido de profundidade de [TEXTURE_BIT_DEPTH]. Substitua a textura [TEXTURE_NUM] com 24 bit 512x512 ou menor e clique em &quot;Set&quot; novamente.
-                </message>
+                        Não foi possível definir texturas da região:
+Textura do Terreno [TEXTURE_NUM] tem uma profundidade de bits inválidos [TEXTURE_BIT_DEPTH]. 
 
+Substituir textura [TEXTURE_NUM], com uma imagem de 24-bit 512x512 ou menor e em seguida, clique em &apos;Aplicar&apos; novamente.
+                </message>
         </alert>
         <alert name="InvalidTerrainSize">
                 <message name="message">
-                        Não foi possível configurar as texturas da região. Terrain texture [TEXTURE_NUM] é muito grande em [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].  Substitua a textura [TEXTURE_NUM] com 24 bit 512x512 ou menor e clique em &quot;Set&quot; novamente.
-                </message>
+                        Não foi possível definir texturas da região:
+Textura do Terreno [TEXTURE_NUM] é muito grande em [TEXTURE_SIZE_X] x [TEXTURE_SIZE_Y].
 
+Substituir textura [TEXTURE_NUM], com uma imagem de 24-bit 512x512 ou menor e em seguida, clique em &apos;Aplicar&apos; novamente.
+                </message>
         </alert>
         <alert name="RawUploadStarted">
                 <message name="message">
                         Upload iniciado. Isso pode levar uns 2 minutos, dependendo da sua velocidade de conexão.
                 </message>
-
         </alert>
         <alert name="ConfirmBakeTerrain">
                 <message name="message">
@@ -2304,13 +2277,22 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="MaxAllowedAgentOnRegion">
                 <message name="message">
                         Você pode ter somente [MAX_AGENTS] residentes permitidos.
                 </message>
-
+        </alert>
+        <alert name="MaxBannedAgentsOnRegion">
+                <message name="message">
+                        Você pode ter apenas [MAX_BANNED] residentes banidos.
+                </message>
+        </alert>
+        <alert name="MaxAgentOnRegionBatch">
+                <message name="message">
+                        Falha ao adicionar [NUM_ADDED] agentes:
+Ultrapassa [MAX_AGENTS] [LIST_TYPE] o limite de [NUM_EXCESS].
+                </message>
         </alert>
         <alert name="MaxAllowedGroupsOnRegion">
                 <message name="message">
@@ -2322,53 +2304,42 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
-        </alert>
-        <alert name="MaxBannedAgentsOnRegion">
-                <message name="message">
-                        Você pode ter apenas [MAX_BANNED] residentes banidos.
-                </message>
-
         </alert>
         <alert name="MaxManagersOnRegion">
                 <message name="message">
                         Você pode ter apenas [MAX_MANAGER] residentes banidos.
                 </message>
-
         </alert>
         <alert name="OwnerCanNotBeDenied">
                 <message name="message">
                         Não é possível adicionar um porprietário a região. Acesso negado à lista.
                 </message>
-
         </alert>
         <alert name="CanNotChangeAppearanceUntilLoaded">
                 <message name="message">
                         Não é possível alterar a aparência até que as roupas e formas estejam carregadas.
                 </message>
-
         </alert>
         <alert name="ClassifiedMustBeAlphanumeric">
                 <message name="message">
                         O título do seu Anúncio deve começar com uma letra entre A e Z ou número. Nenhuma pontuação é permitida.
                 </message>
-
         </alert>
         <alert name="CantSetBuyObject">
                 <message name="message">
                         Não é possível configurar Comprar Objeto, porque o objeto não está à venda. Por favor, ponha o objeto à venda e tente novamente.
                 </message>
-
         </alert>
         <alert name="FinishedRawDownload">
                 <message name="message">
                         Download do arquivo de terreno RAW concluído em: [DOWNLOAD_PATH]
                 </message>
-
         </alert>
         <alert name="DownloadWindowsMandatory">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Você deve atualizar sua versão para utilizar o sistema.
+                        Uma nova versão do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Você deve baixar essa atualização para utilizar o [SECOND_LIFE].
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2376,11 +2347,12 @@ Nota: Isto limpará o cache.
                 <option name="Quit">
                         Sair
                 </option>
-
         </alert>
         <alert name="DownloadWindows">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance.
+                        Uma versão atualizada do [SECOND_LIFE] está disponível. 
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2388,11 +2360,12 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="DownloadWindowsReleaseForDownload">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance.
+                        Uma versão atualizada do [SECOND_LIFE] está disponível. 
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade.
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2400,11 +2373,14 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="DownloadMacMandatory">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Você deve atualizar esta versão para utilizar o sistema. Atualizar para sua pasta de Aplicações?
+                        Uma nova versão do [SECOND_LIFE] está disponível. 
+[MESSAGE]
+Você deve baixar esta atualização para utilizar o [SECOND_LIFE].
+
+Baixar para o seu folder de Aplicativos?
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2412,11 +2388,14 @@ Nota: Isto limpará o cache.
                 <option name="Quit">
                         Sair
                 </option>
-
         </alert>
         <alert name="DownloadMac">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance. Atualizar para sua pasta de Aplicações?
+                        Uma nova versão do [SECOND_LIFE] está disponível.
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade. 
+ 
+Baixar para o seu folder de Aplicativos?
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2424,11 +2403,15 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="DownloadMacReleaseForDownload">
                 <message name="message">
-                        Uma nova versão do [SECOND_LIFE] está disponível.[MESSAGE] Essa atualização não é obrigatória, mas sugerimos que a instale para aperfeiçoamento de estabilidade e performance. Atualizar para sua pasta de Aplicações?
+                        Uma nova versão do [SECOND_LIFE] está disponível.
+
+[MESSAGE]
+Essa atualização não é necessária, mas sugerimos que você instale para melhorar performance e maior estabilidade. 
+ 
+Baixar para o seu folder de Aplicativos?
                 </message>
                 <option name="Download">
                         Atualizar
@@ -2436,14 +2419,13 @@ Nota: Isto limpará o cache.
                 <option name="Continue">
                         Continuar
                 </option>
-
         </alert>
         <alert name="DeedObjectToGroup">
                 <message name="message">
                         Acionar este objeto causará ao grupo: * Recebe o valor pago pelo objeto
                 </message>
-                <ignore>
-                        Quando acionar objetos ao grupo
+                <ignore name="ignore">
+                        Ao transferir propriedade de objetos aos grupos
                 </ignore>
                 <option name="Deed">
                         Acionar
@@ -2451,128 +2433,71 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
-        <alert name="AddClassified">
+        <alert name="WebLaunchExternalTarget">
                 <message name="message">
-                        Anúncios colocados aparecem na seção &apos;Anúncios&apos; no diretório de Busca por uma semana. Preencha seu anúncio e clique em &apos;Publicar...&apos; para adicioná-lo ao diretório. Você será consultado a pagar um preço quando clicar em Publicar. Quanto mais pagar, mais próximo ao topo da lista ficará seu anúncio, facilitando a visualização pelos outros Residentes.
+                        Abrir o Web Browser do seu sistema para ver este conteúdo?
                 </message>
-                <ignore>
-                        Quando adicionar um novo Anúncio.
+                <ignore name="ignore">
+                        Ao abrir o navegador do seu sistema para visualizar uma página Web
                 </ignore>
-                <option name="OK">
+                <option name="Open">
                         OK
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
-        </alert>
-        <alert name="WebLaunchGraphicsDriver">
-                <message name="message">
-                        Seu [VENDOR_LABLE] [CARD_NAME] driver de vídeo neste computador está desatualizado. Este é um componente software que controla sua placa de vídeo. Versões antigas podem gerar problemas nos gráficos 3D em programas como [SECOND_LIFE]. Nós recomendamos atualizar seu &quot;[DRIVER_NAME]&quot; driver, disponível gratuitamente pela internet.
-                </message>
-                <ignore>
-                        Quando iniciar o navegador, visualizar a página de atualizações de drivers
-                </ignore>
-                <option name="Gotopage">
-                        Ir para a página
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-
-        </alert>
-        <alert name="WebLaunchGraphicsDriverIntelExtreme">
-                <message name="message">
-                        Seu driver gráfico Intel Extreme está desatualizado.Este é um componente software que controla sua placa de vídeo. Versões antigas podem gerar problemas nos gráficos 3D em programas como [SECOND_LIFE]. Nós recomendamos atualizar seu &quot;[DRIVER_NAME]&quot; driver, disponível na página da Intel.Gostaria de ir até a página de e drivers do [SECOND_LIFE]?
-                </message>
-                <ignore>
-                        Quando iniciar o navegador, visualizar a página de atualizações de drivers Intel
-                </ignore>
-                <option name="Gotopage">
-                        Ir para a página
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-
-        </alert>
-        <alert name="RunningInPCI">
-                <message name="message">
-                        GL indica que o driver de vídeo neste sistema está funcioando em modo PCImode, um método mais lento de processamento de imanges. Caso você esteja usando uma placa de vídeo PCI, por favor, desconsidere esta mensagem. Caso esteja usando uma placa de vídeo AGP, você deve atualizar sua placa-mãe para melhorar a performance do sistema. Se estiver utilizando uma placa de vídeo PCI Express você pode ativar a AGP a partir do painel Preferências no [SECOND_LIFE].
-                </message>
-                <ignore>
-                        Quando funcionar em modo PCI
-                </ignore>
-
         </alert>
         <alert name="WebLaunchJoinNow">
                 <message name="message">
                         Ir ao www.secondlife.com para gerenciar sua conta?
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, ir a página de gerência de conta
-                </ignore>
                 <option name="OK">
                         OK
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="WebLaunchForums">
                 <message name="message">
                         Buscar pela Base de Conhecimento do [SECOND_LIFE] as últimas dicas e truques.
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, ir até a Base de Conhecimento
-                </ignore>
                 <option name="Gotopage">
                         Ir para a página
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="WebLaunchSupport">
                 <message name="message">
                         Contactar o Suporte [SECOND_LIFE].
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, contactar o Suporte
-                </ignore>
                 <option name="Gotopage">
                         Ir para a página
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="WebLaunchSupportWiki">
                 <message name="message">
                         Ir até o Blog Oficial da Linden buscar pelas últimas notícias e informações.
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, visualizar o Blog
-                </ignore>
                 <option name="Gotopage">
                         Ir até a página
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="WebLaunchLSLGuide">
                 <message name="message">
                         Ir para a página guia do LSL para ajuda com script?
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, visualizar o guia LSL
+                <ignore name="ignore">
+                        Ao executar o navegador web para visualizar o Guia de Scripts.
                 </ignore>
                 <option name="Gotopage">
                         Ir para a página
@@ -2580,29 +2505,26 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="WebLaunchLSLWiki">
                 <message name="message">
                         Ir para a página LSL Wiki para ajuda com script?
                 </message>
-                <ignore>
-                        Quando iniciar o navegador, visualizar o LSL Wiki
-                </ignore>
                 <option name="Gotopage">
                         Ir para a página
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ReturnToOwner">
                 <message name="message">
-                        Você tem certeza que quer devolver os objetos selecionados aos seus donos? A autoria dos objetos transferíveis retornará para os seu antigos donos. (Todos os objetos retornarão para as pastas que estavam localizados anteriormente.)* *AVISO* Nenhum objeto transferível acionado será deletado!
+                        Você tem certeza que deseja retornar os objetos selecionados para seus proprietários? Objetos transferíveis doados irão retornar aos proprietários anteriores. 
+
+*AVISO* Objetos doados não – transferíveis serão deletados!
                 </message>
-                <ignore>
-                        Quando retornar os objetos aos seus donos.
+                <ignore name="ignore">
+                        Ao retornar objetos a seus proprietários
                 </ignore>
                 <option name="Return">
                         Retornar
@@ -2610,7 +2532,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="GroupLeaveConfirmOfficer">
                 <message name="message">
@@ -2622,7 +2543,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="GroupLeaveConfirmMember">
                 <message name="message">
@@ -2634,13 +2554,17 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ConfirmKick">
                 <message name="message">
                         Você quer REALMENTE expulsar todos os usuários deste grid?
                 </message>
-
+                <option name="Kick">
+                        Chutar todos os usuários
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="MuteLinden">
                 <message name="message">
@@ -2649,22 +2573,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
-        </alert>
-        <alert name="MuteByName" title="Silenciar objeto pelo nome">
-                <message name="message">
-                        Silenciar por nome somente afetará objetos, bate-papo e MI, mas não sons. Você deve digitar o nome do objeto corretamente.
-                </message>
-                <editline name="editline">
-                        Nome do objeto
-                </editline>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        Cancelar
-                </option>
-
         </alert>
         <alert name="MuteByNameFailed" title="Silenciar objeto pelo nome falhou">
                 <message name="message">
@@ -2673,7 +2581,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="RemoveItemWarn">
                 <message name="message">
@@ -2685,7 +2592,6 @@ Nota: Isto limpará o cache.
                 <option name="No">
                         Não
                 </option>
-
         </alert>
         <alert name="CantRateOwnedByGroup">
                 <message name="message">
@@ -2694,7 +2600,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="CantOfferCallingCard">
                 <message name="message">
@@ -2703,7 +2608,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="CantOfferFriendship">
                 <message name="message">
@@ -2712,7 +2616,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="CantSetHome">
                 <message name="message">
@@ -2721,19 +2624,18 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        Modificado para o modo Ocupado. O bate-papo e mensagens instantâneas serão ocultadas. Mensagens instantâneas serão respondidas como ocupado. Todos os convites para teleportar-se e sobre inventário serão recusadas.
+                        Definido Modo Ocupado.
+Bate-papo e mensagens instantâneas serão escondidas. Mensagens instantâneas vão mostrar modo Ocupado em resposta. Todas as ofertas de teleporte serão recusadas. Todas as ofertas de inventário irão para a sua Lixeira.
                 </message>
-                <ignore>
-                        Ao alterar para Modo Ocupado.
+                <ignore name="ignore">
+                        Ao definir o modo ocupado
                 </ignore>
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="NoPVPDetected">
                 <message name="message">
@@ -2742,7 +2644,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="NotecardAttachPermFail">
                 <message name="message">
@@ -2751,7 +2652,6 @@ Nota: Isto limpará o cache.
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="JoinedTooManyGroupsMember">
                 <message name="message">
@@ -2763,7 +2663,6 @@ Nota: Isto limpará o cache.
                 <option name="Decline">
                         Rejeitar
                 </option>
-
         </alert>
         <alert name="JoinedTooManyGroupsOfficer">
                 <message name="message">
@@ -2775,23 +2674,13 @@ Nota: Isto limpará o cache.
                 <option name="Decline">
                         Rejeitar
                 </option>
-
-        </alert>
-        <alert name="HandleRateOwner">
-                <message name="message">
-                        Não é permitido fixar o preço de um objeto de outro proprietário, ele pertence a um grupo.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-
         </alert>
         <alert name="KickUser">
                 <message name="message">
                         Expulsar este usuário com qual mensagem?
                 </message>
                 <editline name="editline">
-                        Um administrador o desconectou.
+                        Um administrador desligou você.
                 </editline>
                 <option name="OK">
                         OK
@@ -2799,14 +2688,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar.
                 </option>
-
         </alert>
         <alert name="KickAllUsers">
                 <message name="message">
                         Expulsar todo mundo atualmente do grid com qual mensagem?
                 </message>
                 <editline name="editline">
-                        Um administrador te desconectou.
+                        Um administrador deslogou você.
                 </editline>
                 <option name="OK">
                         OK
@@ -2814,14 +2702,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="FreezeUser">
                 <message name="message">
                         Paralise este usuário com qual mensagem?
                 </message>
                 <editline name="editline">
-                        Você foi paralisado. Você não pode mover-se ou conversar. Um administrador entrará em contato com você através de mensagem instantânea (MI).
+                        Você foi congelado, Você não pode se mover ou conversar. Um administrador irá contatá-lo via mensagem instantânea (IM).
                 </editline>
                 <option name="OK">
                         OK
@@ -2829,14 +2716,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="UnFreezeUser">
                 <message name="message">
                         Liberar este usuário com qual mensagem?
                 </message>
                 <editline name="editline">
-                        Você não está mais paralisado.
+                        Você não está mais congelado.
                 </editline>
                 <option name="OK">
                         OK
@@ -2844,7 +2730,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ExpungeUser">
                 <message name="message">
@@ -2862,7 +2747,7 @@ Nota: Isto limpará o cache.
                         Oferecer um teletransporte para uma localização com a seguinte mensagem?
                 </message>
                 <editline name="editline">
-                        Venha para [REGION]
+                        Junte-se a mim em [REGION]
                 </editline>
                 <option name="OK">
                         OK
@@ -2870,14 +2755,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="OfferTeleportFromGod">
                 <message name="message">
                         God user convocou para a sua localização?
                 </message>
                 <editline name="editline">
-                        Venha para [REGION]
+                        Junte-se a mim em [REGION]
                 </editline>
                 <option name="OK">
                         OK
@@ -2885,7 +2769,20 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
+        </alert>
+        <alert name="TeleportFromLandmark">
+                <message name="message">
+                        Você tem certeza que quer teleportar?
+                </message>
+                <ignore name="ignore">
+                        Ao teleportar de uma Landmark no inventário
+                </ignore>
+                <option name="Teleport">
+                        Teleportar
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="MessageEstate" title="Mensagem para todos do Estado">
                 <message name="message">
@@ -2900,7 +2797,11 @@ Nota: Isto limpará o cache.
         </alert>
         <alert name="ChangeLindenEstate" title="Mudar propriedade Linden">
                 <message name="message">
-                        Você não é capaz de modificar um Estado pertencente a Linden (mainland, grid adolescente, orientação, etc.). Isso é EXTREMAMENTE PERIGOSO porque pode afetar profundamente a experiência do usuário. Na mainland, isso irá mudar milhares de regiões e fazer o espaço do servidor travar. Proceder?
+                        Você está prestes a mudar um Terreno pertencente a Linden (continente, teen grid, orientação, etc.) 
+
+Isto é EXTREMAMENTE PERIGOSO porque pode fundamentalmente 
afetar a experiência do usuário. No continente, vai mudar milhares de regiões e fazer o spaceserver soluçar.
+
+Proceder?
                 </message>
                 <option name="ChangeEstate">
                         Mudar Estado
@@ -2908,11 +2809,13 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ChangeLindenAccess" title="Mudar a propriedade de Linden OK">
                 <message name="message">
-                        Você é capaz de modificar um Estado pertencente a Linden (mainland, grid adolescente, orientação, etc.). Isso é EXTREMAMENTE PERIGOSO porque pode afetar profundamente a experiência do usuário. Na mainland, isso irá mudar milhares de regiões e fazer o espaço do servidor travar. Continuar?
+                        Você está prestes a mudar uma lista de acessos de um Terreno pertencente a Linden (continente, teen grid, orientação, etc.)
+
+Isto é perigoso e deveria ser feito apenas para utilizar uma brecha que permita que objetos/L$ sejam transferidos para dentro/fora da grade.
+Isto mudará milhares de regiões e fará o spaceserver soluçar.
                 </message>
                 <option name="ChangeEstate">
                         Trocar Estado
@@ -2920,7 +2823,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateAllowedAgentAdd" title="Seleção de Estado">
                 <message name="message">
@@ -2968,10 +2870,15 @@ Nota: Isto limpará o cache.
                 <message name="message">
                         Remover da lista de grupos permitidos somente esta Região ou [ALL_ESTATES]?
                 </message>
+                <option name="ThisEstate">
+                        Este Estado
+                </option>
+                <option name="AllEstates">
+                        Todos os Estados
+                </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateBannedAgentAdd" title="Seleção de Estado">
                 <message name="message">
@@ -2986,7 +2893,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateBannedAgentRemove" title="Seleção de Estado">
                 <message name="message">
@@ -3001,7 +2907,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateManagerAdd" title="Seleção de Estado">
                 <message name="message">
@@ -3016,7 +2921,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateManagerRemove" title="Seleção de Estado">
                 <message name="message">
@@ -3031,7 +2935,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateCovenantChange" title="Seleção de Estado">
                 <message name="message">
@@ -3046,10 +2949,6 @@ Nota: Isto limpará o cache.
                 <option name="Cancel">
                         Cancelar
                 </option>
-
-
-
-s
         </alert>
         <alert name="EstateKickUser" title="Confirmar Kick">
                 <message name="message">
@@ -3061,7 +2960,6 @@ s
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="EstateChangeCovenant">
                 <message name="message">
@@ -3073,7 +2971,6 @@ s
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="ProblemImportingEstateCovenant">
                 <message name="message">
@@ -3082,7 +2979,16 @@ s
                 <option name="OK">
                         OK
                 </option>
-
+        </alert>
+        <alert name="ProblemAddingEstateManager">
+                <message name="message">
+                        Problemas em adicionar um novo gestor do terreno. Uma ou mais propriedades podem ter uma lista completa de gerenciamento.
+                </message>
+        </alert>
+        <alert name="ProblemAddingEstateGeneric">
+                <message name="message">
+                        Problemas em adicionar esse terreno à lista. Um ou mais terrenos podem ter a lista completa.
+                </message>
         </alert>
         <alert name="UnableToLoadNotecard">
                 <message name="message">
@@ -3091,7 +2997,6 @@ s
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="NotAllowedToViewNotecard">
                 <message name="message">
@@ -3100,7 +3005,6 @@ s
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="MissingNotecardAssetID">
                 <message name="message">
@@ -3109,11 +3013,12 @@ s
                 <option name="OK">
                         OK
                 </option>
-
         </alert>
         <alert name="PublishClassified">
                 <message name="message">
-                        Lembre-se: A taxa dos Classificados não são devolvidas. Publicar esse classificado agora por L$[AMOUNT]?
+                        Lembre-se: Taxas de Anúncios de Classificados não são reembolsáveis.
+
+Publicar este classificado agora por L$ [AMOUNT]?
                 </message>
                 <option name="Publish">
                         Publicar
@@ -3121,7 +3026,34 @@ s
                 <option name="Cancel">
                         Cancelar
                 </option>
-
+        </alert>
+        <alert name="SetClassifiedMature">
+                <message name="message">
+                        Este classificado possui conteúdo adulto?
+                </message>
+                <option name="Mature">
+                        Sim
+                </option>
+                <option name="Not Mature">
+                        Não
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
+        </alert>
+        <alert name="SetGroupMature">
+                <message name="message">
+                        Este Grupo possui conteúdo adulto?
+                </message>
+                <option name="Mature">
+                        Sim
+                </option>
+                <option name="Not Mature">
+                        Não
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
         </alert>
         <alert name="ConfirmRestart" title="Confirmar restart">
                 <message name="message">
@@ -3133,7 +3065,6 @@ s
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="MessageRegion" title="Mensagem para todos desta Região">
                 <message name="message">
@@ -3148,7 +3079,9 @@ s
         </alert>
         <alert name="HelpRegionBlockTerraform" title="Bloquear Terraform">
                 <message name="message">
-                        Se esta caixa estiver marcada, os proprietários do terreno não poderão modelá-lo independente das opções de &apos;Editar Terreno&apos; por lote. Padrão: desligado.
+                        Se esta opção for assinalada, donos de Terrenos não serão capazes de terraformar independentemente da configuração &apos;Editar Terreno&apos; de suas terras por parcela.
+
+Padrão: desligado
                 </message>
         </alert>
         <alert name="HelpRegionBlockFly" title="Bloquear Vôo">
@@ -3165,11 +3098,15 @@ s
                 <message name="message">
                         Define o número máximo de residentes permitidos nessa região. Lembre-se que quanto mais residentes existir em sua região, pior pode ser a performance. Padrão: 30
                 </message>
-
         </alert>
         <alert name="HelpRegionObjectBonus" title="Objeto Bonus">
                 <message name="message">
-                        O Bônus de Objeto é um multiplicador de primitivas permitidas em qualquer lote. São permitidos valores entre 1 e 10. Definido como &apos;1&apos; a cada 512m2;, seriam permitidos 117 objetos; como &apos;2&apos; a cada 512m2;, seriam permitidos 234; e assim sucessivamente. O número máximo de objetos permitidos por região é 15.000 não importando qual o valor definido para o Bônus de Objeto. Uma vez colocado esse valor, ele não pode ser diminuído até você ter certeza de que a mudança não forçará o retorno ou a exclusão de objetos atuais no lote. Padrão: 1.0
+                        O Bônus de objetos é um multiplicador para primitivas permitidas em qualquer parcela. O intervalo permitido é de 1 a 10. 
+Se fiixada em &apos;1 &apos;, 512m2 de cada parcela permite 117 objetos.
+Fixado em &apos;2 &apos;, 512m2 cada parcela permite  234, ou o dobro, e assim por diante.
+O número máximo de objetos permitidos por região permanece 15000 não importa qual seja o Bônus de objeto.  Uma vez estabelecido, esteja ciente de que a redução do Bônus de objeto pode retornar objetos ou apagá-los.
+
+Padrão: 1,0
                 </message>
         </alert>
         <alert name="HelpRegionMaturity" title="Adulto">
@@ -3187,9 +3124,16 @@ s
                         Configura se os lotes que não pertencem ao proprietário do Estado podem ser mesclados ou subdivididos. Se esta opção estiver desmarcada: * Apenas os donos ou gerenciadores de Estado podem mesclar ou dividir lotes; *Eles podem mesclar ou subdividir lotes pertencentes ao dono ou para o grupo onde eles tem os poderes apropriados. Se esta opção estiver marcada: * Todos os donos de lotes podem unir ou subdividir os lotes que eles possuem. *Para lotes pertencentes a grupos, aqueles com os poderes apropriados podem unir ou subdividir lotes. Padrão: Marcado.
                 </message>
         </alert>
+        <alert name="HelpRegionSearch" title="Não Mostrar na Pesquisa">
+                <message name="message">
+                        Ao marcar esta caixa irá bloquear a parcela listando os seus proprietários a partir de pesquisa em parcelas
+Padrão: off
+                </message>
+        </alert>
         <alert name="RegionMaturityChange" title="Modificar para adulto">
                 <message name="message">
-                        A avaliação de maturidade para esta região foi atualizada. O mapa-mundi, entretanto, levará aproximadamente 5 minutos para atualizar, pois o sistema apenas atualiza as informações de mapa periodicamente.
+                        A taxa de maturidade para esta  região foi atualizada. 
+Pode levar algum tempo para que a mudança seja refletida no mapa.
                 </message>
         </alert>
         <alert name="HelpRegionLandResell" title="Revender Terreno">
@@ -3209,7 +3153,16 @@ s
         </alert>
         <alert name="HelpRegionDisableCollisions" title="Desabilitar Colisões">
                 <message name="message">
-                        Quando a performance de simulação está ruim, objetos Físicos podem ser os culpados. Abra a Barra de Estatísticas (Ctrl-Shift-1). Olhe no Simulador de Física FPS. Se estiver abaixo de 45, então abra o painel &apos;Tempo&apos; localizado na parte de baixo da Barra de Estatísticas. Se o Tempo de Simulação (Física) for igual ou maior a 20 ms, clique no botão &apos;Get Top Colliders&apos;. Você poderá ver o nome e localização de objetos físicos que podem estar causando a baixa performance. Marcar a caixa de opção &apos;Desabilitar Colisões&apos; e então pressionar o botão &apos;Aplicar&apos; irá desabilitar temporariamente colisões objeto-objeto. Você poderá precisar fazer isso para ir ao local de um &apos;top collider&apos;. Uma vez que você chegue ao local, investigue o objeto - ele está colidindo constantemente com outros objetos? Você pode contatar o proprietário do objeto ou apagar ou retornar o objeto. Desmarque a cauxa de opção &apos;Desabilitar Colisões&apos; e então clique em &apos;Aplicar&apos; para reativar colisões na terreno. Default: off
+                        Quando a performance do simulador é pobre, os objetos físicos podem reclamar. 
+
+Abra a Barra de Estatísticas  (Ctrl-Shift-1).
+Olhe a taxa de quadros por segundos (FPS) dos objetos físicos.
+Se ela estiver abaixo de 45, abra o painel de Tempo, localizado na parte inferior da Barra de Estatísticas. Se o Tempo (Físicos) do Simulador mostrar 20 ms ou mais, clique o botão &apos;Pegue os Maiores Colidentes&apos;. Será fornecido a você o nome e a localidade dos objetos físicos que podem estar causando uma performance pobre.
+
+Ativando a caixa Desabilitar Colisões e então pressionando o botão Aplicar, as colisões objeto-objeto serão temporariamente desabilitadas. Você pode precisar fazer isso para que possa viajar até a localidade onde observou um &apos;colidente-mor&apos;. Uma vez tendo chegado à localidade, investigue o objeto – ele está constantemente colidindo com outros objetos? Você pode desejar contatar o dono do objeto ou deletar ou retornar o objeto.
+Desative a caixa &apos;Desabilitar Colisões&apos; e então use &apos;Aplicar&apos; para reativar as colisões na região.
+
+Padrão: off
                 </message>
         </alert>
         <alert name="HelpRegionDisablePhysics" title="Desabilitar Física">
@@ -3289,7 +3242,9 @@ s
         </alert>
         <alert name="HelpEstateExternallyVisible" title="Acesso público">
                 <message name="message">
-                        Indica se os residentes que estão em outras regiões podem entrar nesta região sem estar na lista de permissões. Default: permitido
+                        Esta caixa de verificação define se os Residentes que estão em outras propriedades podem entrar nesta, sem estar em uma lista de acesso.
+
+Padrão: on
                 </message>
         </alert>
         <alert name="HelpEstateAllowDirectTeleport" title="Teleporte direto">
@@ -3299,12 +3254,20 @@ s
         </alert>
         <alert name="HelpEstateAllowResident" title="Permitir acesso">
                 <message name="message">
-                        Se qualquer residente for listado aqui, o acesso à região será limitado aos residentes nesta lista e grupos na lista abaixo. (Se a região for visível da mainland, o acesso não pode ser limitado a uma lista de residentes ou grupos, e estes controles não são disponíveis. Somente a lista de &apos;acesso negado&apos; será utilizada.)
+                        Acesso a esta propriedade estará limitado aos Residentes listados aqui e em quaisquer grupos abaixo.
+Esta definição está disponível apenas quando o Acesso Público estiver não assinalado.
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="Permitir acesso de grupo">
                 <message name="message">
-                        Se qualquer grupo for listado aqui, o acesso à região será limitado aos grupos nesta lista e residentes especificamente permitidos acima. (Se a região for visível da mainland, o acesso não pode ser limitado a uma lista de residentes ou grupos, e estes controles não são disponíveis. Somente a lista de &apos;acesso negado&apos; será utilizada.)
+                        Acesso a esta propriedade estará limitada aos grupos listados aqui e a quaisquer Residentes acima. 
+Esta definição está disponível apenas quando o Acesso Público estiver não assinalado.
+                </message>
+        </alert>
+        <alert name="HelpEstateAbuseEmailAddress" title="Endereço de Email do Abuso">
+                <message name="message">
+                        Configurar isso para um endereço de email válido irá causar relato de abuso sobre este terreno a ser enviada para esse endereço.
+Defini-lo em branco fará com que sejam enviados relatórios de abuso apenas a Linden Lab.
                 </message>
         </alert>
         <alert name="HelpEstateBanResident" title="Negar acesso">
@@ -3312,6 +3275,19 @@ s
                         Residentes desta lista estão proibidos de acessar a sua região, independentemente das permissões e grupos setados acima. Adicionar um residente a esta lista irá removê-lo da lista de permissões.
                 </message>
         </alert>
+        <alert name="HelpEstateVoiceChat" title="Permitir Conversa por Voz">
+                <message name="message">
+                        Terrenos nesta propriedade têm permissão para ter seus canais de voz próprios, nos quais os residentes
+podem ouvir e falar com os outros residentes próximos..
+
+Padrão: off
+                </message>
+        </alert>
+        <alert name="VoiceVersionMismatch" title="Discordância de Versão de Voz">
+                <message name="message">
+                        Esta versão do Second Life não é compatível com as características do Canal de Voz desta região. Para que a Conversa por Voz funcione corretamente, você precisará atualizar o Second Life.
+                </message>
+        </alert>
         <alert name="HelpEstateCovenant" title="Corretor do Estado">
                 <message name="message">
                         Setar um corretor da região lhe permite vender lotes nesta região. Se um corretor não foi setado, você não pode vender terras. O cartão do seu corretor pode ficar vazio se você não desejar aplicar quaisquer regras ou avisar os compradores sobre qualquer coisa em relação ao lote antes da compra. Um corretor pode ser usado para comunicar regras, orientações, informações culturais ou simplesmente suas expectativas quanto ao futuro comprador. Isto pode incluir zoneamento, regulamentos para construções, opções de pagamento ou qualquer outra informação que você julgar importante que o novo proprietário veja e concorde antes da compra. O comprador precisa concordar com o corretor marcando a check box antes de concluir a compra. Corretores são sempre visíveis na janela About Land para todos os lotes que forem setados.
@@ -3415,7 +3391,10 @@ s
         </alert>
         <alert name="ConfirmPurchase">
                 <message name="message">
-                        Esta transação irá: [ACTION] Tem certeza de que deseja prosseguir com esta compra?
+                        Esta transação fará:
+[ACTION]
+ 
+Você tem certeza de que deseja prosseguir com esta compra?
                 </message>
                 <option name="Confirm">
                         Confirmar
@@ -3426,7 +3405,11 @@ s
         </alert>
         <alert name="ConfirmPurchasePassword">
                 <message name="message">
-                        Esta transação irá: [ACTION] Tem certeza de que deseja prosseguir com esta compra? Por favor, digite sua senha e clique Confirmar.
+                        Esta transação fará: 
+[ACTION]
+ 
+Você tem certeza de que deseja prosseguir com esta compra?
+Por favor, re-insira sua senha e clique OK.
                 </message>
                 <option name="ConfirmPurchase">
                         Confirmar Compra
@@ -3434,7 +3417,6 @@ s
                 <option name="Cancel">
                         Cancelar
                 </option>
-
         </alert>
         <alert name="SetPickLocation">
                 <message name="message">
@@ -3448,8 +3430,8 @@ s
                 <message name="message">
                         Você selecionou itens &apos;no copy&apos; do inventário. Estes itens serão movidos para o seu inventário, não copiados. Mover os itens do inventário?
                 </message>
-                <ignore>
-                        Ao mover itens no-copy do inventário
+                <ignore name="ignore">
+                        Quando estiver movendo objetos não copiáveis para o inventário
                 </ignore>
                 <option name="Move">
                         Mover
@@ -3460,10 +3442,13 @@ s
         </alert>
         <alert name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        Você selecionou itens &apos;no copy&apos; do inventário. Estes itens serão movidos para o seu inventário, não copiados. Como este objeto contém script, mover estes itens para o seu inventário pode causar mal funcionamento do script. Mover os itens do inventário?
+                        Você selecionou itens de inventário não copiáveis.
+Estes itens serão movidos para seu inventário, não copiados. Pelo fato de o objeto ter scripts, mover estes itens ao inventário pode provocar um mal funcionamento do script. 
+ 
+Mover para o inventário o(s) iten(s)?
                 </message>
-                <ignore>
-                        Ao mover objetos no-copy com script do invnetário
+                <ignore name="ignore">
+                        Quando movendo objetos com scripts não copiáveis ao inventário
                 </ignore>
                 <option name="Move">
                         Mover
@@ -3476,8 +3461,8 @@ s
                 <message name="message">
                         Aviso: A ação executada ao clicar o objeto Pay já foi setada, mas funcionará apenas se um script for adicionado com o evento money(). Isto se dá porque os residentes geralmente esperam que os objetos terão alguma reação quando o dinheiro é pago a eles.
                 </message>
-                <ignore>
-                        Ao setar &apos;Pay&apos; em objetos sem eventos money()
+                <ignore name="ignore">
+                        Quando Definindo &apos;Pagar&apos; objetos sem eventos money()
                 </ignore>
         </alert>
         <alert name="OpenObjectCannotCopy">
@@ -3485,73 +3470,151 @@ s
                         Não há itens neste objeto que você está autorizado a copiar.
                 </message>
         </alert>
-        <alert name="LoadAccountTransactions">
+        <alert name="ClickOpenF1Help">
                 <message name="message">
-                        Ir para [URL] para ver detalhes da transação?
+                        Visitar o website de Suporte do Second Life?
                 </message>
-                <ignore>
-                        Ao carregar a página de transações
+                <ignore name="ignore">
+                        Quando visitando o website de Suporte do Second Life
                 </ignore>
-                <option name="OK">
-                        OK
+                <option name="Gotopage">
+                        Ir
+                </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
+        </alert>
+        <alert name="RetryFetchInventoryDescendents">
+                <message name="message">
+                        O tempo de trazer o inventário do servidor expirou. Repetir?
+                </message>
+                <ignore name="ignore">
+                        Repetir trazer inventário descendente
+                </ignore>
+                <option name="Retry">
+                        Repetir
                 </option>
                 <option name="Cancel">
                         Cancelar
                 </option>
         </alert>
+        <alert name="ConfirmQuit">
+                <message name="message">
+                        Deseja sair?
+                </message>
+                <ignore name="ignore">
+                        Quando Saindo do Second Life.
+                </ignore>
+                <option name="Quit">
+                        Sair
+                </option>
+                <option name="Continue">
+                        Continuar
+                </option>
+        </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        Use esta ferramenta para reportar violações dos Termos de Serviço e Padrões da Comunidade. Veja: -http://secondlife.com/corporate/tos.php http://secondlife.com/corporate/cs.php - Todos os abusos reportados dos Termos de Serviço e Padrões da Comunidade são investigados e resolvidos. Você receberá um e-mail informando-lhe da resolução quando esta ocorrer. Você também pode ver a resolução do incidente no Police Blotter em:- http://secondlife.com/community/blotter.php
+                        Use esta ferramenta para reportar violações aos Termos de Serviço e aos Padrões da Comunidade. Veja:
+
+http://secondlife.com/corporate/tos.php 
+http://secondlife.com/corporate/cs.php
+
+Todos os abusos aos Termos de Serviço e aos Padrões da Comunidade reportados, são investigados e resolvidos. Você pode ver a resolução do incidente na Reportagem de Incidentes em:
+ 
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
                 <message name="message">
-                        IMPORTANTE: Este report será enviado ao proprietário da região em que você está e não à Linden Lab. - Como prestador de serviço aos residentes e visitantes, o proprietário da região em que você está escolheu receber e resolver todos os reports originados nesta região. Linden Lab não investigará os reports que você postar deste local. O proprietário da região resolverá os reports baseados nas regras locais desta região como definido pelo corretor da região. (Veja os corretores no menu World e selecione About Land.) - A resolução deste report se aplica apenas a esta região; outras áreas do Second Life não serão afetadas pelo resultado deste report. Somente a Linden Lab pode restringir o acesso a todo o Second Life.
+                        IMPORTANTE: Esta reportagem irá para o dono da região em que você se encontra atualmente e não para a Linden Lab.
+
+Como um serviço aos residentes e visitantes, o dono da região em que você se encontra foi eleito para receber e resolver todas as reportagens originadas nesta região. A Linden Lab não irá investigar reportagens que você envia desta localidade.
+
+O dono da região resolverá as reportagens baseado nas regras locais desta região, como definido na Declaração da propriedade. 
+(Veja as declarações indo ao menu Mundo e selecionando Sobre a Terra.)
+
+A resolução desta reportagem se aplica apenas a esta região; o acesso de Residentes às outras áreas do Second Life não será afetado pelas decisões desta reportagem.
+Apenas a Linden Lab pode restringir acesso a todo o Second Life.
                 </message>
         </alert>
         <alert name="HelpReportBug">
                 <message name="message">
-                        Use esta ferramenta *somente* para reportar ferramentas técnicas que não se comportam como descrito ou esperado. Por favor, forneça o máximo possível de detalhes. Você pode responder ao e-mail que você recebeu para adicionar mais detalhes ao seu report. Todos os bugs reportados são investigados e avaliados. Você não receberá nenhum e-mail de resposta. - Se você está encontrado dificuldades técnicas, contate o suporte em: http://secondlife.com/community/support.php - Nota: reports incompletos não serão investigados.
+                        Use esta ferramenta para reportar “apenas� características técnicas que não atuem como descrito ou esperado. 
+Por favor, forneça tantos detalhes quanto possível.
+Você pode responder ao e-mail de resposta automática para adicionar mais detalhes à sua reportagem.
+
+Todas as reportagens de bugs são investigadas e avaliadas.
+Nenhum e-mail de resposta será enviado.
+
+Se você estiver tendo uma dificuldade técnica, por favor contate o Suporte em:
+
+http://secondlife.com/community/support.php
+
+Nota: reportagens incompletas não serão investigadas
                 </message>
         </alert>
         <alert name="HelpReportAbuseSelectCategory">
                 <message name="message">
-                        Por favor, selecione uma categoria para este caso de abuso. Isto nos ajuda a processar os abusos reportados.
+                        Por favor, selecione uma categoria para  a reportagem deste abuso. A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de abuso.
                 </message>
         </alert>
         <alert name="HelpReportBugSelectCategory">
                 <message name="message">
-                        Por favor, selecione uma categoria para este bug. Isto nos ajuda a processar os bugs reportados.
+                        Por favor, selecione uma categoria para este bug.
+A seleção de uma categoria nos ajuda a arquivar e processar as reportagens de bugs.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserNameEmpty">
                 <message name="message">
-                        Por favor, informe o nome do residente que cometeu o abuso. Um valor preciso nos ajuda a processar os abusos reportados.
+                        Por favor, entre com o nome do perturbador.
+Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens de abuso.
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserLocationEmpty">
                 <message name="message">
-                        Por favor, informe o local onde o abuso aconteceu. Um valor preciso nos ajuda a processar os abusos reportados.
+                        Por favor, entre com a localidade aonde o abuso aconteceu. 
+Entrando com um valor preciso, nos ajuda a arquivar e processar as reportagens de abuso.
                 </message>
         </alert>
         <alert name="HelpReportAbuseSummaryEmpty">
                 <message name="message">
-                        Por favor informe um resumo do abuso acontecido. Um resumo preciso nos ajuda a processar os abusos reportados.
+                        Digite um resumo de como ocorreu o abuso.
+Fazer um resumo detalhado nos ajuda a processar o arquivos e relatórios do abuso.
                 </message>
         </alert>
         <alert name="HelpReportBugSummaryEmpty">
                 <message name="message">
-                        Por favor, informe um resumo do bug. Um resumo preciso nos ajuda a processar os bugs reportados.
+                        Digite um resumo do bug. 
Realizar um resumo detalhado nos ajuda a processar os relatórios do bug.
                 </message>
         </alert>
         <alert name="HelpReportAbuseDetailsEmpty">
                 <message name="message">
-                        Por favor, informe uma descrição detalhada do abuso acontecido. Seja o mais específico que puder, incluindo nomes e detalhes do incidente que está reportando. Uma descrição precisa nos ajuda a processar abusos reportados.
+                        Digite uma descrição detalhada do abuso que ocorreu.
+Seja tão específico quanto você puder, incluindo nomes e os detalhes do incidente que está denunciando.
+Fazer uma descrição precisa nos ajuda a processar os arquivo e relatórios.
                 </message>
         </alert>
         <alert name="HelpReportBugDetailsEmpty">
                 <message name="message">
-                        Por favor, informe uma descrição detalhada do bug. Seja o mais específico que puder, incluindo passos para reproduzir o bug, se possível. Uma descrição precisa nos ajuda a processar bugs reportados.
+                        Digite uma descrição detalhada do bug.
+Seja tão específico quanto você puder, incluindo as etapas para reproduzir o bug se possível.
+Fazer uma descrição precisa nos ajuda a processar os arquivos e relatórios de bugs.
+                </message>
+        </alert>
+        <alert name="HelpReportAbuseContainsCopyright">
+                <message name="message">
+                        Caro Residente,
+
+Você parece estar relatando violação de propriedade intelectual. Por favor, certifique-se de que está relatando corretamente:
+
+(1) O Processo de abuso. Você pode apresentar um relatório de abuso se você acredita que um Residente está infringindo o sistema de permissões do Second Life, por exemplo, utilizando ferramentas CopyBot para copiar ou similar, para violar os direitos de propriedade intelectual. A Equipe de Abuso investigará os problemas de comportamento adequado a ação disciplinar, que viola o Estatuto da Comunidade Second Life ou os Termos de Serviço. No entanto, a mesma não controla e não irá responder aos pedidos para remover o conteúdo do mundo Second Life.
+
+(2) O processo de remoção de conteúdo ou DMCA. Para solicitar a remoção de conteúdo do Second Life, você deve enviar uma notificação válida de infração, conforme previsto em nossa Política de DMCA em http://secondlife.com/corporate/dmca.php.
+
+Se você ainda deseja prosseguir com o processo de abuso, por favor, feche esta janela e termine de enviar seu relatório. Pode ser necessário selecionar a categoria específica &apos;CopyBot Infração de Permissões&apos;.
+
+Obrigado,
+Linden Lab
                 </message>
         </alert>
         <alert name="FailedRequirementsCheck">
@@ -3563,8 +3626,8 @@ s
                 <message name="message">
                         Já existe um objeto neste ponto do seu corpo. Você deseja substituí-lo pelo objeto selecionado?
                 </message>
-                <ignore>
-                        Ao substituir o objeto existente
+                <ignore name="ignore">
+                        Ao substituir os anexos existentes
                 </ignore>
                 <option ignore="Replace Automatically" name="Yes">
                         Sim
@@ -3577,8 +3640,8 @@ s
                 <message name="message">
                         Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos por troca neste pagamento. Você gostaria de deixar o modo Ocupado antes de completar esta transação?
                 </message>
-                <ignore>
-                        Ao pagar uma pessoa ou objeto em modo Ocupado
+                <ignore name="ignore">
+                        Ao pagar uma pessoa ou objeto no estado ocupado
                 </ignore>
                 <option ignore="Always leave Busy Mode" name="Yes">
                         Sim
@@ -3591,8 +3654,8 @@ s
                 <message name="message">
                         Tem certeza de que deseja remover permanentemente o conteúdo da lixeira de seu inventório?
                 </message>
-                <ignore>
-                        Ao esvaziar a lixeira de seu inventório
+                <ignore name="ignore">
+                        Ao esvaziar a pasta da lixeira no seu inventário
                 </ignore>
                 <option name="Yes">
                         Sim
@@ -3603,8 +3666,7 @@ s
         </alert>
         <alert name="ConfirmClearBrowserCache">
                 <message name="message">
-                        Você tem certesa que deseja limpar
-o cache do browser?
+                        Você tem certeza que deseja limpar o cache do seu navegador?
                 </message>
                 <option name="Yes">
                         Sim
@@ -3615,8 +3677,18 @@ o cache do browser?
         </alert>
         <alert name="ConfirmClearCookies">
                 <message name="message">
-                        Você tem certesa que deseja limpar 
-os cookies?
+                        Você tem certeza de que deseja limpar os cookies?
+                </message>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Cancelar
+                </option>
+        </alert>
+        <alert name="ConfirmClearMediaUrlList">
+                <message name="message">
+                        Você tem certeza de que deseja limpar toda sua lista de URLs?
                 </message>
                 <option name="Yes">
                         Sim
@@ -3630,8 +3702,8 @@ os cookies?
                         Deseja realmente remover permanentemente
 o conteúdo da pasta achados e perdidos?
                 </message>
-                <ignore>
-                        Quando remover permanentemente conteúdo da pasta achados e perdidos.
+                <ignore name="ignore">
+                        Ao esvaziar pasta Achados e Perdidos do seu inventário
                 </ignore>
                 <option name="Yes">
                         Sim
@@ -3642,56 +3714,367 @@ o conteúdo da pasta achados e perdidos?
         </alert>
         <alert name="CopySLURL">
                 <message name="message">
-                        A seguinte SLURL foi copiada para o seu clipboard: [SLURL] Cole-a numa página web para permitir que outros residentes a acessem facilmente ou teste-a colando na barra de endereços do seu browser.
+                        A seguinte SLURL foi copiada para o seu clipboard: 
+ [SLURL] 
+
+Coloque-o em uma página web para dar aos outros o fácil acesso a esse local ou experimentar colá-lo na barra de endereços do seu navegador.
                 </message>
-                <ignore>
-                        Ao copiar a SLURL para o seu clipboard
+                <ignore name="ignore">
+                        Ao copiar a SURL para o seu clipboard
                 </ignore>
         </alert>
-        <alert name="ClickPartnerHelpAvatar">
+        <alert name="GraphicsPreferencesHelp">
                 <message name="message">
-                        You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
+                        Este painel controla o tamanho da janela, resolução e a qualidade dos gráficos do Client. O Preferências &gt; Interface Gráfica permite escolher entre quatro níveis gráficos: Baixo, Médio, Alto e Ultra. Você também pode personalizar suas configurações de gráficos selecionando a opção Custom e manipulando as seguintes definições:
+
+Sombreamento: Ativar ou desativar vários tipos de pixel sombreador. 
+
+Detalhes de Reflexão: Define os tipos de objetos que a água pode refletir.
+
+Renderização de Avatar: Define opções que afetam a forma como o client renderizará os avatares. 
+
+Alcance: Afeta a distância do seu ponto de vista que os objetos serão renderizados na cena. 
+
+Número máximo de partículas: Define o número máximo de partículas que será capaz de ver na sua tela de uma só vez. 
+
+Qualidade de Post Process: Define a resolução com a qual o brilho será renderizado.  
 
-Go to the Second Life web site for more information on partnering?
+Detalhes de malha: Ajusta a quantidade de detalhes ou número de triângulos utilizados na renderização de certos objetos. Um valor mais alto leva mais tempo para renderizar, mas torna esses objetos mais detalhados.
+
+Detalhe de Iluminação: Seleciona os tipos de luzes que você gostaria de renderizar. 
+
+Detalhe de Terreno: Ajusta a quantidade de detalhes que você gostaria de ver para a textura do terreno.
                 </message>
-                <option name="GotoPage">
-                        Go to Page
+        </alert>
+        <alert name="WLSavePresetAlert">
+                <message name="message">
+                        Você deseja substituir a apresentação salva?
+                </message>
+                <option name="Save">
+                        Sim
+                </option>
+                <option name="Cancel">
+                        Não
+                </option>
+        </alert>
+        <alert name="WLDeletePresetAlert">
+                <message name="message">
+                        Você deseja apagar [SKY]?
+                </message>
+                <option name="Delete">
+                        Sim
+                </option>
+                <option name="Cancel">
+                        Não
+                </option>
+        </alert>
+        <alert name="WLNoEditDefault">
+                <message name="message">
+                        Você não pode editar ou excluir um padrão predefinido.
+                </message>
+        </alert>
+        <alert name="WLMissingSky">
+                <message name="message">
+                        Este arquivo de ciclo de dia possui um arquivo de céu faltando: [SKY].
+                </message>
+        </alert>
+        <alert name="PPSaveEffectAlert">
+                <message name="message">
+                        Efeito PostProcess existe. Você deseja substituí-lo?
+                </message>
+                <option name="Save">
+                        Sim
+                </option>
+                <option name="Cancel">
+                        Não
+                </option>
+        </alert>
+        <alert name="HelpEditSky">
+                <message name="message">
+                        Editar os controles graduais do WindLight para configurar e salvar um conjunto de céus.
+                </message>
+        </alert>
+        <alert name="HelpEditDayCycle">
+                <message name="message">
+                        Definir qual céu colocar durante todo o dia.
+                </message>
+        </alert>
+        <alert name="EnvSettingsHelpButton">
+                <message name="message">
+                        Essas configurações ajustam a forma como o ambiente parece localmente no seu computador. Sua placa de vídeo precisa suportar o sombreador atmosférico, a fim de ter acesso a todas as definições. 
+ 
+Ajuste o controle gradual &quot;Hora do Dia&quot;  para alterar o dia da fase localmente sobre o espectador.
+ 
+Ajuste o controle gradual de &quot;Cobertura das nuvens&quot; para controlar quantas nuvens cobrem o céu. 
+ 
+Pegue uma cor da paleta de cores do &quot;Cord a �gua&quot; para mudar a cor desta. 
+ 
+Ajuste o controle gradual de &quot;Névoa de �gua&quot; para controlar o quão densa é a névoa dentro da água.
+ 
+Clique &quot;Usar Horário do Terreno&quot; para redefinir a hora do dia para a região para o horário atual do dia e permanecer ligados a ela. 
+ 
+Clique &quot;Céu Avançado &quot; para abrir um editor com configurações mais avançadas para o céu. 
+ 
+Clique &quot;�gua Avançada &quot; para abrir um editor com configurações mais avançadas para a água.
+                </message>
+        </alert>
+        <alert name="HelpDayCycle">
+                <message name="message">
+                        Este editor de dia dá a você o controle sobre o ciclo de dia/noite do Second Life. Este é o ciclo usado pelo editor básico de clima do controle gradual da hora do dia. 
+
+O editor do ciclo de dia trabalha configurado por keyframes (quadros-chave). Estes são pontos (representados pelos ícones cinza no gráfico de horário) que possuem o padrão de céu associado a eles.  Conforme o dia passa, o céu de Windlight &quot; anima &quot; a intersecção entre esses keyframes (quadros-chave). 
+
+A seta amarela acima da linha de tempo representa a sua vista atua, baseada no horário do dia. Clique e arraste para ver como o seu dia será animado. Você pode adicionar ou deletar as keyframes (quadro-chave) pressionando os botões Adicionar Chave e Deletar chave ao lado direito da linha de tempo.
+
+Você pode configurar a posição do tempo de uma keyframe (quadro-chave) arrastando-o pela linha do tempo, ou configurando manualmente no quadro de configurações do seu keyframe (quadro-chave), será possível a você associar o seu keyframe a este respectivo padrão WindLight. 
+
+A duração do ciclo determina a duração geral do &quot;dia&quot;. Configurá-la para um valor baixo (por exmplo, 2 min.) quer dizer que a linha do tempo de 24 horas será animada completamente em apenas dois minutos reais!  Assim que estiveres satisfeito com a linha do tempo e o ciclo do keyframe (quadro chave), use os botões Play e Stop para uma prévia de como ficará o resultado. Lembre-se você também pode utilizar a seta amarela indicadora do tempo acima da linha do tempo para ver o ciclo animado interativamente. Usando o botão do tempo do terreno irá sincronizar a duração do seu dia ao ciclo diário do terreno.
+
+Assim que estiver satisfeito com o seu ciclo diário, pode salvá-lo ou carregar no botão de teste de dia . Note que agora nós permitimos apenas um Ciclo de dia.  
+                </message>
+        </alert>
+        <alert name="HelpBlueHorizon">
+                <message name="message">
+                        Use os cursores Vermelho/Verde/Azul ( Red/Green/Blue -RGB) para ajustar as cores do céu. Você também pode usar o controle de Intensidade (I) para mover os três controles RGB simultaneamente.
+                </message>
+        </alert>
+        <alert name="HelpHazeHorizon">
+                <message name="message">
+                        Haze Horizon é um dos parâmetros mais úteis para ajuste global de exposição de luz na cena. Ele é eficaz para simular diversas configurações de exposição, tais como configurações para super exposição do sol e escuros halos de Iris.
+                </message>
+        </alert>
+        <alert name="HelpBlueDensity">
+                <message name="message">
+                        A densidade global azul afeta a saturação da cor do céu e nevoeiro. Se você mover a o controle gradual de intensidade (I) para a direita, as cores vão se tornar mais brilhantes e vibrantes. Se você movê-lo totalmente para a esquerda, as cores perdem intensidade e cor, eventualmente chegando a preto e branco. Se pretende afinar o equilíbrio de cor do céu, você pode controlar os diversos elementos da saturação, utilizando os controles graduais para vermelho / verde / azul (RGB).
+                </message>
+        </alert>
+        <alert name="HelpHazeDensity">
+                <message name="message">
+                        Densidade de Poeira controla o nível de fumaça, poeira cinza na atmosfera. Eficaz para simular cenas com altos níveis de poeira e poluentes. É também efetivo em simular névoa e nevoeiro.
+                </message>
+        </alert>
+        <alert name="HelpDensityMult">
+                <message name="message">
+                        O Multiplicador de Densidade pode ser usado para afetar a densidade atmosférica global. Com definições mais baixas, ele cria uma sensação de &quot;ar rarefeito&quot; e em definições mais altas, ele cria um efeito mais denso, mais esfumaçado.
+                </message>
+        </alert>
+        <alert name="HelpDistanceMult">
+                <message name="message">
+                        Ajusta como a distância no WindLight é percebida. Um valor zero efetivamente desativa a influência do WindLight sobre terrenos e objetos. Valores superiores a 1 simula os efeitos atmosféricos mais espessos a maiores distâncias.
+                </message>
+        </alert>
+        <alert name="HelpMaxAltitude">
+                <message name="message">
+                        Max Altitude ajusta os cálculos de performance de altitude do WindLight, quando computa sua iluminação atmosférica. Em períodos vespertinos do dia, é útil para ajustar a &quot;profundidade&quot; de como o pôr-do-sol aparece.
+                </message>
+        </alert>
+        <alert name="HelpSunlightColor">
+                <message name="message">
+                        Ajustar a cor e intensidade da luz direta na cena.
+                </message>
+        </alert>
+        <alert name="HelpSunAmbient">
+                <message name="message">
+                        Ajusta a cor e a intensidade da luz ambiente atmosférica na cena.
+                </message>
+        </alert>
+        <alert name="HelpSunGlow">
+                <message name="message">
+                        O controle gradual de Tamanho controla o do tamanho do sol.
+O controle gradual de Foco controla o quanto o sol aparecerá desfocado no céu.
+                </message>
+        </alert>
+        <alert name="HelpSceneGamma">
+                <message name="message">
+                        Ajuste a tela da distribuição de luz e escuridão.
+                </message>
+        </alert>
+        <alert name="HelpStarBrightness">
+                <message name="message">
+                        Ajusta o brilho das estrelas no céu.
+                </message>
+        </alert>
+        <alert name="HelpTimeOfDay">
+                <message name="message">
+                        Controla a localização do sol no céu. Semelhante a elevação.
+                </message>
+        </alert>
+        <alert name="HelpEastAngle">
+                <message name="message">
+                        Controla a localização do sol no céu.
+Similar ao azimute.
+                </message>
+        </alert>
+        <alert name="HelpCloudColor">
+                <message name="message">
+                        Edita as cores das nuvens, É normalmente recomendado manter o tom esbranquiçado, mas hey! Você pode se divertir se desejar.
+                </message>
+        </alert>
+        <alert name="HelpCloudDetail">
+                <message name="message">
+                        Controla os detalhes da camada de imagem superior na imagem de nuvem principal. X e Y controla sua posição. D (Densidade) controla o quão cheio ou estratificada as nuvens devem aparecer.
+                </message>
+        </alert>
+        <alert name="HelpCloudDensity">
+                <message name="message">
+                        Permite que você controle a posição das nuvens com os cursores X e Y e a densidade deles com o cursor D
+                </message>
+        </alert>
+        <alert name="HelpCloudCoverage">
+                <message name="message">
+                        Controla o quanto as nuvens cobrem o céu.
+                </message>
+        </alert>
+        <alert name="HelpCloudScale">
+                <message name="message">
+                        Controla o dimensionamento da imagem de nuvens na cúpula celeste.
+                </message>
+        </alert>
+        <alert name="HelpCloudScrollX">
+                <message name="message">
+                        Controla a velocidade das nuvens que se movem na direção X.
+                </message>
+        </alert>
+        <alert name="HelpCloudScrollY">
+                <message name="message">
+                        Controla a velocidade que as núvens se movem na direção Y.
+                </message>
+        </alert>
+        <alert name="HelpClassicClouds">
+                <message name="message">
+                        Marque esta check box para permitir a reprodução das nuvens clássicas mais velhas do Second Life, além das nuvens WindLight. 
+                </message>
+        </alert>
+        <alert name="HelpWaterFogColor">
+                <message name="message">
+                        Escolhe a cor da neblina subaquática.
+                </message>
+        </alert>
+        <alert name="HelpWaterFogDensity">
+                <message name="message">
+                        Controla a densidade da neblina da água e a distância de visibilidade debaixo d&apos;água.
+                </message>
+        </alert>
+        <alert name="HelpUnderWaterFogMod">
+                <message name="message">
+                        Modifica o efeito do expoente de densidade de Neblina para controlar até onde pode ver quando o seu avatar está imerso.
+                </message>
+        </alert>
+        <alert name="HelpWaterGlow">
+                <message name="message">
+                        Controla o quanto a superfície da água deve brilhar.
+                </message>
+        </alert>
+        <alert name="HelpWaterNormalScale">
+                <message name="message">
+                        Controla o escalonamento das três marolas que compõem a água.
+                </message>
+        </alert>
+        <alert name="HelpWaterFresnelScale">
+                <message name="message">
+                        Controla o quanto de luz será refletido por ângulos diferentes.
+                </message>
+        </alert>
+        <alert name="HelpWaterFresnelOffset">
+                <message name="message">
+                        Controla o quanto da intensidade da luz é refletida.
+                </message>
+        </alert>
+        <alert name="HelpWaterScaleAbove">
+                <message name="message">
+                        Controla o quanto de luz será refratado olhando acima da superfície da água.
+                </message>
+        </alert>
+        <alert name="HelpWaterScaleBelow">
+                <message name="message">
+                        Controla o quanto de luz sera refratado visto debaixo da superfície da água.
+                </message>
+        </alert>
+        <alert name="HelpWaterBlurMultiplier">
+                <message name="message">
+                        Controla como ondas e reflexos são misturados.
+                </message>
+        </alert>
+        <alert name="HelpWaterNormalMap">
+                <message name="message">
+                        Controla o mapeamento normal em todos os níveis da água para determinar reflexões / refração.
+                </message>
+        </alert>
+        <alert name="HelpWaterWave1">
+                <message name="message">
+                        Controla como e a velocidade que a versão em escala maior do mapa move nas direções X e Y .
+                </message>
+        </alert>
+        <alert name="HelpWaterWave2">
+                <message name="message">
+                        Controla onde e a velocidade que o mapa em escala menor se move nas direções X e Y.
+                </message>
+        </alert>
+        <alert name="NewSkyPreset">
+                <message name="message">
+                        Me dê o nome para o novo céu.
+                </message>
+                <editline name="editline">
+                        Novo padrão
+                </editline>
+                <option name="OK">
+                        OK
                 </option>
                 <option name="Cancel">
-                        Cancel
+                        Cancelar
                 </option>
         </alert>
-        <alert name="IMSessionStartError">
+        <alert name="ExistsSkyPresetAlert">
+                <message name="message">
+                        Este padrão já existe!
+                </message>
+        </alert>
+        <alert name="NewWaterPreset">
                 <message name="message">
-                        Erro ao tentar um nova sessão MI com [RECIPIENT].
-                        [REASON]
+                        Dê o nome para o novo padrão de água.
                 </message>
+                <editline name="editline">
+                        Nova Apresentação
+                </editline>
                 <option name="OK">
                         OK
                 </option>
+                <option name="Cancel">
+                        Cancelar
+                </option>
+        </alert>
+        <alert name="ExistsWaterPresetAlert">
+                <message name="message">
+                        Este padrão já existe!
+                </message>
         </alert>
-        <alert name="IMSessionStartNotVerified">
+        <alert name="WaterNoEditDefault">
                 <message name="message">
-                        Erro ao tentar um nova sessão MI com [RECIPIENT].
-                        [REASON]
+                        Você não pode editar ou apagar um padrão predefinido.
+                </message>
+        </alert>
+        <alert name="ChatterBoxSessionStartError">
+                <message name="message">
+                        Não foi possível iniciar uma nova sessão bate-papo com [RECIPIENT].
+[REASON]
                 </message>
                 <option name="OK">
                         OK
                 </option>
         </alert>
-        <alert name="IMSessionEventError">
+        <alert name="ChatterBoxSessionEventError">
                 <message name="message">
-                        Erro [EVENT] [RECIPIENT].
-                        [REASON]
+                        [EVENT]
+[REASON]
                 </message>
                 <option name="OK">
                         OK
                 </option>
         </alert>
-        <alert name="ForceCloseIMSession">
-                <message name="messsage">
-                        Sua sessão com [NAME] será fechada.
-            [REASON]
+        <alert name="ForceCloseChatterBoxSession">
+                <message name="message">
+                        Sua seção de bate-papo com [NAME] tem que fechar.
+[REASON]
                 </message>
                 <option name="OK">
                         OK
@@ -3699,8 +4082,66 @@ Go to the Second Life web site for more information on partnering?
         </alert>
         <alert name="Cannot_Purchase_an_Attachment">
                 <message name="message">
-                        Os artigos não podem ser comprados
-                        enquanto forem parte de um acessório.
+                        Os itens não podem ser comprados enquanto for parte de um anexo.
+                </message>
+        </alert>
+        <alert name="DebitPermissionDetails" title="Sobre o pedido de Permissão de Débito">
+                <message name="message">
+                        Conceder esse pedido dá permissão ao script para tirar Linden dólares (L$) de sua conta. Para revogar esta permissão, o proprietário do objeto deve excluir o objeto ou resetar os scripts dele.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="AutoWearNewClothing">
+                <message name="message">
+                        Você gostaria de vestir automaticamente o item de vestuário que você criar?
+                </message>
+                <ignore name="ignore">
+                        Automaticamente vestir novo vestuário
+                </ignore>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
+        <alert name="NotAgeVerified">
+                <message name="message">
+                        Você precisa ter a idade verificada para acessar essa parcela. Gostaria de visitar o site do Second Life para verificação de idade? 
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        Alertar sobre a falta de verificação de idade
+                </ignore>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
+        <alert name="Cannot enter parcel: no payment info on file">
+                <message name="message">
+                        Esta parcela exige que você tenha informações de pagamento no arquivo antes de poder acessá-la. Gostaria de visitar o site do Second Life para configurá-lo? 
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        Avisar sobre a falta de informação de pagamento.
+                </ignore>
+                <option name="Yes">
+                        Sim
+                </option>
+                <option name="No">
+                        Não
+                </option>
+        </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        A sequência [STRING_NAME] está faltando do strings.xml
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_about.xml b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
index ec79aca..31626cc 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Sobre o Second Life">
-
+        <string name="you_are_at">
+                Você está em [POSITION]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 1a9e31f..52d57cd 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -1,227 +1,258 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floaterland" title="Sobre o Terreno">
         <tab_container name="landtab">
                 <panel label="Geral" name="land_general_panel">
-                        <text type="string" length="1" name="Name:">
+                        <text length="1" name="Name:" type="string">
                                 Nome:
                         </text>
-                        <text type="string" length="1" name="Description:">
+                        <text length="1" name="Description:" type="string">
                                 Descrição:
                         </text>
-                        <text type="string" length="1" name="Owner:">
+                        <text length="1" name="Owner:" type="string">
                                 Proprietário:
                         </text>
-                        <text type="string" length="1" name="OwnerText">
+                        <text length="1" name="OwnerText" type="string">
                                 Leyla Linden
                         </text>
-                        <button label="Perfil..." label_selected="Perfil..." name="Profile..." />
-                        <text type="string" length="1" name="Group:">
+                        <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+                        <text length="1" name="Group:" type="string">
                                 Grupo:
                         </text>
-                        <button label="Ajustar..." label_selected="Ajustar..." name="Set..." />
-                        <check_box label="Permitir posse para o grupo" name="check deed"
-                             tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha" />
-                        <button label="Passar..." label_selected="Deed..." name="Deed..."
-                             tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.." />
-                        <check_box label="Proprietário faz contribuição com acionamento" name="check contrib"
-                             tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la." />
-                        <text type="string" length="1" name="For Sale:">
+                        <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+                        <check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
+                        <button label="Passar..." label_selected="Deed..." name="Deed..." tool_tip="Você só pode acionar esta terra se você for um gerente selecionado pelo grupo.."/>
+                        <check_box label="Proprietário faz contribuição com acionamento" name="check contrib" tool_tip="Quando a terra é acionada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
+                        <text length="1" name="For Sale:" type="string">
                                 A Venda:
                         </text>
-                        <text type="string" length="1" name="Not for sale.">
+                        <text length="1" name="Not for sale." type="string">
                                 Não Está a Venda.
                         </text>
-                        <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+                        <text length="1" name="For Sale: Price L$[PRICE]." type="string">
                                 Preço: L$[PRICE].
                         </text>
-                        <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..." />
-                        <text type="string" length="1" name="For sale to">
+                        <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+                        <text length="1" name="For sale to" type="string">
                                 A venda para: [BUYER]
                         </text>
-                        <text type="string" length="1" name="Sell with landowners objects in parcel.">
+                        <text length="1" name="Sell with landowners objects in parcel." type="string">
                                 A venda (Objetos incluídos).
                         </text>
-                        <text type="string" length="1" name="Selling with no objects in parcel.">
+                        <text length="1" name="Selling with no objects in parcel." type="string">
                                 A Venda (Objetos não Incluídos).
                         </text>
-                        <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno"
-                             name="Cancel Land Sale" />
-                        <text type="string" length="1" name="Claimed:">
+                        <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" name="Cancel Land Sale" width="165" left="275"/>
+                        <text length="1" name="Claimed:" type="string">
                                 Solicitado
                         </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text length="1" name="DateClaimText" type="string">
                                 Ter Ago 15 13:47:25 2006
                         </text>
-                        <text type="string" length="1" name="PriceLabel">
+                        <text length="1" name="PriceLabel" type="string">
                                 �rea:
                         </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text length="1" name="PriceText" type="string">
                                 4048 m2.
                         </text>
-                        <text type="string" length="1" name="Traffic:">
+                        <text length="1" name="Traffic:" type="string">
                                 Tráfego:
                         </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text length="1" name="DwellText" type="string">
                                 0
                         </text>
-                        <button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..." />
-                        <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..."
-                             name="Buy For Group..." />
-                        <button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..."
-                             tool_tip="Uma passagem concede a você acesso temporário a esta terra." />
-                        <button label="Abandonar Terra.." label_selected="Abandonar Terra.."
-                             name="Abandon Land..." />
-                        <button label="Reclamar Terra..." label_selected="Reclamar Terra..."
-                             name="Reclaim Land..." />
-                        <button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..."
-                             tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão." />
-                        <text name="new users only">
+                        <button label="Comprar Terra..." label_selected="Comprar Terra..." name="Buy Land..." width="125" left="130"/>
+                        <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+                        <button label="Comprar Passe..." label_selected="Comprar Passe..." name="Buy Pass..." tool_tip="Uma passagem concede a você acesso temporário a esta terra." width="125" left="130"/>
+                        <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
+                        <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
+                        <button label="Linden Sale..." label_selected="Linden Sale..." name="Linden Sale..." tool_tip="A terra precisa ser proprietária, estar com o conteúdo configurado e não estar pronta para leilão."/>
+                        <string name="new users only">
                                 Somente novos usuários
-                        </text>
-                        <text name="anyone">
+                        </string>
+                        <string name="anyone">
                                 Qualquer um
-                        </text>
+                        </string>
+                        <string name="area_text">
+                                �rea
+                        </string>
+                        <string name="area_size_text">
+                                [AREA] m2.
+                        </string>
+                        <string name="auction_id_text">
+                                ID do Leilão: [ID]
+                        </string>
+                        <string name="need_tier_to_modify">
+                                Você deve ter sua compra aprovada para modificar este terreno.
+                        </string>
+                        <string name="group_owned_text">
+                                (Possuído pelo Grupo)
+                        </string>
+                        <string name="profile_text">
+                                Perfil...
+                        </string>
+                        <string name="info_text">
+                                Informação...
+                        </string>
+                        <string name="public_text">
+                                (público)
+                        </string>
+                        <string name="none_text">
+                                (nenhum)
+                        </string>
+                        <string name="sale_pending_text">
+                                (Venda Pendente)
+                        </string>
+                        <string name="no_selection_text">
+                                Nenhum terreno selecionado.
+Vá para o menu Mundo &gt; Sobre a Terra ou selecione outro terreno para mostrar seus detalhes.
+                        </string>
                 </panel>
                 <panel label="Corretor" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text length="1" name="covenant_timestamp_text" type="string">
                                 Última Alteração: Qua, Dez 31 16:00:00 1969
                         </text>
-                        <text type="string" length="1" name="region_name_lbl">
+                        <text length="1" name="region_name_lbl" type="string">
                                 Região:
                         </text>
-                        <text type="string" length="1" name="region_name_text">
+                        <text length="1" name="region_name_text" type="string">
                                 leyla
                         </text>
-                        <text type="string" length="1" name="estate_name_lbl">
+                        <text length="1" name="estate_name_lbl" type="string">
                                 Estado:
                         </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text length="1" name="estate_name_text" type="string">
                                 mainland
                         </text>
-                        <text type="string" length="1" name="estate_owner_lbl">
+                        <text length="1" name="estate_owner_lbl" type="string">
                                 Proprietário do Estado:
                         </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text length="1" name="estate_owner_text" type="string">
                                 (nenhum)
                         </text>
-                        <text type="string" length="1" name="resellable_clause">
+                        <text length="1" name="resellable_clause" type="string">
                                 Terra comprada nesta região não pode ser revendida.
                         </text>
-                        <text type="string" length="1" name="changeable_clause">
+                        <text length="1" name="changeable_clause" type="string">
                                 Terra comrpada nesta região não poderá ser compartilhada ou sub-dividida.
                         </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
+                        <text_editor length="1" name="covenant_editor" type="string">
                                 Não há corretor para este Estado.
                         </text_editor>
-                        <text name="can_resell">
+                        <string name="can_resell">
                                 Terra comprada nesta região pode ser revendida.
-                        </text>
-                        <text name="can_not_resell">
+                        </string>
+                        <string name="can_not_resell">
                                 Terra comprada nesta região não pode ser revendida.
-                        </text>
-                        <text name="can_change">
-                                Terra comprada nesta região pode ser compartilhada ou 
-sub-dividida.
-                        </text>
-                        <text name="can_not_change">
-                                Terra comprada nesta região não pode ser 
-compartilhada ou sub-dividida..
-                        </text>
+                        </string>
+                        <string name="can_change">
+                                Terra comprada nesta região pode ser compartilhada ou sub-dividida.
+                        </string>
+                        <string name="can_not_change">
+                                Terra comprada nesta região não pode ser compartilhada ou sub-dividida..
+                        </string>
                 </panel>
                 <panel label="Objetos" name="land_objects_panel">
-                        <text type="string" length="1" name="Simulator primitive usage:">
+                        <text name="parcel_object_bonus">
+                                Fator de Bonus para Objetos na Região: [BONUS]
+                        </text>
+                        <text length="1" name="Simulator primitive usage:" type="string">
                                 Uso do simulador de primitivas:
                         </text>
-                        <text type="string" length="1" name="Primitives parcel supports:">
+                        <text name="objects_available" left="214" width="230">
+                                [COUNT] de [MAX] ([AVAILABLE] disponíveis)
+                        </text>
+                        <string name="objects_available_text">
+                                [COUNT] de [MAX] ([AVAILABLE] disponíveis)
+                        </string>
+                        <string name="objects_deleted_text">
+                                [COUNT] de [MAX] ([DELETED] serão deletados)
+                        </string>
+                        <text length="1" name="Primitives parcel supports:" type="string" width="200">
                                 Primitivas suportadas pelo terreno:
                         </text>
-                        <text type="string" length="1" name="object_contrib_text">
+                        <text length="1" name="object_contrib_text" type="string" left="214" width="152">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Primitives on parcel:">
+                        <text length="1" name="Primitives on parcel:" type="string">
                                 Primitivas no Lote:
                         </text>
-                        <text type="string" length="1" name="total_objects_text">
+                        <text length="1" name="total_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Owned by parcel owner:">
+                        <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
                                 Pertencentes ao dono:
                         </text>
-                        <text type="string" length="1" name="owner_objects_text">
+                        <text length="1" name="owner_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" />
-                        <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..."
-                             tool_tip="Retorno os objetos aos seus proprietários." />
-                        <text type="string" length="1" name="Set to group:">
+                        <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
+                        <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Retorno os objetos aos seus proprietários." right="-10" width="119"/>
+                        <text length="1" name="Set to group:" type="string" left="14" width="180">
                                 Configurados ao grupo:
                         </text>
-                        <text type="string" length="1" name="group_objects_text">
+                        <text length="1" name="group_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" />
-                        <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..."
-                             tool_tip="Retornar os objetos para seus proprietários." />
-                        <text type="string" length="1" name="Owned by others:">
+                        <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" width="60" right="-135"/>
+                        <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar os objetos para seus proprietários." right="-10" width="119"/>
+                        <text length="1" name="Owned by others:" type="string" left="14" width="128">
                                 Propriedade de Outros:
                         </text>
-                        <text type="string" length="1" name="other_objects_text">
+                        <text length="1" name="other_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <button label="Mostrar" label_selected="Mostrar" name="ShowOther" />
-                        <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..."
-                             tool_tip="Retornar os objetos aos seus proprietários." />
-                        <text type="string" length="1" name="Selected / sat upon:">
+                        <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
+                        <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar os objetos aos seus proprietários."  right="-10" width="119"/>
+                        <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
                                 Selecionado/Sentado:
                         </text>
-                        <text type="string" length="1" name="selected_objects_text">
+                        <text length="1" name="selected_objects_text" type="string" left="214" width="48">
                                 [COUNT]
                         </text>
-                        <text type="string" length="1" name="Autoreturn">
+                        <text length="1" name="Autoreturn" type="string" width="412" left="4">
                                 Auto-retornar objetos dos outros residentes (minutos):
                         </text>
-                        <text type="string" length="1" name="Object Owners:">
-                                Proprietários dos Objetos:
-                        </text>
-                        <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List" />
-                        <button label="Objetos Retornados..." label_selected="Objetos Retornados..."
-                             name="Return objects..." />
-                        <button label="" label_selected="" name="Type" tool_tip="Organizar por Tipo" />
-                        <button label="Nome" label_selected="Nome" name="Name" tool_tip="Organizar por Nome" />
-                        <button label="Quantidade" label_selected="Quantidade" name="Count"
-                             tool_tip="Organizar por Quantidade" />
+                        <line_editor name="clean other time" right="-6" width="36" />
+                        <text length="1" name="Object Owners:" type="string">
+                                Proprietários:
+                        </text>
+                        <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List"/>
+                        <button label="Objetos Retornados..." label_selected="Objetos Retornados..." name="Return objects..."/>
+                        <name_list name="owner list">
+                                <column label="Tipo" name="type"/>
+                                <column label="Nome" name="name"/>
+                                <column label="Contar" name="count"/>
+                        </name_list>
                 </panel>
                 <panel label="Opções" name="land_options_panel">
-                        <text type="string" length="1" name="allow_label">
+                        <text length="1" name="allow_label" type="string">
                                 Permitir outros residentes a:
                         </text>
-                        <check_box label="Editar Terreno" name="edit land check" />
-                        <check_box label="Criar Landmarks" name="check landmark" />
-                        <check_box label="Voar" name="check fly" />
-                        <text type="string" length="1" name="allow_label2">
+                        <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
+                        <check_box label="Criar Landmarks" name="check landmark"/>
+                        <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
+                        <text length="1" name="allow_label2" type="string">
                                 Criar Objetos:
                         </text>
-                        <check_box label="Residentes" name="edit objects check" />
-                        <check_box label="Grupo" name="edit group objects check" />
-                        <text type="string" length="1" name="allow_label3">
+                        <check_box label="Residentes" name="edit objects check"/>
+                        <check_box label="Grupo" name="edit group objects check"/>
+                        <text length="1" name="allow_label3" type="string">
                                 Entrada do Objeto:
                         </text>
-                        <check_box label="Residentes" name="all object entry check" />
-                        <check_box label="Grupo" name="group object entry check" />
-                        <text type="string" length="1" name="allow_label4">
+                        <check_box label="Residentes" name="all object entry check"/>
+                        <check_box label="Grupo" name="group object entry check"/>
+                        <text length="1" name="allow_label4" type="string">
                                 Executar Scripts:
                         </text>
-                        <check_box label="Residentes" name="check other scripts" />
-                        <check_box label="Grupo" name="check group scripts" />
-                        <text type="string" length="1" name="land_options_label">
+                        <check_box label="Residentes" name="check other scripts"/>
+                        <check_box label="Grupo" name="check group scripts"/>
+                        <text length="1" name="land_options_label" type="string">
                                 Opções de Terra:
                         </text>
-                        <check_box label="Salvo (sem dano)" name="check safe" />
-                        <check_box label="Restrict Pushing" name="PushRestrictCheck"
-                             tool_tip="llPushObject só funcionará nos scripts do proprietário do lote ou nos scripts de quem empurra." />
-                        <check_box label="Mostrar nos locais de Busca (L$30/semana) sobre"
-                             name="ShowDirectoryCheck" />
-                        <combo_box name="land category">
+                        <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
+                        <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
+                        <check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
+                        <combo_box name="land category" left="276" width="146" >
                                 <combo_item name="AnyCategory">
                                         Qualquer Categoria
                                 </combo_item>
@@ -262,68 +293,141 @@ compartilhada ou sub-dividida..
                                         Outros
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Publicar lista na web" name="PublishCheck"
-                             tool_tip="Publicar informações do seu lote na web." />
-                        <check_box label="Mature content" name="MatureCheck"
-                             tool_tip="As informações do seu lote são consideradas para Adultos." />
-                        <button label="?" label_selected="?" name="?" />
-                        <text type="string" length="1" name="Snapshot:">
+                        <button label="?" label_selected="?" name="?" left="426"/>
+                        <check_box label="Mature content" name="MatureCheck" tool_tip="As informações do seu lote são consideradas para Adultos."/>
+                        <text length="1" name="Snapshot:" type="string">
                                 Foto:
                         </text>
-                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem" />
-                        <text type="string" length="1" name="Landing Point: (none)">
-                                Landing Point: (nenhum)
+                        <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+                        <text name="landing_point">
+                                Ponto de Aterrissagem: [LANDING]
                         </text>
-                        <button label="Set" label_selected="Ajustar" name="Set"
-                             tool_tip="Ajuste o landing point para a posição do seu avatr. Ele precisa ser dentro deste lote." />
-                        <button label="Limpar" label_selected="Limpar" name="Clear"
-                             tool_tip="Limpar o landing point." />
-                        <text type="string" length="1" name="Teleport Routing: ">
+                        <string name="landing_point_none">
+                                (nenhum)
+                        </string>
+                        <button label="Set" label_selected="Ajustar" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define a localidade para seu avatar dentro deste terreno."/>
+                        <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o landing point."/>
+                        <text length="1" name="Teleport Routing: " type="string">
                                 Rota de Tele-transporte:
                         </text>
-                        <combo_box name="landing type"
-                             tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote.">
-                                <combo_item type="string" length="1" name="Blocked">
+                        <combo_box name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." left="140" width="140" >
+                                <combo_item length="1" name="Blocked" type="string">
                                         Bloqueado
                                 </combo_item>
-                                <combo_item type="string" length="1" name="LandingPoint">
+                                <combo_item length="1" name="LandingPoint" type="string">
                                         Landing Point
                                 </combo_item>
-                                <combo_item type="string" length="1" name="Anywhere">
+                                <combo_item length="1" name="Anywhere" type="string">
                                         Qualquer lugar
                                 </combo_item>
                         </combo_box>
+                        <string name="push_restrict_text">
+                                Sem Empurrar
+                        </string>
+                        <string name="push_restrict_region_text">
+                                Sem Empurrar (Imposição na Região)
+                        </string>
                 </panel>
                 <panel label="Mídia" name="land_media_panel">
-                        <check_box label="Restringir som espacial a este lote" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
-                                URL Música:
-                        </text>
-                        <text type="string" length="1" name="Media texture:">
-                                Textura de Mídia:
+                        <text name="with media:" width="85">
+                                Tipo de Mídia:
                         </text>
-                        <text type="string" length="1" name="Replace this texture:">
-                                Substituir esta Textura:
+                        <combo_box name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mídia" left="97"/>
+                        <text name="at URL:" width="85">
+                                URL da Mídia:
                         </text>
-                        <texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" />
-                        <text type="string" length="1" name="with content from this URL:">
-                                com conteúdo desta URL:
+                        <line_editor name="media_url" left="97"/>
+                        <button label="Definir..." label_selected="Ajustar..." name="set_media_url"/>
+                        <text name="Description:">
+                                Descrição:
                         </text>
-                        <check_box label="Conteudo Auto-Ajustavel (lento e reduz a qualidade visual)"
-                             name="media_auto_scale"
-                             tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário." />
+                        <line_editor name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar" left="97"/>
+                        <text length="1" name="Media texture:" type="string">
+                                Substituir
+Textura:
+                        </text>
+                        <texture_picker label="" name="media texture" tool_tip="Clique para escolher uma imagem" left="97"/>
+                        <text name="replace_texture_help">
+                                (Objetos usando esta textura, mostrarão o filme ou
+a página web depois que você clicar na seta de
+reproduzir.)
+                        </text>
+                        <text name="Options:">
+                                Opções de
+Mídia:
+                        </text>
+                        <check_box left="97" label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. O lote pode se tornar lento e com baixa qualidade visual nenhum outro ajuste de textura ou alinhamento será necessário."/>
+                        <check_box label="Mídia em Repetição" name="media_loop" tool_tip="Executar a mídia repetidamente. Quando a mídia terminar a execução, ela reiniciará do começo."/>
+                        <check_box left="97" label="Esconder a URL da Mídia" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do terreno. Notar que isto não está disponível para tipos HTML."/>
+                        <check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do terreno"/>
+                        <text name="media_size" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." width="115" left="102">
+                                Tamanho da mídia:
+                        </text>
+                        <spinner name="media_size_width" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão." left_delta="99"/>
+                        <spinner name="media_size_height" tool_tip="Tamanho para desenhar a mídia Web, deixar 0 como padrão."/>
+                        <text name="pixels">
+                                pixels
+                        </text>
+                        <text name="MusicURL:">
+                                URL da Música:
+                        </text>
+                        <line_editor name="music_url" left="97"/>
+                        <text name="Sound:">
+                                Som:
+                        </text>
+                        <check_box label="Restringir som espacial a este lote" name="check sound local" left="97"/>
+                        <text name="Voice settings:">
+                                Voz:
+                        </text>
+                        <radio_group name="parcel_voice_channel" left="97" width="310">
+                                <radio_item name="Estate">
+                                        Usar o canal espacial da Propriedade
+                                </radio_item>
+                                <radio_item name="Private">
+                                        Usar um canal especial privado
+                                </radio_item>
+                                <radio_item name="Disabled">
+                                        Desabilitar áudio espacial neste terreno
+                                </radio_item>
+                        </radio_group>
                 </panel>
                 <panel label="Acesso" name="land_access_panel">
-                        <text type="string" length="1" name="Limit access to this parcel to:">
-                                Limitar acesso a este lote a:
-                        </text>
-                        <check_box label="Grupo: (nenhum)" name="GroupCheck" />
-                        <text name="BanCheck">Banir estes Avatares:</text>
-                        <button label="Incluir..." label_selected="Incluir..." name="add_banned" />
-                        <button label="Remover" label_selected="Remover" name="remove_banned" />
-                        <check_box label="Vender passes permitindo acesso temporário:" name="PassCheck" />
-                        <spinner label="Preço em L$:" name="PriceSpin" />
-                        <spinner label="Horas de Acesso:" name="HoursSpin" />
+                        <text length="1" name="Limit access to this parcel to:" type="string">
+                                Acesso a Este Terreno
+                        </text>
+                        <check_box label="Permitir Acesso Público" name="public_access"/>
+                        <text name="Only Allow">
+                                Bloquear Acesso por:
+                        </text>
+                        <check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+                        <check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
+                        <string name="estate_override">
+                                Uma ou mais destas opções está definida no nível de propriedade.
+                        </string>
+                        <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
+                        <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
+                        <combo_box name="pass_combo">
+                                <combo_item name="Anyone">
+                                        Qualquer um
+                                </combo_item>
+                                <combo_item name="Group">
+                                        Grupo
+                                </combo_item>
+                        </combo_box>
+                        <spinner label="Preço em L$:" name="PriceSpin"/>
+                        <spinner label="Horas de Acesso:" name="HoursSpin"/>
+                        <text label="Permitir Sempre" name="AllowedText">
+                                Residentes Permitidos
+                        </text>
+                        <name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+                        <button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
+                        <button label="Remover" label_selected="Remover" name="remove_allowed"/>
+                        <text label="Banir" name="BanCheck">
+                                Residentes Banidos
+                        </text>
+                        <name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+                        <button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
+                        <button label="Remover" label_selected="Remover" name="remove_banned"/>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
new file mode 100644
index 0000000..100e819
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="active_speakers" title="Active Speakers">

+        <panel name="active_speakers_panel">

+                <panel name="volume_container">

+                        <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>

+                </panel>

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index 6d7d76c..3f30bdf 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Animation Preview" title="">
         <text name="name_label">
                 Nome:
@@ -6,36 +6,14 @@
         <text name="description_label">
                 Descrição:
         </text>
-        <spinner label="Prioridade" name="priority"
-             tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras." />
-        <text name="preview_label">
-                Prever enquanto
-        </text>
-        <combo_box label="" name="preview_base_anim"
-             tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
-                <combo_item name="Standing">
-                        Parado
-                </combo_item>
-                <combo_item name="Walking">
-                        Andando
-                </combo_item>
-                <combo_item name="Sitting">
-                        Sentando
-                </combo_item>
-                <combo_item name="Flying">
-                        Voando
-                </combo_item>
-        </combo_box>
-        <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente." />
-        <spinner label="Dentro(%)" name="loop_in_point"
-             tool_tip="Ajusta o ponto onde a repetição começa." />
-        <spinner label="Fora(%)" name="loop_out_point"
-             tool_tip="Ajusta o ponto onde a repetição termina." />
+        <spinner label="Prioridade" name="priority" tool_tip="Controle com o qual umas animações podem ser sobrepostas por outras."/>
+        <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
+        <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto onde a repetição começa."/>
+        <spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto onde a repetição termina."/>
         <text name="hand_label">
                 Posição Manual
         </text>
-        <combo_box label="" name="hand_pose_combo"
-             tool_tip="Controla o que as mãos fazem durante a animação">
+        <combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
                 <combo_item name="Spread">
                         Espreguiçar
                 </combo_item>
@@ -79,8 +57,7 @@
         <text name="emote_label">
                 Expressão
         </text>
-        <combo_box label="" name="emote_combo"
-             tool_tip="Controla o que a face faz durante a animação.">
+        <combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
                 <combo_item name="[None]">
                         [None]
                 </combo_item>
@@ -142,16 +119,44 @@
                         Preocupado
                 </combo_item>
         </combo_box>
-        <spinner label="Ease In (sec)" name="ease_in_time"
-             tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem." />
-        <spinner label="Ease Out (sec)" name="ease_out_time"
-             tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem." />
-        <button label="" name="play_btn" tool_tip="Executa/pausa sua animação." />
-        <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação." />
-        <slider label="" name="playback_slider" />
+        <text name="preview_label">
+                Prever enquanto
+        </text>
+        <combo_box label="" name="preview_base_anim" tool_tip="Use isso para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+                <combo_item name="Standing">
+                        Parado
+                </combo_item>
+                <combo_item name="Walking">
+                        Andando
+                </combo_item>
+                <combo_item name="Sitting">
+                        Sentando
+                </combo_item>
+                <combo_item name="Flying">
+                        Voando
+                </combo_item>
+        </combo_box>
+        <spinner label="Ease In (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+        <spinner label="Ease Out (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+        <button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+        <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
+        <slider label="" name="playback_slider"/>
         <text name="bad_animation_text">
                 Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
         </text>
-        <button label="Cancelar" name="cancel_btn" />
-        <button label="Carregar (L$[AMOUNT])" name="ok_btn" />
+        <button label="Cancelar" name="cancel_btn"/>
+        <button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
+        <string name="failed_to_initialize">
+                Não foi possível iniciar o movimento
+        </string>
+        <string name="anim_too_long">
+                O arquivo de animação tem [LENGTH] segundos de duração. 
+
+Duração maxima de animação permitida é de [MAX_LENGTH] segundos.
+        </string>
+        <string name="failed_file_read">
+                Não foi possível ler o arquivo de animação.
+
+[STATUS]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index db3f83f..79a1086 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatarpicker" title="Escolha de pessoa">
-        <text name="Type part of the resident&apos;s name:">
-                Digite o nome da pessoa:
+        <text name="instruct_search_resident_name">
+                Digitar parte do nome do residente:
         </text>
-        <button label="Encontrar" label_selected="Encontrar" name="Find" />
+        <button label="Encontrar" label_selected="Encontrar" name="Find"/>
         <text name="Or select their calling card:">
                 Ou selecione um cartão:
         </text>
-        <button label="Selecionar" label_selected="Selecionar" name="Select" />
-        <button label="Fechar" label_selected="Fechar" name="Close" />
-        <text name="NotFound">
+        <button label="Fechar" label_selected="Fechar" name="Close"/>
+        <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+        <string name="NotFound">
                 &apos;[TEXT]&apos; não encontrado
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index f885d6c..2e0aacb 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="avatar_texture_debug" title="Textura do Avatar">
-        <text name="">
-                Texturas prontas
+        <text name="baked_label">
+                Texturas sobrepostas
         </text>
-        <text name="">
-                Texturas Compostas
+        <text name="composite_label">
+                Texturas compostas
         </text>
-        <texture_picker label="Cabeça" name="baked_head" />
-        <texture_picker label="Maquiagem" name="head_bodypaint" />
-        <texture_picker label="Cabelo" name="hair" />
-        <button label="Tombar" label_selected="Tombar" name="Dump" />
-        <texture_picker label="Olhos" name="baked_eyes" />
-        <texture_picker label="Olho" name="eye_texture" />
-        <texture_picker label="Parte de cima" name="baked_upper_body" />
-        <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint" />
-        <texture_picker label="Camiseta" name="undershirt" />
-        <texture_picker label="Luvas" name="gloves" />
-        <texture_picker label="Camisa" name="shirt" />
-        <texture_picker label="Jaqueta" name="upper_jacket" />
-        <texture_picker label="Parte de baixo" name="baked_lower_body" />
-        <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint" />
-        <texture_picker label="Roupas de baixo" name="underpants" />
-        <texture_picker label="Meias" name="socks" />
-        <texture_picker label="Calçados" name="shoes" />
-        <texture_picker label="Calças" name="pants" />
-        <texture_picker label="Jaqueta" name="jacket" />
-        <texture_picker label="Saia" name="baked_skirt" />
-        <texture_picker label="Saia" name="skirt_texture" />
+        <texture_picker label="Cabeça" name="baked_head"/>
+        <texture_picker label="Maquiagem" name="head_bodypaint"/>
+        <texture_picker label="Cabelo" name="hair"/>
+        <button label="Tombar" label_selected="Tombar" name="Dump"/>
+        <texture_picker label="Olhos" name="baked_eyes"/>
+        <texture_picker label="Olho" name="eye_texture"/>
+        <texture_picker label="Parte de cima" name="baked_upper_body"/>
+        <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
+        <texture_picker label="Camiseta" name="undershirt"/>
+        <texture_picker label="Luvas" name="gloves"/>
+        <texture_picker label="Camisa" name="shirt"/>
+        <texture_picker label="Jaqueta" name="upper_jacket"/>
+        <texture_picker label="Parte de baixo" name="baked_lower_body"/>
+        <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
+        <texture_picker label="Roupas de baixo" name="underpants"/>
+        <texture_picker label="Meias" name="socks"/>
+        <texture_picker label="Calçados" name="shoes"/>
+        <texture_picker label="Calças" name="pants"/>
+        <texture_picker label="Jaqueta" name="jacket"/>
+        <texture_picker label="Saia" name="baked_skirt"/>
+        <texture_picker label="Saia" name="skirt_texture"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml b/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
new file mode 100644
index 0000000..244a7db
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_beacons.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="beacons" title="Balizas">

+        <panel name="beacons_panel">

+                <check_box label="Objetos escriptados com toque único" name="touch_only"/>

+                <check_box label="Objetos escriptados" name="scripted"/>

+                <check_box label="Objetos físicos" name="physical"/>

+                <check_box label="Fontes de Som" name="sounds"/>

+                <check_box label="Fontes de Partículas" name="particles"/>

+                <check_box label="Renderização de Highlights" name="highlights"/>

+                <check_box label="Renderização de Balizas" name="beacons"/>

+                <text name="beacon_width_label">

+                        Largura da Baliza

+                </text>

+        </panel>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
index 08ee8f7..4dfebc3 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="build options floater" title="Opções de grade">
-        <spinner label="Uni. Grade (metros)" name="GridResolution" />
-        <spinner label="Ext. da Grade (metros)" name="GridDrawSize" />
-        <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit" />
-        <slider label="Opacidade da grade" name="GridOpacity" />
+        <spinner label="Uni. Grade (metros)" name="GridResolution"/>
+        <spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+        <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
+        <check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
+        <slider label="Opacidade da grade" name="GridOpacity"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index 74bb568..0c1fb77 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_buy_contents" title="Comprar conteúdo">
         <text name="contains_text">
                 [NAME] contém:
@@ -6,7 +6,16 @@
         <text name="buy_text">
                 Comprar por L$[AMOUNT] de(a) [NAME]?
         </text>
-        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
-        <button label="Comprar" label_selected="Comprar" name="buy_btn" />
-        <check_box label="Vestir roupa agora" name="wear_check" />
+        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+        <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+        <check_box label="Vestir roupa agora" name="wear_check"/>
+        <string name="no_copy_text">
+                (sem copiar)
+        </string>
+        <string name="no_modify_text">
+                (sem modificar)
+        </string>
+        <string name="no_transfer_text">
+                (sem transferir)
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index 0438d98..4c4e4c4 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -1,10 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy currency" title="Adquira Lindens (L$)">
-        <text name="cp">
-                A partir de agora você já pode comprar seus Lindens. 
-
-Para isso, siga até o menu superior e clique no item 
-Seviços e em seguida selecione &quot;Compra de Lindens&quot;.
+        <text name="info_buying">
+                Comprando Moeda:
         </text>
-        <button label="Fechar" name="cancel_btn" />
+        <text name="info_cannot_buy">
+                Não pode comprar agora:
+        </text>
+        <text name="info_need_more">
+                Você precisa de mais moeda:
+        </text>
+        <text name="error_message">
+                Algo não está certo.
+        </text>
+        <button label="Ir para website" name="error_web"/>
+        <text name="contacting">
+                Contatando LindeX...
+        </text>
+        <text name="buy_action_unknown">
+                Comprar L$ sobre o câmbio corrente da LindeX
+        </text>
+        <text name="buy_action">
+                [NAME] L$ [PRICE]
+        </text>
+        <text name="currency_action">
+                Comprar L$
+        </text>
+        <line_editor name="currency_amt">
+                1234
+        </line_editor>
+        <text name="currency_est">
+                por aproxim. US$ [USD]
+        </text>
+        <text name="getting_data">
+                Primeiros dados...
+        </text>
+        <text name="balance_label">
+                Você tem atualmente
+        </text>
+        <text name="balance_amount">
+                L$ [AMT]
+        </text>
+        <text name="buying_label">
+                Você está comprando
+        </text>
+        <text name="buying_amount">
+                L$ [AMT]
+        </text>
+        <text name="total_label">
+                Seu saldo será
+        </text>
+        <text name="total_amount">
+                L$ [AMT]
+        </text>
+        <text name="purchase_warning_repurchase">
+                Confirmando esta compra só compra a moeda.
+Você precisará tentar novamente a operação.
+        </text>
+        <text name="purchase_warning_notenough">
+                Você não está comprando moeda suficiente.
+Aumente a quantidade de compra.
+        </text>
+        <button label="Fechar" name="cancel_btn"/>
+        <button label="Adquirir" name="buy_btn"/>
+        <string name="buy_currency">
+                Comprar L$ [LINDENS] por aproximadamente US$ [dólares americanos]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 5901aa6..3eb7266 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="buy land" title="Comprar terreno">
         <text name="region_name_label">
                 Região:
@@ -33,8 +33,7 @@
         <text_editor name="covenant_editor">
                 Carregando...
         </text_editor>
-        <check_box label="Eu concordo com as definições do Corretor feitas acima."
-             name="agree_covenant" />
+        <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
         <text name="info_parcel_label">
                 Lote:
         </text>
@@ -59,7 +58,7 @@
         <text name="error_message">
                 Algo ainda não está correto.
         </text>
-        <button label="Ir para a página" name="error_web" />
+        <button label="Ir para a página" name="error_web"/>
         <text name="account_action">
                 Evoluir sua conta para membro Premium
         </text>
@@ -81,8 +80,8 @@
                 Aumente sua taxa de locação de lote para US$ 40/mês.
         </text>
         <text name="land_use_reason">
-                Você possui 1,309 metros quadrados de terra.
-Este lote tem 512 metros quadrados.
+                Você possui 1.309 metros quadrados de terra. 
+Este terreno tem 512 metros quadrados de terra.
         </text>
         <text name="purchase_action">
                 Pagar ao Residente Joe L$4000 pelo lote
@@ -97,130 +96,130 @@ Este lote tem 512 metros quadrados.
                 1000
         </line_editor>
         <text name="currency_est">
-                por aproximadamente US$ [AMOUNT2]
+                por aproxim. US$ [AMOUNT2]
         </text>
         <text name="currency_balance">
                 Você tem L$2,100.
         </text>
-        <check_box label="Remover Contribuição do Grupo nas Aquisições"
-             name="remove_contribution" />
-        <button label="Adquirir" name="buy_btn" />
-        <button label="Cancelar" name="cancel_btn" />
-        <text name="can_resell">
+        <check_box label="Remover Contribuição do Grupo nas Aquisições" name="remove_contribution"/>
+        <button label="Adquirir" name="buy_btn"/>
+        <button label="Cancelar" name="cancel_btn"/>
+        <string name="can_resell">
                 Pode ser revendida.
-        </text>
-        <text name="can_not_resell">
+        </string>
+        <string name="can_not_resell">
                 Não pode ser revendida.
-        </text>
-        <text name="can_change">
+        </string>
+        <string name="can_change">
                 Pode ser unida ou subdivida.
-        </text>
-        <text name="can_not_change">
+        </string>
+        <string name="can_not_change">
                 Não pode ser unida ou subdividida.
-        </text>
-        <text name="cant_buy_for_group">
+        </string>
+        <string name="cant_buy_for_group">
                 Você não tem permissão para comprar um lote para seu grupo ativo.
-        </text>
-        <text name="no_land_selected">
+        </string>
+        <string name="no_land_selected">
                 Nenhum lote selecionado.
-        </text>
-        <text name="multiple_parcels_selected">
-                Vários lotes diferentes selecionados. 
-Tente selecionar uma área menor.
-        </text>
-        <text name="no_permission">
+        </string>
+        <string name="multiple_parcels_selected">
+                Múltiplos e diferentes terrenos selecionados. Tente selecionar uma área menor.
+        </string>
+        <string name="no_permission">
                 Você não tem permissão para comprar um lote para seu grupo ativo.
-        </text>
-        <text name="parcel_not_for_sale">
+        </string>
+        <string name="parcel_not_for_sale">
                 O lote selecionado não está a venda.
-        </text>
-        <text name="group_already_owns">
+        </string>
+        <string name="group_already_owns">
                 O grupo já possui o lote.
-        </text>
-        <text name="you_already_own">
+        </string>
+        <string name="you_already_own">
                 Você já possui o lote.
-        </text>
-        <text name="set_to_sell_to_other">
+        </string>
+        <string name="set_to_sell_to_other">
                 O lote selecionado está configurado para ser vendido para outro grupo.
-        </text>
-        <text name="no_public_land">
+        </string>
+        <string name="no_public_land">
                 A área selecionada não é um lote público.
-        </text>
-        <text name="not_owned_by_you">
-                O lote possuído por outro proprietário está selecionado.
-Tente uma área menor.
-        </text>
-        <text name="processing">
+        </string>
+        <string name="not_owned_by_you">
+                Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+        </string>
+        <string name="processing">
                 Processando sua compra...
  
 (Isso pode levar um minuto.)
-        </text>
-        <text name="fetching_error">
+        </string>
+        <string name="fetching_error">
                 Houve um erro ao buscar informações sobre compra de lotes.
-        </text>
-        <text name="buying_will">
+        </string>
+        <string name="buying_will">
                 Comprar este lote irá:
-        </text>
-        <text name="buying_for_group">
+        </string>
+        <string name="buying_for_group">
                 Comprar terra para o grupo:
-        </text>
-        <text name="cannot_buy_now">
+        </string>
+        <string name="cannot_buy_now">
                 Não foi possível comprar agora:
-        </text>
-        <text name="not_for_sale">
+        </string>
+        <string name="not_for_sale">
                 Não disponível para venda:
-        </text>
-        <text name="none_needed">
+        </string>
+        <string name="none_needed">
                 não necessário
-        </text>
-        <text name="must_upgrade">
+        </string>
+        <string name="must_upgrade">
                 Sua conta deve ser evoluída para adquirir um lote.
-        </text>
-        <text name="cant_own_land">
+        </string>
+        <string name="cant_own_land">
                 Sua conta pode possuir um lote.
-        </text>
-        <text name="first_purchase">
-                Esta será sua primeira compra de lote. Será a única vez que você poderá adquirir um lote reservado para &quot;Primeira Compra&quot;.
-        </text>
-        <text name="land_holdings">
+        </string>
+        <string name="land_holdings">
                 Você possui [BUYER] metros quadrados de terra.
-        </text>
-        <text name="pay_to_for_land">
+        </string>
+        <string name="pay_to_for_land">
                 Pagar L$ [AMOUNT] para [SELLER] por este lote
-        </text>
-        <text name="buy_for_US">
+        </string>
+        <string name="buy_for_US">
                 Comprar L$ [AMOUNT] por aproximadamente US$ [AMOUNT2] ,
-        </text>
-        <text name="parcel_meters">
+        </string>
+        <string name="parcel_meters">
                 Este lote está a [AMOUNT] metros quadrados.
-        </text>
-        <text name="premium_land">
+        </string>
+        <string name="premium_land">
                 Este lote é Premium, e irá cobrar como [AMOUNT] metros quadrados.
-        </text>
-        <text name="discounted_land">
+        </string>
+        <string name="discounted_land">
                 Este lote é promocional, e será cobrado como [AMOUNT] metros quadrados.
-        </text>
-        <text name="meters_supports_object">
+        </string>
+        <string name="meters_supports_object">
                 [AMOUNT] metros quadrados
 suporta [AMOUNT2] objetos
-        </text>
-        <text name="sold_with_objects">
+        </string>
+        <string name="sold_with_objects">
                 vendido com objetos
-        </text>
-        <text name="insufficient_land_credits">
+        </string>
+        <string name="insufficient_land_credits">
                 O grupo [GROUP] precisará de fundos suficientes de terras
 contribuídas para cobrir este lote antes da aquisição se completar.
-        </text>
-        <text name="have_enough_lindens">
+        </string>
+        <string name="have_enough_lindens">
                 Você tem L$ [AMOUNT], o qual é suficiente para comprar este lote.
-        </text>
-        <text name="not_enough_lindens">
+        </string>
+        <string name="not_enough_lindens">
                 Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
-        </text>
-        <text name="balance_left">
+        </string>
+        <string name="balance_left">
                 Após a compra, restará L$ [AMOUNT].
-        </text>
-        <text name="balance_needed">
+        </string>
+        <string name="balance_needed">
                 Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
-        </text>
+        </string>
+        <string name="no_parcel_selected">
+                (nenhum terreno selecionado)
+        </string>
+        <string name="buy_currency">
+                Comprar L$ [LINDENS] por aproxim. US$ [USD]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index 82cd146..e5aa919 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="contents" title="Comprar cópia do objeto">
         <text name="contents_text">
                 e isso contém:
@@ -6,6 +6,21 @@
         <text name="buy_text">
                 Comprar por L$[AMOUNT] de(a) [NAME]?
         </text>
-        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
-        <button label="Comprar" label_selected="Comprar" name="buy_btn" />
+        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+        <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+        <string name="title_buy_text">
+                Comprar
+        </string>
+        <string name="title_buy_copy_text">
+                Comprar uma cópia de
+        </string>
+        <string name="no_copy_text">
+                (sem copiar)
+        </string>
+        <string name="no_modify_text">
+                (sem modificar)
+        </string>
+        <string name="no_transfer_text">
+                (sem transferir)
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_camera.xml b/linden/indra/newview/skins/default/xui/pt/floater_camera.xml
new file mode 100644
index 0000000..435ba62
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="move floater" title="">

+        <string name="rotate_tooltip">

+                Girar a Câmera ao redor do Foco

+        </string>

+        <string name="zoom_tooltip">

+                Aproximar a Câmera in direção ao Foco

+        </string>

+        <string name="move_tooltip">

+                Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita

+        </string>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
index 9471c77..5466467 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
@@ -1,6 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="Histórico de chat">
-        <button label="Chat" name="Chat" />
-        <button label="Mudo" name="Mute resident" />
-        <check_box label="Exibir texto silenciado" name="show mutes" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="chat floater" title="Conversa Local">
+        <string name="ringing">
+                Conectando à conversa de Voz no mundo
+        </string>
+        <string name="connected">
+                Conectado
+        </string>
+        <string name="unavailable">
+                Voz não disponível na sua localização atual
+        </string>
+        <string name="hang_up">
+                Desconectado da conversa de Voz no mundo
+        </string>
+        <string name="voice_icon">
+                icn_voice-localchat.tga
+        </string>
+        <string name="IM_logging_string">
+                -- log ativado de Mensagem Instantânea --
+        </string>
+        <string name="IM_end_log_string">
+                -- Fim do Log --
+        </string>
+        <layout_stack name="panels">
+                <layout_panel name="im_contents_panel">
+                        <combo_box label="Gestos" name="Gesture">
+                                <combo_item name="Gestures">
+                                        Gestos
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="Mostrar texto silenciado" name="show mutes"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para mostrar uma lista dos participantes ativos desta sessão de mensagem instantânea."/>
+                        <panel name="chat_panel">
+                                <string name="gesture_label">
+                                        Gestos
+                                </string>
+                                <line_editor label="Clique aqui para conversar." name="Chat Editor"/>
+                                <flyout_button label="Falar" name="Say" tool_tip="(Inserir)">
+                                        <flyout_button_item name="shout_item">
+                                                Gritar
+                                        </flyout_button_item>
+                                        <flyout_button_item name="say_item">
+                                                Falar
+                                        </flyout_button_item>
+                                        <flyout_button_item name="whisper_item">
+                                                Sussurrar
+                                        </flyout_button_item>
+                                </flyout_button>
+                        </panel>
+                </layout_panel>
+        </layout_stack>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 085dd5a..900c1bc 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -10,7 +10,7 @@
                 Azul:
         </text>
         <text name="h_val_text">
-                Luminosidade:
+                Hue:
         </text>
         <text name="s_val_text">
                 Sat:
@@ -26,6 +26,7 @@
                 Cor atual:
         </text>
         <text name="(Drag below to save.)">
-                (Arraste abaixo para salvar.)
+                (Arraste abaixo
+para salvar.)
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_customize.xml b/linden/indra/newview/skins/default/xui/pt/floater_customize.xml
index 5b86c0b..a0a28e1 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,437 +1,453 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="Aparência">
-        <tab_container name="customize tab container">
-                <panel label="Partes de Corpo" />
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Aparência" width="513">
+        <tab_container name="customize tab container" tab_min_width="115" width="511">
+                <panel label="Partes de corpo" name="body_parts_placeholder"/>
                 <panel label="Forma" name="Shape">
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
-                        <button label="Corpo" label_selected="Corpo" name="Body" />
-                        <button label="Cabeça" label_selected="Cabeça" name="Head" />
-                        <button label="Olhos" label_selected="Olhos" name="Eyes" />
-                        <button label="Orelhas" label_selected="Orelhas" name="Ears" />
-                        <button label="Nariz" label_selected="Nariz" name="Nose" />
-                        <button label="Boca" label_selected="Boca" name="Mouth" />
-                        <button label="Queixo" label_selected="Queixo" name="Chin" />
-                        <button label="Tórax" label_selected="Tórax" name="Torso" />
-                        <button label="Pernas" label_selected="Pernas" name="Legs" />
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
+                        <button label="Corpo" label_selected="Corpo" name="Body"/>
+                        <button label="Cabeça" label_selected="Cabeça" name="Head"/>
+                        <button label="Olhos" label_selected="Olhos" name="Eyes"/>
+                        <button label="Orelhas" label_selected="Orelhas" name="Ears"/>
+                        <button label="Nariz" label_selected="Nariz" name="Nose"/>
+                        <button label="Boca" label_selected="Boca" name="Mouth"/>
+                        <button label="Queixo" label_selected="Queixo" name="Chin"/>
+                        <button label="Tórax" label_selected="Tórax" name="Torso"/>
+                        <button label="Pernas" label_selected="Pernas" name="Legs"/>
                         <radio_group name="sex radio">
-                                <radio_item type="string" length="1" name="radio">
+                                <radio_item length="1" name="radio" type="string">
                                         Feminino
                                 </radio_item>
-                                <radio_item type="string" length="1" name="radio2">
+                                <radio_item length="1" name="radio2" type="string">
                                         Masculino
                                 </radio_item>
                         </radio_group>
-                        <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-                        <text type="string" length="1" name="title">
+                        <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Coloque um novo formato arrastando um dos seus de seu  inventário para seu avatar. Alternativamente, você pode criar um novo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Coloque um novo formato arrastando um dos seus de seu inventário
+para seu avatar. Alternativamente, você pode criar um novo a partir
+deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar esta vestimenta.
                         </text>
-                        <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
+                        <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
                 </panel>
                 <panel label="Pele" name="Skin">
-                        <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color" />
-                        <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail" />
-                        <button label="Maquiagem" label_selected="Maquiagem" name="Makeup" />
-                        <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail" />
-                        <text type="string" length="1" name="title">
+                        <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
+                        <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
+                        <button label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
+                        <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando..
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizada em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Coloque uma nova pele arrastando uma de seu inventário para seu avatar. Alternativamente, você pode criar uma nova forma a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
+Alternativamente, você pode criar uma nova forma a partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar esta vestimenta.
                         </text>
-                        <texture_picker label="Tatuagens para cabeça" name="Head Tattoos"
-                             tool_tip="Clique para escolher um desenho" />
-                        <texture_picker label="Tattoos Superiores" name="Upper Tattoos"
-                             tool_tip="Clique para escolher um desenho" />
-                        <texture_picker label="Tattoos Inferiores" name="Lower Tattoos"
-                             tool_tip="Clique para escolher um desenho" />
-                        <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-                        <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tatuagens para cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
+                        <texture_picker label="Tattoos Superiores" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
+                        <texture_picker label="Tattoos Inferiores" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
+                        <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+                        <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Cabelo" name="Hair">
-                        <button label="Cor" label_selected="Cor" name="Color" />
-                        <button label="Estilo" label_selected="Estilo" name="Style" />
-                        <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows" />
-                        <button label="Rosto" label_selected="Rosto" name="Facial" />
-                        <text type="string" length="1" name="title">
+                        <button label="Cor" label_selected="Cor" name="Color"/>
+                        <button label="Estilo" label_selected="Estilo" name="Style"/>
+                        <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
+                        <button label="Rosto" label_selected="Rosto" name="Facial"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Ponha um novo cabelo em seu avatar arrastando um do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
+Alternativamente, você pode criar um novo modelo a partir deste e
+usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não ter permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem" />
-                        <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-                        <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
+                        <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+                        <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Olhos" name="Eyes">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para colocar novos olhos, arraste um do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para colocar novos olhos, arraste um do seu inventário para seu avatar.
+Alternativamente, você pode criar um novo modelo a partir deste e
+usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para alterar esta vestimenta.
                         </text>
-                        <texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem" />
-                        <button label="Aleatório" label_selected="Aleatório" name="Randomize" />
-                        <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Iris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
+                        <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+                        <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
-                <panel label="Roupas" />
+                <panel label="Roupas" name="clothes_placeholder"/>
                 <panel label="Camisa" name="Shirt">
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-                        <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
-                        <text type="string" length="1" name="title">
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+                        <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova camisa em seu avatar, arraste uma nova do seu inventário para seu avatar. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova camisa em seu avatar, arraste uma nova do seu
+inventário para seu avatar. Alternativamente, você pode criar um
+novo modelo a partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não ter permissão para modificar esta vestimenta.
                         </text>
                 </panel>
                 <panel label="Calças" name="Pants">
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas." />
-                        <button label="Criar Novas Calças" label_selected="Criar Novas Calças"
-                             name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
-                        <text type="string" length="1" name="title">
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
+                        <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestindo
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova calça em seu avatar, basta arrastar uma outra do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar esta vestimenta.
                         </text>
                 </panel>
                 <panel label="Calçados" name="Shoes">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por novos calçados em seu avatar, basta arrastar um novo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por novos calçados em seu avatar, basta arrastar um novo do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar esta vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-                        <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos"
-                             name="Create New" />
-                        <button label="Despir" label_selected="Despir" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+                        <button label="Criar Novos Calçados" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
+                        <button label="Despir" label_selected="Despir" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Meias" name="Socks">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido.
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova meia em seu avatar, basta arrastar uma nova do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova meia em seu avatar, basta arrastar uma nova do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-                        <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+                        <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Jaqueta" name="Jacket">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: Não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar esta vestimenta.
                         </text>
-                        <texture_picker label="Tecido Superior" name="Upper Fabric"
-                             tool_tip="Clique para escolher uma imagem." />
-                        <texture_picker label="Tecido Inferior" name="Lower Fabric"
-                             tool_tip="Clique para escolher uma imagem." />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-                        <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta"
-                             name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+                        <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+                        <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Luvas" name="Gloves">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando....
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Pra por uma nova jaqueta em seu avatar, basta arastar um novo modelo do seu inventário. Alternativamente, você pode criar uma novo modlo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Pra por uma nova jaqueta em seu avatar, basta arastar um novo modelo
+do seu inventário. Alternativamente, você pode criar uma novo modelo a
+partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
-                        <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+                        <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Camiseta" name="Undershirt">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova Camiseta em seu avatar, basta arrastar um novo modelo de seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova Camiseta em seu avatar, basta arrastar um novo
+modelo de seu inventário. Alternativamente, você pode criar um
+novo modelo a partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não ter permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas" />
-                        <button label="Criar Nova Roupa de Baixo" label_selected="Criar Nova Roupa de Baixo"
-                             name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+                        <button label="Criar Nova Camiseta" label_selected="Criar Nova Roupa de Baixo" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Roupas de Baixo" name="Underpants">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por novas roupas de baixo em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por novas roupas de baixo em seu avatar, basta arrastar um novo
+modelo do seu inventário. Alternativamente, você pode criar um novo
+modelo a partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas" />
-                        <button label="Criar Novas Roupas de Baixo"
-                             label_selected="Criar Novas Roupas de Baixo" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+                        <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="176"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
                 <panel label="Saia" name="Skirt">
-                        <text type="string" length="1" name="title">
+                        <text length="1" name="title" type="string">
                                 [DESC]
                         </text>
-                        <text type="string" length="1" name="title_no_modify">
+                        <text length="1" name="title_no_modify" type="string">
                                 [DESC]: não foi possível modificar
                         </text>
-                        <text type="string" length="1" name="title_loading">
+                        <text length="1" name="title_loading" type="string">
                                 [DESC]: carregando...
                         </text>
-                        <text type="string" length="1" name="title_not_worn">
+                        <text length="1" name="title_not_worn" type="string">
                                 [DESC]: não vestido
                         </text>
-                        <text type="string" length="1" name="path">
+                        <text length="1" name="path" type="string">
                                 Localizado em [PATH]
                         </text>
-                        <text type="string" length="1" name="not worn instructions">
-                                Para por uma nova saia em seu avatar, basta arrastar um novo modelo do seu inventário. Alternativamente, você pode criar um novo modelo a partir deste e usá-lo.
+                        <text length="1" name="not worn instructions" type="string">
+                                Para por uma nova saia em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir deste e usá-lo.
                         </text>
-                        <text type="string" length="1" name="no modify instructions">
+                        <text length="1" name="no modify instructions" type="string">
                                 Você não tem permissão para modificar essa vestimenta.
                         </text>
-                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker" />
-                        <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New" />
-                        <button label="Remover" label_selected="Remover" name="Take Off" />
-                        <button label="Salvar" label_selected="Salvar" name="Save" />
-                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As" />
-                        <button label="Reverter" label_selected="Reverter" name="Revert" />
+                        <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+                        <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
+                        <button label="Remover" label_selected="Remover" name="Take Off"/>
+                        <button label="Salvar" label_selected="Salvar" name="Save"/>
+                        <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+                        <button label="Reverter" label_selected="Reverter" name="Revert"/>
                 </panel>
         </tab_container>
-        <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit" />
-        <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All" />
-        <button label="Fechar" label_selected="Fechar" name="Close" />
+        <scroll_container left="216" name="panel_container"/>
+        <button label="Fechar" label_selected="Fechar" name="Close"/>
+        <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All"/>
+        <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
new file mode 100644
index 0000000..a76d06e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Day Cycle Floater" title="Editor de ciclo de dia">

+        <tab_container name="Day Cycle Tabs">

+                <panel label="Ciclo do dia" name="Day Cycle">

+                        <button label="?" name="WLDayCycleHelp"/>

+                        <text name="WL12am">

+                                12:00 meia-noite

+                        </text>

+                        <text name="WL3am">

+                                3:00 da manhã

+                        </text>

+                        <text name="WL6am">

+                                6:00 da manhã

+                        </text>

+                        <text name="WL9amHash">

+                                9:00 da manhã

+                        </text>

+                        <text name="WL12pmHash">

+                                12:00 meio dia

+                        </text>

+                        <text name="WL3pm">

+                                3:00 da tarde

+                        </text>

+                        <text name="WL6pm">

+                                6:00 da tarde

+                        </text>

+                        <text name="WL9pm">

+                                9:00 da noite

+                        </text>

+                        <text name="WL12am2">

+                                12:00 meia noite

+                        </text>

+                        <button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>

+                        <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>

+                        <text name="WLCurKeyFrameText">

+                                Configurações de Key Frame:

+                        </text>

+                        <text name="WLCurKeyTimeText">

+                                Tempo de chave:

+                        </text>

+                        <spinner label="Hora" name="WLCurKeyHour"/>

+                        <spinner label="Minutos" name="WLCurKeyMin"/>

+                        <text name="WLCurKeyTimeText2">

+                                Apresentação chave:

+                        </text>

+                        <combo_box label="Apresentação" name="WLKeyPresets"/>

+                        <text name="DayCycleText">

+                                Snap:

+                        </text>

+                        <combo_box label="5 minutos" name="WLSnapOptions"/>

+                        <text name="DayCycleText2">

+                                Duração do Ciclo:

+                        </text>

+                        <spinner label="Hora" name="WLLengthOfDayHour"/>

+                        <spinner label="Minuto" name="WLLengthOfDayMin"/>

+                        <spinner label="Segundo" name="WLLengthOfDaySec"/>

+                        <text name="DayCycleText3">

+                                Preview:

+                        </text>

+                        <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>

+                        <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>

+                        <button label="Usar o horário do Terreno" label_selected="Ir para o horário do Terreno" name="WLUseLindenTime"/>

+                        <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>

+                        <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>

+                </panel>

+        </tab_container>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_directory.xml b/linden/indra/newview/skins/default/xui/pt/floater_directory.xml
index bcc31bd..5374630 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_directory.xml
@@ -1,36 +1,60 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="directory" title="Procurar">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="directory" title="Busca Second Life">
         <tab_container name="Directory Tabs">
-                <panel label="Tudo" name="all_panel">
-                        <button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <text name="find">
-                                Encontrar:
-                        </text>
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
-                        <check_box label="Incluir conteúdo adulto" name="incmature" />
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="Nome" name="name" />
-                                <column label="Preço" name="price" />
-                                <column label="Tempo (PDT)" name="date" />
-                                <column label="Tempo" name="time" />
-                                <column label="Tráfego" name="dwell" />
-                                <column label="�rea" name="area" />
-                                <column label="L$/m²" name="per_meter" />
-                                <column label="Online" name="online" />
-                                <column label="Membros" name="members" />
-                                <column label="" name="score" />
-                        </scroll_list>
+                <panel label="Todos" name="find_all_panel">
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Voltar" name="back_btn"/>
+                        <button label="Encaminhar" name="forward_btn"/>
+                        <line_editor label="Busca" name="search_editor" tool_tip="Busca Second Life"/>
+                        <button label="Buscar" name="search_btn"/>
+                        <combo_box name="Category">
+                                <combo_item name="AnyCategory">
+                                        Qualquer categoria
+                                </combo_item>
+                                <combo_item name="Events">
+                                        Eventos
+                                </combo_item>
+                                <combo_item name="Groups">
+                                        Grupos
+                                </combo_item>
+                                <combo_item name="People">
+                                        Pessoas
+                                </combo_item>
+                                <combo_item name="Places">
+                                        Lugares
+                                </combo_item>
+                                <combo_item name="Wiki">
+                                        Wiki
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="Incluir conteúdo adulto" name="mature_check"/>
+                        <string name="loading_text">
+                                Carregando...
+                        </string>
+                        <string name="done_text">
+                                Feito
+                        </string>
                 </panel>
                 <panel label="Anúncios" name="classified_panel">
-                        <button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <text name="find">
+                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev"/>
+                        <text name="find" width="63">
                                 Encontrar:
                         </text>
-                        <check_box label="Incluir Conteúdo Adulto" name="incmature" />
-                        <combo_box name="Category">
+                        <line_editor left_delta="58" name="name" width="128"/>
+                        <check_box label="Incluir conteúdo adulto" name="incmature"/>
+                        <combo_box name="Category" left="195" width="154">
                                 <combo_item name="AnyCategory">
                                         Qualquer Categoria
                                 </combo_item>
@@ -62,18 +86,24 @@
                                         Pessoal
                                 </combo_item>
                         </combo_box>
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
-                        <button label="Colocar Anúncio" label_selected="Colocar Anúncio"
-                             name="Place an Ad..." />
-                        <button label="Apagar" label_selected="Apagar" name="Delete" />
+                        <button label="Procura" label_selected="Procura" name="Browse" left_delta="162" />
+                        <button label="Buscar" label_selected="Buscar" name="Search"/>
+                        <button label="Colocar Anúncio" label_selected="Colocar Anúncio" name="Place an Ad..."/>
+                        <button label="Apagar" label_selected="Apagar" name="Delete"/>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="Preço" name="price" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nome" name="name"/>
+                                <column label="Preço" name="price"/>
                         </scroll_list>
                 </panel>
                 <panel label="Eventos" name="events_panel">
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
                                         Em progresso e processando
@@ -82,15 +112,12 @@
                                         Data
                                 </radio_item>
                         </radio_group>
-                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;"
-                             tool_tip="Voltar um dia" />
+                        <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Voltar um dia"/>
                         <text name="date_text">
                                 6/6
                         </text>
-                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;"
-                             tool_tip="Avançar um dia" />
-                        <button label="Hoje" label_selected="Hoje" name="Today"
-                             tool_tip="Exibir dias dos eventos" />
+                        <button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avançar um dia"/>
+                        <button label="Hoje" label_selected="Hoje" name="Today" tool_tip="Exibir dias dos eventos"/>
                         <text name="text">
                                 Categoria:
                         </text>
@@ -135,50 +162,58 @@
                                         Variados
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Conteúdo Adulto" name="incmature" />
-                        <button label="Buscar" label_selected="Buscar" name="Search" tool_tip="Buscar" />
-                        <button label="Apagar" label_selected="Apagar" name="Delete" />
+                        <check_box label="Incluir conteúdo &#10;adulto" name="incmature"/>
+                        <button label="Buscar" label_selected="Buscar" name="Search" tool_tip="Buscar"/>
+                        <button label="Apagar" label_selected="Apagar" name="Delete"/>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="Tempo (PDT)" name="date" />
-                                <column label="" name="event_id" />
-                                <column label="Tempo" name="time" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nome" name="name"/>
+                                <column label="Tempo (PDT)" name="date"/>
+                                <column label="" name="event_id"/>
+                                <column label="Tempo" name="time"/>
                         </scroll_list>
-                        <button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
+                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+                        <button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev"/>
                 </panel>
-                <panel label="Lugares Populares" name="popular_panel">
-                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <check_box label="Exibir somente lugares com foto" name="incpictures" />
-                        <check_box label="Incluir lugares em Regiões Adultas" name="incmature" />
-                        <text
-                             name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
-                                Esses são os lugares mais populares no mundo, baseado no tráfego e no tempo 
-que as pessoas permanecem lá.
-                        </text>
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="Tráfego" name="dwell" />
-                        </scroll_list>
+                <panel label="Showcase (Mostruário)" name="showcase_panel">
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Voltar" name="back_btn"/>
+                        <button label="Encaminhar" name="forward_btn"/>
+                        <string name="loading_text">
+                                Carregando...
+                        </string>
+                        <string name="done_text">
+                                Feito
+                        </string>
                 </panel>
                 <panel label="Venda de Terrenos" name="land_sales_panel">
-                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
                         <combo_box name="type">
                                 <combo_item name="AllTypes">
                                         Todos os tipos
                                 </combo_item>
+                                <combo_item name="Auction">
+                                        Leilão
+                                </combo_item>
+                                <combo_item name="MainlandSales">
+                                        Mainland - à venda
+                                </combo_item>
                                 <combo_item name="EstateSales">
                                         À venda - Região
                                 </combo_item>
-                                <combo_item name="FirstLand">
-                                        Primeira Compra
-                                </combo_item>
                         </combo_box>
                         <combo_box name="rating">
                                 <combo_item name="PG&amp;Mature">
@@ -191,31 +226,38 @@ que as pessoas permanecem lá.
                                         Adulto somente
                                 </combo_item>
                         </combo_box>
-                        <check_box label="Preço &lt;= L$" name="pricecheck" />
-                        <check_box label="�rea &gt;= m²" name="areacheck" />
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
+                        <check_box label="Preço &lt;= L$" name="pricecheck"/>
+                        <check_box label="�rea &gt;= m²" name="areacheck"/>
+                        <button label="Buscar" label_selected="Buscar" name="Search"/>
                         <text name="land">
                                 Lotes podem ser adquiridos diretamente através de Linden Dollares (L$) ou leilão, 
-ambos em L$, US$ ou R$. 
-Para comprar diretamente, visite o lote e clique no nome do lugar na barra título.
+ambos em L$, US$ ou R$. Para comprar diretamente, visite o lote e clique no
+nome do lugar na barra título.
                         </text>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="L$ Preço" name="price" />
-                                <column label="�rea" name="area" />
-                                <column label="L$/m²" name="per_meter" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nome" name="name"/>
+                                <column label="L$ Preço" name="price"/>
+                                <column label="�rea" name="area"/>
+                                <column label="L$/m²" name="per_meter"/>
                         </scroll_list>
                 </panel>
                 <panel label="Lugares" name="places_panel">
-                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <text name="find">
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+                        <text name="find" width="63">
                                 Encontrar:
                         </text>
-                        <check_box label="Incluir lugares em Regiões Adultas" name="incmature" />
-                        <combo_box name="Category">
+                        <line_editor left_delta="58" name="name" width="128"/>
+                        <check_box label="Incluir lugares em Regiões Adultas" name="incmature"/>
+                        <combo_box name="Category" left="195" width="160">
                                 <combo_item name="AnyCategory">
                                         Qualquer Categoria
                                 </combo_item>
@@ -256,41 +298,52 @@ Para comprar diretamente, visite o lote e clique no nome do lugar na barra títu
                                         Outros
                                 </combo_item>
                         </combo_box>
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
+                        <button label="Buscar" label_selected="Buscar" name="Search" left_delta="168"/>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="Tráfego" name="dwell" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nome" name="name"/>
+                                <column label="Tráfego" name="dwell"/>
                         </scroll_list>
                 </panel>
                 <panel label="Pessoas" name="people_panel">
-                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <text name="find">
+                        <string name="searching_text">
+                                buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;"/>
+                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+                        <text name="find" width="63">
                                 Encontrar:
                         </text>
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
+                        <line_editor left_delta="58" name="name" width="200"/>
+                        <button label="Buscar" label_selected="Buscar" name="Search"/>
                         <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
+                                <column label="" name="icon"/>
+                                <column label="" name="type"/>
+                                <column label="Nome" name="name"/>
                         </scroll_list>
                 </panel>
                 <panel label="Grupos" name="groups_panel">
-                        <button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev" />
-                        <button label="Próximo &gt;" label_selected="Próximo &gt;" name="Next &gt;" />
-                        <text name="find">
-                                Encontrar:
-                        </text>
-                        <button label="Buscar" label_selected="Buscar" name="Search" />
-                        <check_box label="Include Mature groups" name="incmature" />
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Nome" name="name" />
-                                <column label="Membros" name="members" />
-                        </scroll_list>
+                        <string name="searching_text">
+                                Buscando...
+                        </string>
+                        <string name="not_found_text">
+                                Nada foi encontrado.
+                        </string>
+                        <button label="Voltar" name="back_btn"/>
+                        <button label="Encaminhar" name="forward_btn"/>
+                        <line_editor label="Busca" name="search_editor" tool_tip="Busca Second Life"/>
+                        <button label="Busca" name="search_btn"/>
+                        <check_box label="Incluir conteúdo adulto" name="mature_check"/>
+                        <string name="loading_text">
+                                carregando...
+                        </string>
+                        <string name="done_text">
+                                Feito
+                        </string>
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
new file mode 100644
index 0000000..afefae7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Environment Editor Floater" title="Editor do Ambiente">

+        <text name="EnvTimeText">

+                Hora do Dia

+        </text>

+        <text name="EnvTimeText2">

+                12:00 PM

+        </text>

+        <text name="EnvCloudText">

+                Cobertura de Nuvens

+        </text>

+        <text name="EnvWaterColorText">

+                Cor da água

+        </text>

+        <color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>

+        <text name="EnvWaterFogText">

+                Névoa da água

+        </text>

+        <button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>

+        <button label="Céu Avançado" name="EnvAdvancedSkyButton"/>

+        <button label="�gua Avançada" name="EnvAdvancedWaterButton"/>

+        <button label="?" name="EnvSettingsHelpButton"/>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml b/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
index f6bc2ac..190463d 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
@@ -1,17 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gestures" title="Ativar gestos">
         <text name="help_label">
-                Digite uma palavra-chave ou pressione uma tecla para executar um som ou animação.
+                Clicar duas vezes no gesto para executar animações e sons.
         </text>
-        <scroll_list name="gesture_list">
-                <column label="Gatilho" name="trigger" />
-                <column label="Tecla" name="shortcut" />
-                <column label="" name="key" />
-                <column label="Nome" name="name" />
-        </scroll_list>
-        <button label="Novo" name="new_gesture_btn" />
-        <button label="Inventário" name="inventory_btn" />
-        <button label="Editar" name="edit_btn" />
-        <button label="Executar" name="play_btn" />
-        <button label="Parar" name="stop_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
new file mode 100644
index 0000000..c395144
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Hardware Settings Floater" title="Ajustes de Hardware">

+        <text name="Filtering:">

+                Filtragem:

+        </text>

+        <check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>

+        <text name="Antialiasing:">

+                Suavização:

+        </text>

+        <combo_box label="Suavização" name="fsaa" width="94">

+                <combo_item name="FSAADisabled">

+                        Desabilitado

+                </combo_item>

+                <combo_item name="2x">

+                        2x

+                </combo_item>

+                <combo_item name="4x">

+                        4x

+                </combo_item>

+                <combo_item name="8x">

+                        8x

+                </combo_item>

+                <combo_item name="16x">

+                        16x

+                </combo_item>

+        </combo_box>

+        <spinner label="Gama:" name="gamma"/>

+        <text name="(brightness, lower is brighter)">

+                (brilho, quanto menor, mais brilho, 0=usar padrão)

+        </text>

+        <text name="Enable VBO:">

+                Habilitar VBO:

+        </text>

+        <check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>

+        <slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a  Memória da Placa de Vídeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>

+        <spinner label="Relação de Distância de &#10;Nevoeiro:" name="fog"/>

+        <button label="OK" label_selected="OK" name="OK"/>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
new file mode 100644
index 0000000..3d500dd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="htmlfloater" title="">
+        <button label="Fechar" name="close_btn"/>
+        <button label="Voltar" name="back_btn"/>
+        <button label="Adiantar" name="forward_btn"/>
+        <button label="Ir" name="go_btn"/>
+        <string name="home_page_url">
+                http://www.secondlife.com
+        </string>
+        <string name="support_page_url">
+                http://support.secondlife.com
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_hud.xml b/linden/indra/newview/skins/default/xui/pt/floater_hud.xml
new file mode 100644
index 0000000..c758679
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_hud.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floater_hud" title="Tutorial"/>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_im.xml b/linden/indra/newview/skins/default/xui/pt/floater_im.xml
index 2ac8cb0..c90eae9 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_im.xml
@@ -1,21 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <multi_floater name="im_floater" title="Mensagem Instantânea">
-        <text name="only_user_message">
+        <string name="only_user_message">
                 Você é o único usuário desta sessão.
-        </text>
-        <text name="offline_message">
+        </string>
+        <string name="offline_message">
                 [FIRST] [LAST] está offline.
-        </text>
-        <text name="generic_request_error">
+        </string>
+        <string name="invite_message">
+                Clique no botão [BUTTON NAME] para aceitar/ conectar para esse bate-papo em voz. 
+        </string>
+        <string name="muted_message">
+                Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente .
+        </string>
+        <string name="generic_request_error">
                 Erro na requisição, por favor, tente novamente.
-        </text>
-        <text name="insufficient_perms_error">
+        </string>
+        <string name="insufficient_perms_error">
                 Você não tem permissões suficientes.
-        </text>
-        <text name="user_no_help">
-                O usuário requisitado não está mais nessa sessão de ajuda.
-        </text>
-        <text name="removed_from_group">
+        </string>
+        <string name="session_does_not_exist_error">
+                A sessão deixou de existir
+        </string>
+        <string name="no_ability_error">
+                Você não possui esta habilidade.
+        </string>
+        <string name="not_a_mod_error">
+                Você não é um moderador de sessão.
+        </string>
+        <string name="muted_error">
+                Moderador do grupo desabilitou seu bate-papo em texto.
+        </string>
+        <string name="add_session_event">
+                Não foi possível adicionar usuários na sessão de bate-papo com [RECIPIENT].
+        </string>
+        <string name="message_session_event">
+                Não foi possível enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+        </string>
+        <string name="removed_from_group">
                 Você foi removido do grupo.
-        </text>
+        </string>
+        <string name="close_on_no_ability">
+                Você não possui mais a habilidade de estar na sessão de bate- papo.
+        </string>
 </multi_floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 21ca3e5..6390ac8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Image Preview" title="">
         <text name="name_label">
                 Nome:
@@ -42,8 +42,11 @@
                 </combo_item>
         </combo_box>
         <text name="bad_image_text">
-                Incapaz de ler a imagem.Tente salvar a imagem como 24 bit Targa (.tga).
+                Incapaz de ler a imagem.
+
+Tente salvar a imagem como 24 bit Targa (.tga).
         </text>
-        <button label="Cancelar" name="cancel_btn" />
-        <button label="Upload (L$[AMOUNT])" name="ok_btn" />
+        <check_box label="Usar compressão com menor perda" name="lossless_check"/>
+        <button label="Cancelar" name="cancel_btn"/>
+        <button label="Upload (L$[AMOUNT])" name="ok_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
index 88b4a36..9821afa 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
@@ -1,14 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(desconhecido)" name="im_floater" title="(unknown)">
-        <string name="default_text_label">
-                Clique aqui para mensagens instantâneas.
+        <string name="ringing">
+                Chamando...
         </string>
-        <button label="Perfil..." name="profile_callee_btn" />
-        <panel name="speaker_controls" />
-        <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor" />
-        <button label="Perfil..." label_selected="Perfil..." name="profile_btn" />
-        <string name="live_help_dialog">
-                *** Bem Vindo a Solicitação de Ajuda *** Por favor, cheque primeiro suas páginas de Ajuda do Second Life precionando F1 ou acessando a Base de Conhecimento em http://secondlife.com/knowledgebase/ Se suas respostas não estiverem ali, or favor entre com sua pergunta e aguarde alguns minutos para que algum Ajudante responsa.-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+        <string name="answering">
+                Conectando...
+        </string>
+        <string name="connected">
+                Conectado, clique Finalizar Chamada para deixar em espera
+        </string>
+        <string name="hang_up">
+                Chamada encerrada
+        </string>
+        <string name="inventory_item_offered">
+                Oferecido um item de Inventário
+        </string>
+        <string name="voice_icon">
+                icn_voice-pvtfocus.tga
         </string>
         <string name="title_string">
                 Mensagem Instantânea com [NAME]
@@ -19,4 +27,18 @@
         <string name="session_start_string">
                 Iniciando uma sessaão com [NAME] por favor aguarde.
         </string>
+        <string name="default_text_label">
+                Clique aqui para uma mensagem instantânea.
+        </string>
+        <button label="Perfil..." name="profile_callee_btn"/>
+        <button label="Chamar" name="start_call_btn"/>
+        <button label="Terminar Chamada" name="end_call_btn"/>
+        <panel name="speaker_controls">
+                <button label="" name="mute_btn" tool_tip="Emudecer voz"/>
+        </panel>
+        <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor"/>
+        <button label="Enviar" name="send_btn"/>
+        <string name="live_help_dialog">
+                *** Bem Vindo a Solicitação de Ajuda *** Por favor, cheque primeiro suas páginas de Ajuda do Second Life precionando F1 ou acessando a Base de Conhecimento em http://secondlife.com/knowledgebase/ Se suas respostas não estiverem ali, or favor entre com sua pergunta e aguarde alguns minutos para que algum Ajudante responsa.-=-=- O tempo de resposta pode variar, especialmente em horários de pico -=-=-
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
index 4989dd5..bd4bc57 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
@@ -1,5 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="(desconhecido)" name="im_floater">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(desconhecido)" name="im_floater" title="(desconhecido)">
+        <string name="ringing">
+                Juntar-se à Conversa por Voz...
+        </string>
+        <string name="connected">
+                Conectado, clique Encerrar Chamada para deixar em espera
+        </string>
+        <string name="hang_up">
+                Deixar a Conversa por Voz
+        </string>
+        <string name="voice_icon">
+                icn_voice-groupfocus.tga
+        </string>
         <string name="title_string">
                 Mensagem Instantânea com [NAME]
         </string>
@@ -10,11 +22,15 @@
                 Iniciando uma sessaão com [NAME] por favor aguarde.
         </string>
         <string name="default_text_label">
-                Clique aqui para mensagens instantâneas.
+                Clique aqui para mensagem instantânea.
         </string>
         <layout_stack name="panels">
                 <layout_panel name="im_contents_panel">
-                        <line_editor label="Clique aqui para mensagens instantâneas" name="chat_editor" />
+                        <button label="Chamar" name="start_call_btn"/>
+                        <button label="Encerrar Chamada" name="end_call_btn"/>
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para trocar uma lista de participantes ativos nesta sessão de MI."/>
+                        <line_editor label="Clique aqui para mensagem instantânea" name="chat_editor"/>
+                        <button label="Enviar" name="send_btn"/>
                 </layout_panel>
         </layout_stack>
         <string name="live_help_dialog">
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
new file mode 100644
index 0000000..a393717
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater label="(unknown)" name="im_floater" title="(unknown)">

+        <string name="title_string">

+                Mensagem Instantânea com [NAME]

+        </string>

+        <string name="typing_start_string">

+                [NAME] está digitando...

+        </string>

+        <string name="session_start_string">

+                Iniciando sessão com [NAME], por favor aguarde.

+        </string>

+        <string name="moderated_chat_label">

+                (Moderado: Vozes desligada por default)

+        </string>

+        <string name="default_text_label">

+                Clique aqui para mensagem instantânea.

+        </string>

+        <string name="muted_text_label">

+                Sua conversa de texto foi desabilitada por um Moderador do Grupo.

+        </string>

+        <layout_stack name="panels">

+                <layout_panel name="im_contents_panel">

+                        <button label="Informação do Grupo" name="group_info_btn" width="130"/>

+                        <button label="Entrar numa chamada" name="start_call_btn" left_delta="135" width="160"/>

+                        <button label="Encerrar Chamada" name="end_call_btn" width="160" halign="center"/>

+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Clique aqui para alternar a lista dos participantes ativos nesta sessão de IM ."/>

+                        <button label="Enviar" name="send_btn"/>

+                </layout_panel>

+        </layout_stack>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml b/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
index 281133f..93555c1 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,49 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Inventory" title="Inventário">
+        <search_editor label="Escreva aqui para busca" name="inventory search editor"/>
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="Todos os Itens" name="All Items" />
-                <inventory_panel label="Itens Recentes" name="Recent Items" />
+                <inventory_panel label="Todos os Itens" name="All Items"/>
+                <inventory_panel label="Itens Recentes" name="Recent Items"/>
         </tab_container>
         <menu_bar name="Inventory Menu">
                 <menu label="Arquivo" name="File">
-                        <menu_item_call label="Abrir" name="Open" />
-                        <menu_item_call label="Nova Janela" name="New Window" />
-                        <menu_item_call label="Mostrar Filtros" name="Show Filters" />
-                        <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders" />
-                        <menu_item_call label="Limpar Lixeira" name="Empty Trash" />
+                        <menu_item_call label="Abrir" name="Open"/>
+                        <menu_item_call label="Nova Janela" name="New Window"/>
+                        <menu_item_call label="Mostrar Filtros" name="Show Filters"/>
+                        <menu_item_call label="Redefinir Filtros" name="Reset Current"/>
+                        <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
+                        <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
                 </menu>
                 <menu label="Criar" name="Create">
-                        <menu_item_call label="Nova Pasta" name="New Folder" />
-                        <menu_item_call label="Novo Script" name="New Script" />
-                        <menu_item_call label="Nova Nota" name="New Note" />
-                        <menu_item_call label="Novo Gesto" name="New Gesture" />
+                        <menu_item_call label="Nova Pasta" name="New Folder"/>
+                        <menu_item_call label="Novo Script" name="New Script"/>
+                        <menu_item_call label="Nova Nota" name="New Note"/>
+                        <menu_item_call label="Novo Gesto" name="New Gesture"/>
                         <menu label="Nova Roupa" name="New Clothes">
-                                <menu_item_call label="Nova Camisa" name="New Shirt" />
-                                <menu_item_call label="Nova Calça" name="New Pants" />
-                                <menu_item_call label="Novos Sapatos" name="New Shoes" />
-                                <menu_item_call label="Novas Meias" name="New Socks" />
-                                <menu_item_call label="Nova Jaqueta" name="New Jacket" />
-                                <menu_item_call label="Nova Saia" name="New Skirt" />
-                                <menu_item_call label="Novas Luvas" name="New Gloves" />
-                                <menu_item_call label="Nova Anágua" name="New Undershirt" />
-                                <menu_item_call label="Novas Roupas de Baixo" name="New Underpants" />
+                                <menu_item_call label="Nova Camisa" name="New Shirt"/>
+                                <menu_item_call label="Nova Calça" name="New Pants"/>
+                                <menu_item_call label="Novos Sapatos" name="New Shoes"/>
+                                <menu_item_call label="Novas Meias" name="New Socks"/>
+                                <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+                                <menu_item_call label="Nova Saia" name="New Skirt"/>
+                                <menu_item_call label="Novas Luvas" name="New Gloves"/>
+                                <menu_item_call label="Nova Anágua" name="New Undershirt"/>
+                                <menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
                         </menu>
                         <menu label="Parte do corpo" name="New Body Parts">
-                                <menu_item_call label="Nova Forma" name="New Shape" />
-                                <menu_item_call label="Nova Pele" name="New Skin" />
-                                <menu_item_call label="Novo Cabelo" name="New Hair" />
-                                <menu_item_call label="Novos Olhos" name="New Eyes" />
+                                <menu_item_call label="Nova Forma" name="New Shape"/>
+                                <menu_item_call label="Nova Pele" name="New Skin"/>
+                                <menu_item_call label="Novo Cabelo" name="New Hair"/>
+                                <menu_item_call label="Novos Olhos" name="New Eyes"/>
                         </menu>
                 </menu>
                 <menu label="Organizar" name="Sort">
-                        <menu_item_check label="Por Nome" name="By Name" />
-                        <menu_item_check label="Por Data" name="By Date" />
-                        <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name" />
-                        <menu_item_check label="Pastas em primeiro" name="System Folders To Top" />
-                </menu>
-                <menu label="Filtros" name="Filters">
-                        <menu_item_check label="Modificar Conteúdo" name="Modify Current" />
-                        <menu_item_call label="Reiniciar Atual" name="Reset Current" />
+                        <menu_item_check label="Por Nome" name="By Name"/>
+                        <menu_item_check label="Por Data" name="By Date"/>
+                        <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
+                        <menu_item_check label="Pastas em primeiro" name="System Folders To Top"/>
                 </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index de4b763..e11a8eb 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="Propriedades">
         <text name="LabelItemNameTitle">
                 Nome:
@@ -12,14 +12,14 @@
         <text name="LabelCreatorName">
                 Nicole Linden
         </text>
-        <button label="Perfil..." label_selected="" name="BtnCreator" />
+        <button label="Perfil..." label_selected="" name="BtnCreator"/>
         <text name="LabelOwnerTitle">
                 Dono:
         </text>
         <text name="LabelOwnerName">
                 Thrax Linden
         </text>
-        <button label="Perfil..." label_selected="" name="BtnOwner" />
+        <button label="Perfil..." label_selected="" name="BtnOwner"/>
         <text name="LabelAcquiredTitle">
                 Adquirido:
         </text>
@@ -29,9 +29,9 @@
         <text name="OwnerLabel">
                 Você pode:
         </text>
-        <check_box label="Modificar" name="CheckOwnerModify" />
-        <check_box label="Copiar" name="CheckOwnerCopy" />
-        <check_box label="Revender/Doar" name="CheckOwnerTransfer" />
+        <check_box label="Modificar" name="CheckOwnerModify"/>
+        <check_box label="Copiar" name="CheckOwnerCopy"/>
+        <check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
         <text name="BaseMaskDebug">
                 B:
         </text>
@@ -47,18 +47,18 @@
         <text name="NextMaskDebug">
                 N:
         </text>
-        <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup" />
-        <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy" />
+        <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
+        <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
         <text name="NextOwnerLabel">
                 Próximo dono pode:
         </text>
-        <check_box label="Modificar" name="CheckNextOwnerModify" />
-        <check_box label="Copiar" name="CheckNextOwnerCopy" />
-        <check_box label="Revender/Doar" name="CheckNextOwnerTransfer" />
+        <check_box label="Modificar" name="CheckNextOwnerModify"/>
+        <check_box label="Copiar" name="CheckNextOwnerCopy"/>
+        <check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
         <text name="SaleLabel">
                 Marcar Item:
         </text>
-        <check_box label="A venda" name="CheckPurchase" />
+        <check_box label="A venda" name="CheckPurchase"/>
         <radio_group name="RadioSaleType">
                 <radio_item name="radio">
                         Original
@@ -70,4 +70,16 @@
         <text name="TextPrice">
                 Price:  L$
         </text>
+        <string name="unknown">
+                (desconhecido)
+        </string>
+        <string name="public">
+                (público)
+        </string>
+        <string name="you_can">
+                Você pode:
+        </string>
+        <string name="owner_can">
+                Proprietário pode :
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml b/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
index 65becbd..e0bea23 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -1,3 +1,84 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Joystick" title="Joystick Configuration">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuração do Joystick">
+        <check_box name="enable_joystick">
+                Habilitar Joystick:
+        </check_box>
+        <spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
+        <spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
+        <spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
+        <spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
+        <spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
+        <spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
+        <spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
+        <check_box label="Zoom Direto" name="ZoomDirect"/>
+        <check_box label="Cursor 3D" name="Cursor3D"/>
+        <check_box label="Nível Automático" name="AutoLeveling"/>
+        <text name="Control Modes:">
+                Modos de Controle:
+        </text>
+        <check_box name="JoystickAvatarEnabled">
+                Avatar
+        </check_box>
+        <check_box name="JoystickBuildEnabled">
+                Construir
+        </check_box>
+        <check_box name="JoystickFlycamEnabled">
+                Camera aérea
+        </check_box>
+        <text name="XScale">
+                Escala X
+        </text>
+        <text name="YScale">
+                Escala Y
+        </text>
+        <text name="ZScale">
+                Escala Z
+        </text>
+        <text name="PitchScale">
+                Escala de Elevação
+        </text>
+        <text name="YawScale">
+                Escala da Guinada
+        </text>
+        <text name="RollScale">
+                Escala de Rolagem
+        </text>
+        <text name="XDeadZone">
+                Zona Morta X
+        </text>
+        <text name="YDeadZone">
+                Zona Morta Y
+        </text>
+        <text name="ZDeadZone">
+                Zona Morta Z
+        </text>
+        <text name="PitchDeadZone">
+                Zona Morta da Elevação
+        </text>
+        <text name="YawDeadZone">
+                Zona Morta da Guinada
+        </text>
+        <text name="RollDeadZone">
+                Zona Morta de Rolagem
+        </text>
+        <text name="Feathering">
+                Alisar
+        </text>
+        <slider label="" name="FlycamFeathering"/>
+        <text name="ZoomScale2">
+                Escala de Zoom
+        </text>
+        <text name="ZoomDeadZone">
+                Zona Morta de Zoom
+        </text>
+        <button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+        <string name="JoystickMonitor">
+                Monitor do Joystick
+        </string>
+        <string name="Axis">
+                Eixo [NUM]
+        </string>
+        <string name="NoDevice">
+                nenhum dispositivo detectado
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
new file mode 100644
index 0000000..1e90862
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floater_lagmeter" title="Medidor de Atraso">

+        <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>

+        <text name="client">

+                Cliente:

+        </text>

+        <text name="client_text">

+                Normal

+        </text>

+        <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>

+        <text name="network">

+                Rede:

+        </text>

+        <text name="network_text">

+                Normal

+        </text>

+        <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>

+        <text name="server">

+                Servidor:

+        </text>

+        <text name="server_text">

+                Normal

+        </text>

+        <button label="?" name="server_help"/>

+        <button label="&gt;&gt;" name="minimize"/>

+        <string name="max_title_msg">

+                Medidor de Atraso

+        </string>

+        <string name="max_width_px">

+                360

+        </string>

+        <string name="min_title_msg">

+                Atraso

+        </string>

+        <string name="min_width_px">

+                90

+        </string>

+        <string name="client_text_msg">

+                Cliente

+        </string>

+        <string name="client_frame_rate_critical_fps">

+                10

+        </string>

+        <string name="client_frame_rate_warning_fps">

+                15

+        </string>

+        <string name="client_frame_time_window_bg_msg">

+                Normal, janela por baixo

+        </string>

+        <string name="client_frame_time_critical_msg">

+                Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]

+        </string>

+        <string name="client_frame_time_warning_msg">

+                Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]

+        </string>

+        <string name="client_frame_time_normal_msg">

+                Normal

+        </string>

+        <string name="client_draw_distance_cause_msg">

+                Causa possível: Distância do desenho ajustada muito alta

+        </string>

+        <string name="client_texture_loading_cause_msg">

+                Causa possível: Carregamento de Imagens

+        </string>

+        <string name="client_texture_memory_cause_msg">

+                Causa possível: Muitas imagens na memória

+        </string>

+        <string name="client_complex_objects_cause_msg">

+                Causa possível: Muitos objetos complexos na cena

+        </string>

+        <string name="network_text_msg">

+                Rede

+        </string>

+        <string name="network_packet_loss_critical_pct">

+                10

+        </string>

+        <string name="network_packet_loss_warning_pct">

+                5

+        </string>

+        <string name="network_packet_loss_critical_msg">

+                Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes

+        </string>

+        <string name="network_packet_loss_warning_msg">

+                Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes

+        </string>

+        <string name="network_performance_normal_msg">

+                Normal

+        </string>

+        <string name="network_ping_critical_ms">

+                600

+        </string>

+        <string name="network_ping_warning_ms">

+                300

+        </string>

+        <string name="network_ping_critical_msg">

+                Tempo de conexão de ping é cerca de  [NETWORK_PING_CRITICAL] ms

+        </string>

+        <string name="network_ping_warning_msg">

+                Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms

+        </string>

+        <string name="network_packet_loss_cause_msg">

+                Possível conexão ruim ou &apos;Largura de Banda&apos; escolhida muito alta.

+        </string>

+        <string name="network_ping_cause_msg">

+                Possível conexão ruim ou aplic. compartilhando arquivos.

+        </string>

+        <string name="server_text_msg">

+                Servidor

+        </string>

+        <string name="server_frame_rate_critical_fps">

+                20

+        </string>

+        <string name="server_frame_rate_warning_fps">

+                30

+        </string>

+        <string name="server_single_process_max_time_ms">

+                20

+        </string>

+        <string name="server_frame_time_critical_msg">

+                Taxa de quadros do simulador abaixo de  [SERVER_FRAME_RATE_CRITICAL]

+        </string>

+        <string name="server_frame_time_warning_msg">

+                Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]

+        </string>

+        <string name="server_frame_time_normal_msg">

+                Normal

+        </string>

+        <string name="server_physics_cause_msg">

+                Causa possível: Muitos objetos físicos

+        </string>

+        <string name="server_scripts_cause_msg">

+                Causa possível: Muitos objetos com scripts

+        </string>

+        <string name="server_net_cause_msg">

+                Causa possível: Muito tráfego na rede

+        </string>

+        <string name="server_agent_cause_msg">

+                Causa possível: Muitas pessoas se movendo na região

+        </string>

+        <string name="server_images_cause_msg">

+                Causa possível: Muitos cálculos de imagem

+        </string>

+        <string name="server_generic_cause_msg">

+                Causa possível: Carga no simulador muito pesada

+        </string>

+        <string name="smaller_label">

+                &gt;&gt;

+        </string>

+        <string name="bigger_label">

+                &lt;&lt;

+        </string>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 0a4ef39..e3b426c 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -1,38 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="Meu terreno">
         <scroll_list name="parcel list">
-                <column label="Nome" name="name" />
-                <column label="Localização" name="location" />
-                <column label="�rea" name="area" />
-                <column label="" name="hidden" />
+                <column label="Nome" name="name"/>
+                <column label="Localização" name="location"/>
+                <column label="�rea" name="area"/>
+                <column label="" name="hidden"/>
         </scroll_list>
-        <button label="Teleporte" label_selected="Teleporte" name="Teleport"
-             tool_tip="Teleportar para o centro do terreno." />
-        <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map"
-             tool_tip="Mostrar esse terreno no mapa do mundo." />
+        <button label="Teleporte" label_selected="Teleporte" name="Teleport" tool_tip="Teleportar para o centro do terreno."/>
+        <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
         <text name="contrib_label">
                 Contribuições para os seus grupos:
         </text>
         <scroll_list name="grant list">
-                <column label="Grupo" name="group" />
-                <column label="�rea" name="area" />
+                <column label="Grupo" name="group"/>
+                <column label="�rea" name="area"/>
         </scroll_list>
         <text name="allowed_label">
                 Permitir marcações no terreno.
         </text>
         <text name="allowed_text">
-                0 m²
+                [AREA] m2
         </text>
         <text name="current_label">
                 Marcações atuais:
         </text>
         <text name="current_text">
-                0 m²
+                [AREA] m2
         </text>
         <text name="available_label">
                 Disponivel para compra de terras:
         </text>
         <text name="available_text">
-                0 m²
+                [AREA] m2
         </text>
+        <string name="area_string">
+                [AREA] m2
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
new file mode 100644
index 0000000..c4a036d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="landmarkpicker" title="Organize: Landmarks">

+        <check_box label="Mostrar Pastas" name="show_folders_check"/>

+        <button label="Novo" label_selected="Novo" name="New"/>

+        <button label="Renomear" label_selected="Renomear" name="Rename"/>

+        <button label="Nova Pasta" label_selected="Nova Pasta" name="NewFolder"/>

+        <button label="Editar" label_selected="Editar" name="Edit"/>

+        <button label="Apagar" label_selected="Apagar" name="Delete"/>

+        <button label="Fechar" label_selected="Fechar" name="Close"/>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 62d307e..af45fa5 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -1,5 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="script ed float" title="Script: Novo Script">
-        <button label="Resetar" label_selected="Resetar" name="Reset" />
-        <check_box label="Correndo" name="running" />
+        <button label="Resetar" label_selected="Resetar" name="Reset"/>
+        <check_box label="Correndo" name="running"/>
+        <check_box label="Mono" name="mono"/>
+        <string name="not_allowed">
+                Você não tem permissão para visualizar este script.
+        </string>
+        <string name="script_running">
+                Executando
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
new file mode 100644
index 0000000..d684b75
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floater_about" title="Navegador de Mídia" width="570" min_width="477">

+        <layout_stack name="stack1" width="550">

+                <layout_panel name="nav_controls">

+                        <button label="Para trás" name="back" width="75"/>

+                        <button label="Para a frente" name="forward" width="90" left_delta="75" />

+                        <button label="Recarregar" name="reload" left_delta="95" width="76"/>

+                        <combo_box left_delta="80" name="address" width="240"/>

+                        <button label="Ir" name="go" left_delta="245" width="35"  />

+                </layout_panel>

+                <layout_panel name="parcel_owner_controls">

+                        <button label="Enviar a URL atual para o terreno" name="assign"/>

+                </layout_panel>

+                <layout_panel name="external_controls">

+                        <button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>

+                        <check_box label="Sempre abrir no meu Navegador de Web" name="open_always" left_delta="201" />

+                        <button label="Fechar" name="close"/>

+                </layout_panel>

+        </layout_stack>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
new file mode 100644
index 0000000..83f47fd
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="MemLeak" title="Simulação de Perda de Memória">

+        <spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>

+        <spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>

+        <text name="total_leaked_label">

+                Memória perdida atualmente: [SIZE] KB

+        </text>

+        <button label="Iniciar" name="start_btn"/>

+        <button label="Parar" name="stop_btn"/>

+        <button label="Liberar" name="release_btn"/>

+        <button label="Fechar" name="close_btn"/>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_mute.xml b/linden/indra/newview/skins/default/xui/pt/floater_mute.xml
index 38226b3..d451a4d 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Residentes e Objetos silenciados">
+<floater name="mute floater" title="Residentes e Objetos silenciados" short_title="Lista de pessoas silenciadas">
         <scroll_list name="mutes" tool_tip="Lista dos residentes sílenciados." />
         <button label="Silênciar residente..." label_selected="Silênciar residente..."
              name="Mute resident..." tool_tip="Sílenciar residente..." />
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
new file mode 100644
index 0000000..506d518
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="mute by name" title="Emudecer objeto pelo nome">

+        <text name="message">

+                Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.

+        </text>

+        <line_editor name="object_name">

+                Nome do objeto

+        </line_editor>

+        <button label="Ok" name="OK"/>

+        <button label="Cancelar" name="Cancel"/>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
index 19b19f4..07f804f 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
@@ -1,82 +1,88 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
-        <button label="Salvar" label_selected="Salvar" name="Save" />
-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <check_box label="Forma" name="checkbox_Shape" />
-        <check_box label="Pele" name="checkbox_Skin" />
-        <check_box label="Cabelo" name="checkbox_Hair" />
-        <check_box label="Olhos" name="checkbox_Eyes" />
-        <check_box label="Renomear Roupas para Nome da Pasta" name="rename" />
-        <check_box label="Camisa" name="checkbox_Shirt" />
-        <check_box label="Calças" name="checkbox_Pants" />
-        <check_box label="Sapatos" name="checkbox_Shoes" />
-        <check_box label="Meias" name="checkbox_Socks" />
-        <check_box label="Jaqueta" name="checkbox_Jacket" />
-        <check_box label="Luvas" name="checkbox_Gloves" />
-        <check_box label="Anágua" name="checkbox_Undershirt" />
-        <check_box label="Roupas de Baixo" name="checkbox_Underpants" />
-        <check_box label="Saia" name="checkbox_Skirt" />
-        <check_box label="Peito" name="checkbox_Chest" />
-        <check_box label="Crânio" name="checkbox_Skull" />
-        <check_box label="Ombro Esquerdo" name="checkbox_Left Shoulder" />
-        <check_box label="Ombro Direito" name="checkbox_Right Shoulder" />
-        <check_box label="Mão Esquerda" name="checkbox_Left Hand" />
-        <check_box label="Mão Direita" name="checkbox_Right Hand" />
-        <check_box label="Pé Esquerdo" name="checkbox_Left Foot" />
-        <check_box label="Pé Direito" name="checkbox_Right Foot" />
-        <check_box label="Espinha" name="checkbox_Spine" />
-        <check_box label="Pelvis" name="checkbox_Pelvis" />
-        <check_box label="Boca" name="checkbox_Mouth" />
-        <check_box label="Queixo" name="checkbox_Chin" />
-        <check_box label="Orelha Esquerda" name="checkbox_Left Ear" />
-        <check_box label="Orelha Direita" name="checkbox_Right Ear" />
-        <check_box label="Olho Esquerdo" name="checkbox_Left Eyeball" />
-        <check_box label="Olho Direito" name="checkbox_Right Eyeball" />
-        <check_box label="Nariz" name="checkbox_Nose" />
-        <check_box label="Antebraço Direito" name="checkbox_R Upper Arm" />
-        <check_box label="Braço Direito" name="checkbox_R Forearm" />
-        <check_box label="Antebraço Esquerdo" name="checkbox_L Upper Arm" />
-        <check_box label="Braço Esquerdo" name="checkbox_L Forearm" />
-        <check_box label="Nádega Direita" name="checkbox_Right Hip" />
-        <check_box label="Coxa Direita" name="checkbox_R Upper Leg" />
-        <check_box label="Canela Direita" name="checkbox_R Lower Leg" />
-        <check_box label="Nádega Esquerda" name="checkbox_Left Hip" />
-        <check_box label="Coxa Esquerda" name="checkbox_L Upper Leg" />
-        <check_box label="Canela Esquerda" name="checkbox_L Lower Leg" />
-        <check_box label="Estomago" name="checkbox_Stomach" />
-        <check_box label="Peito Esquerdo" name="checkbox_Left Pec" />
-        <check_box label="Peito Direito" name="checkbox_Right Pec" />
-        <check_box label="Centro 2" name="checkbox_Center 2" />
-        <check_box label="Superior Direita" name="checkbox_Top Right" />
-        <check_box label="Superior" name="checkbox_Top" />
-        <check_box label="Superior Esquerda" name="checkbox_Top Left" />
-        <check_box label="Centro" name="checkbox_Center" />
-        <check_box label="Inferior Esquerda" name="checkbox_Bottom Left" />
-        <check_box label="Inferior" name="checkbox_Bottom" />
-        <check_box label="Inferior Direita" name="checkbox_Bottom Right" />
-        <text type="string" length="1" name="Make New Outfit">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" width="585">
+        <button label="Salvar" label_selected="Salvar" name="Save"/>
+        <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+        <check_box label="Forma" name="checkbox_Shape"/>
+        <check_box label="Pele" name="checkbox_Skin"/>
+        <check_box label="Cabelo" name="checkbox_Hair"/>
+        <check_box label="Olhos" name="checkbox_Eyes"/>
+        <check_box label="Renomear Roupas para &#10;Nome da Pasta" name="rename"/>
+        <check_box label="Camisa" name="checkbox_Shirt"/>
+        <check_box label="Calças" name="checkbox_Pants"/>
+        <check_box label="Sapatos" name="checkbox_Shoes"/>
+        <check_box label="Meias" name="checkbox_Socks"/>
+        <check_box label="Jaqueta" name="checkbox_Jacket"/>
+        <check_box label="Luvas" name="checkbox_Gloves"/>
+        <check_box label="Anágua" name="checkbox_Undershirt"/>
+        <check_box label="Roupas de Baixo" name="checkbox_Underpants"/>
+        <check_box label="Saia" name="checkbox_Skirt"/>
+        <check_box label="Peito" name="checkbox_Chest" left="225" />
+        <check_box label="Crânio" name="checkbox_Skull" left="225" />
+        <check_box label="Ombro Esquerdo" name="checkbox_Left Shoulder" left="225" />
+        <check_box label="Ombro Direito" name="checkbox_Right Shoulder" left="225" />
+        <check_box label="Mão Esquerda" name="checkbox_Left Hand" left="225" />
+        <check_box label="Mão Direita" name="checkbox_Right Hand" left="225" />
+        <check_box label="Pé Esquerdo" name="checkbox_Left Foot" left="225" />
+        <check_box label="Pé Direito" name="checkbox_Right Foot" left="225" />
+        <check_box label="Espinha" name="checkbox_Spine" left="225" />
+        <check_box label="Pelvis" name="checkbox_Pelvis" left="225" />
+        <check_box label="Boca" name="checkbox_Mouth" left="225" />
+        <check_box label="Queixo" name="checkbox_Chin" left="225" />
+        <check_box label="Orelha Esquerda" name="checkbox_Left Ear" left="225" />
+        <check_box label="Orelha Direita" name="checkbox_Right Ear" left="325"/>
+        <check_box label="Olho Esquerdo" name="checkbox_Left Eyeball" left="325"/>
+        <check_box label="Olho Direito" name="checkbox_Right Eyeball" left="325"/>
+        <check_box label="Nariz" name="checkbox_Nose" left="325"/>
+        <check_box label="Antebraço Direito" name="checkbox_R Upper Arm" left="325"/>
+        <check_box label="Braço Direito" name="checkbox_R Forearm" left="325"/>
+        <check_box label="Antebraço Esquerdo" name="checkbox_L Upper Arm" left="325"/>
+        <check_box label="Braço Esquerdo" name="checkbox_L Forearm" left="325"/>
+        <check_box label="Nádega Direita" name="checkbox_Right Hip" left="325"/>
+        <check_box label="Coxa Direita" name="checkbox_R Upper Leg" left="325"/>
+        <check_box label="Canela Direita" name="checkbox_R Lower Leg" left="325"/>
+        <check_box label="Nádega Esquerda" name="checkbox_Left Hip" left="325"/>
+        <check_box label="Coxa Esquerda" name="checkbox_L Upper Leg" left="325"/>
+        <check_box label="Canela Esquerda" name="checkbox_L Lower Leg" left="460"/>
+        <check_box label="Estomago" name="checkbox_Stomach" left="460"/>
+        <check_box label="Peito Esquerdo" name="checkbox_Left Pec" left="460"/>
+        <check_box label="Peito Direito" name="checkbox_Right Pec" left="460"/>
+        <check_box label="Centro 2" name="checkbox_Center 2" left="460"/>
+        <check_box label="Superior Direita" name="checkbox_Top Right" left="460"/>
+        <check_box label="Superior" name="checkbox_Top" left="460"/>
+        <check_box label="Superior Esquerda" name="checkbox_Top Left" left="460"/>
+        <check_box label="Centro" name="checkbox_Center" left="460"/>
+        <check_box label="Inferior Esquerda" name="checkbox_Bottom Left" left="460"/>
+        <check_box label="Inferior" name="checkbox_Bottom" left="460"/>
+        <check_box label="Inferior Direita" name="checkbox_Bottom Right" left="460"/>
+        <text length="1" name="Make New Outfit" type="string">
                 Fazer Nova Aparencia
         </text>
-        <text type="string" length="1"
-             name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
-                Aparencias são pastas que contem roupas e partes do corpo. Arraste uma Aparencia até seu avatar para vestí-la. Fazer Nova Aparencia cria uma nova pasta e salva cópias dos itens que você está vestindo no momento.
+        <text length="1" name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it." type="string">
+                Aparencias são pastas que contem roupas e partes do corpo.
+Arraste uma Aparencia até seu avatar para vestí-la.
+
+Fazer Nova Aparencia cria uma nova pasta e salva cópias dos itens que você
+está vestindo no momento.
         </text>
-        <text type="string" length="1" name="Folder name:">
+        <text length="1" name="Folder name:" type="string">
                 Nome da Pasta:
         </text>
-        <text type="string" length="1" name="Items to include in outfit:">
+        <text length="1" name="Items to include in outfit:" type="string">
                 Itens que compõem a Aparência:
         </text>
-        <text type="string" length="1" name="Body Parts:">
+        <text length="1" name="Body Parts:" type="string">
                 Partes do Corpo:
         </text>
-        <text type="string" length="1" name="Clothes:">
+        <text length="1" name="Clothes:" type="string">
                 Roupas:
         </text>
-        <text type="string" length="1" name="Attachments:">
+        <text length="1" name="Attachments:" type="string">
                 Acessórios:
         </text>
-        <text type="string" length="1" name="Options:">
+        <text length="1" name="Options:" type="string">
                 Opções:
         </text>
+        <line_editor name="name ed">
+                Nova Vestimenta
+        </line_editor>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml b/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
index b55b242..aea38ad 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
@@ -4,7 +4,7 @@
                 [DESC]:
         </text>
         <button label="Copiar para Inventário" label_selected="Copiar para Inventário"
-             name="copy_to_inventory_button" />
+             name="copy_to_inventory_button" width="132" />
         <button label="Copiar e Vestir" label_selected="Copiar e Vestir"
-             name="copy_and_wear_button" />
+             name="copy_and_wear_button" left="152"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
index 0803a56..6b094d0 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Give Money" title="">
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
+        <button label="L$1" label_selected="L$1" name="fastpay 1" left="112" />
         <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
+        <button label="L$10" label_selected="L$10" name="fastpay 10" left="112" />
         <button label="L$20" label_selected="L$20" name="fastpay 20" />
         <button label="Pagar" label_selected="Pagar" name="pay btn" />
         <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
-        <text type="string" length="1" name="payee_label">
+        <text type="string" length="1" name="payee_label" width="110" left="5">
                 Pagar residente:
         </text>
-        <text type="string" length="1" name="payee_name">
+        <text type="string" length="1" name="payee_name" left="110">
                 [FIRST] [LAST]
         </text>
-        <text type="string" length="1" name="fastpay text">
+        <text type="string" length="1" name="fastpay text" width="120" halign="left">
                 Pagamento rápido:
         </text>
-        <text type="string" length="1" name="amount text">
+        <text type="string" length="1" name="amount text" left="4" >
                 Quantia:
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index 707d777..ad76cf8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Give Money" title="">
-        <text type="string" length="1" name="payee_group">
+        <text type="string" length="1" name="payee_group" width="100" halign="left">
                 Pagar Grupo:
         </text>
-        <text type="string" length="1" name="payee_resident">
+        <text type="string" length="1" name="payee_resident" width="120" halign="left" >
                 Pagar residente:
         </text>
-        <text type="string" length="1" name="payee_name">
+        <text type="string" length="1" name="payee_name" left="105">
                 [FIRST] [LAST]
         </text>
-        <text type="string" length="1" name="object_name_label">
+        <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
                 Via objeto:
         </text>
-        <text type="string" length="1" name="object_name_text">
+        <text type="string" length="1" name="object_name_text" left="105" >
                 ...
         </text>
-        <text type="string" length="1" name="fastpay text">
+        <text type="string" length="1" name="fastpay text" width="115" halign="left">
                 Pagamento Rápido:
         </text>
-        <text type="string" length="1" name="amount text">
+        <text type="string" length="1" name="amount text" left="5" halign="left">
                 Quantia:
         </text>
-        <button label="L$1" label_selected="L$1" name="fastpay 1" />
-        <button label="L$5" label_selected="L$5" name="fastpay 5" />
-        <button label="L$10" label_selected="L$10" name="fastpay 10" />
-        <button label="L$20" label_selected="L$20" name="fastpay 20" />
+        <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/>
+        <button label="L$5" label_selected="L$5" name="fastpay 5"  left="200" width="70"/>
+        <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/>
+        <button label="L$20" label_selected="L$20" name="fastpay 20"  left="200" width="70"/>
         <button label="Pagar" label_selected="Pagar" name="pay btn" />
         <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
+        <line_editor left="60" name="amount" width="50" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml b/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
index 7107ab5..7aac816 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -1,28 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="Enviar cartão postal">
-        <text name="to_label">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Instantâneo por email">
+        <text name="to_label" width="135">
                 Email do Destinatário:
         </text>
+        <line_editor name="to_form" left="143" width="127" />
         <text name="from_label">
                 Seu Email:
         </text>
+        <line_editor name="from_form" left="143" width="127" />
         <text name="name_label">
                 Seu nome:
         </text>
+        <line_editor name="name_form" left="143" width="127" />
         <text name="subject_label">
                 Assunto:
         </text>
+        <line_editor name="subject_form" left="143" width="127" />
+        <line_editor label="Digite seu assunto aqui." name="subject_form"/>
         <text name="msg_label">
                 Mensagem:
         </text>
-        <check_box label="Publicar na Web" name="allow_publish_check"
-             tool_tip="Publicar este postcard na web" />
-        <check_box label="Conteúdo Adulto" name="mature_check"
-             tool_tip="Este postcard possui conteúdo adulto." />
-        <button label="?" name="publish_help_btn" />
+        <text_editor name="msg_form">
+                Digite sua mensagem aqui.
+        </text_editor>
         <text name="fine_print">
-                Se o destinatário do seu postcard é residente em SL, você receberá um bonus..
+                Se seu indicado entrar no SL, você receberá um bônus pela indicação.
         </text>
-        <button label="Cancelar" name="cancel_btn" />
-        <button label="Enviar" name="send_btn" />
+        <button label="Cancelar" name="cancel_btn"/>
+        <button label="Enviar" name="send_btn"/>
+        <string name="default_subject">
+                Cartão postal do Second Life.
+        </string>
+        <string name="default_message">
+                Dá uma olhada nisto!
+        </string>
+        <string name="upload_message">
+                &quot;Enviando...&quot;
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index dcd2d96..a46ba13 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
@@ -4,7 +4,7 @@
                 Descrição:
         </text>
         <button label="Executar in World" label_selected="Parar" name="Anim play btn"
-             tool_tip="Executar esta animação para que outros vejam.." />
+             tool_tip="Executar esta animação para que outros vejam.."  width="131" left="20"/>
         <button label="Executar localmente" label_selected="Parar" name="Anim audition btn"
-             tool_tip="Executar esta animação somente para você ver." />
+             tool_tip="Executar esta animação somente para você ver." width="125" left="162"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
new file mode 100644
index 0000000..83af494
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="classified_preview" title="Classificar Informação"/>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
new file mode 100644
index 0000000..60f8556
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="event_preview" title="Informação de Evento (testemunhos)"/>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 0be325e..3dc4e8f 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -1,32 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="gesture_preview">
+        <string name="stop_txt">
+                Parar
+        </string>
+        <string name="preview_txt">
+                Prévia
+        </string>
+        <string name="none_text">
+                -- Nenhum --
+        </string>
         <text name="desc_label">
                 Descrição:
         </text>
         <text name="trigger_label">
                 Gatilho:
         </text>
-        <text name="replace_text"
-             tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
+        <text name="replace_text" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.">
                 Substituir por:
         </text>
-        <line_editor name="replace_editor"
-             tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. " />
+        <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras. "/>
         <text name="key_label">
                 Tecla de Atalho:
         </text>
-        <combo_box label="Nenhum" name="modifier_combo" />
-        <combo_box label="Nenhum" name="key_combo" />
+        <combo_box label="Nenhum" name="modifier_combo"/>
+        <combo_box label="Nenhum" name="key_combo"/>
         <text name="library_label">
                 Biblioteca:
         </text>
         <text name="steps_label">
                 Passos:
         </text>
-        <button label="Incluir" name="add_btn" />
-        <button label="Mover Para Cima" name="up_btn" />
-        <button label="Mover Para Baixo" name="down_btn" />
-        <button label="Remover" name="delete_btn" />
+        <button label="Incluir" name="add_btn"/>
+        <button label="Mover Para Cima" name="up_btn"/>
+        <button label="Mover Para Baixo" name="down_btn"/>
+        <button label="Remover" name="delete_btn"/>
         <text name="help_label">
                 Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
         </text>
@@ -38,10 +45,9 @@
                         Parar
                 </radio_item>
         </radio_group>
-        <check_box label="Até que a animação esteja concluída" name="wait_anim_check" />
-        <check_box label="tempo em segundos" name="wait_time_check" />
-        <check_box label="Ativar" name="active_check"
-             tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho." />
-        <button label="Preview" name="preview_btn" />
-        <button label="Salvar" name="save_btn" />
+        <check_box label="Até que a animação esteja concluída" name="wait_anim_check"/>
+        <check_box label="tempo em segundos" name="wait_time_check"/>
+        <check_box label="Ativar" name="active_check" tool_tip="Gesto ativos pode ser engatilhados escrevendo suas frases gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
+        <button label="Preview" name="preview_btn"/>
+        <button label="Salvar" name="save_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index 71d285f..e7d3144 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview notecard" title="Nota:">
-        <button label="Salvar" label_selected="Salvar" name="Save" />
-        <text type="string" length="1" name="desc txt">
+        <button label="Salvar" label_selected="Salvar" name="Save"/>
+        <text length="1" name="desc txt" type="string">
                 Descrição:
         </text>
-        <text_editor type="string" length="1" name="Notecard Editor">
+        <text_editor length="1" name="Notecard Editor" type="string">
                 Carregando...
         </text_editor>
+        <string name="no_object">
+                Não foi possível encontrar o objeto que contém esta nota.
+        </string>
+        <string name="not_allowed">
+                Você não tem permissão de visualizar esta nota.
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
index 6818d88..094770a 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
@@ -1,11 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="preview_notecard">
-        <text_editor type="string" length="1" name="Notecard Editor">
+        <text_editor length="1" name="Notecard Editor" type="string">
                 Carregando...
         </text_editor>
-        <text type="string" length="1" name="desc txt">
+        <text length="1" name="desc txt" type="string">
                 Descrição:
         </text>
-        <button label="Guardar" label_selected="Guardar" name="Keep" />
-        <button label="Descartar" label_selected="Descartar" name="Discard" />
+        <button label="Guardar" label_selected="Guardar" name="Keep"/>
+        <button label="Descartar" label_selected="Descartar" name="Discard"/>
+        <string name="no_object">
+                Não foi possível encontrar o objeto que contém esta nota.:
+        </string>
+        <string name="not_allowed">
+                Você não tem permissão para ler esta nota.
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
new file mode 100644
index 0000000..16d9cc8
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="url_preview" title="Informação local"/>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml b/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml
new file mode 100644
index 0000000..b16b1a4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_region_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="regioninfo" title="Região/Propriedade"/>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index b12037d..71e5ccc 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -1,59 +1,165 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_report_abuse" title="Reportar abuso">
+        <texture_picker label="" name="screenshot"/>
+        <check_box label="Incluir screenshot" name="screen_check"/>
         <text name="reporter_title">
                 Denunciador:
         </text>
+        <text name="reporter_field">
+                Loremipsum Dolorsitamut
+        </text>
         <text name="sim_title">
                 Região:
         </text>
+        <text name="sim_field">
+                Nome da Região
+        </text>
         <text name="pos_title">
                 Posição:
         </text>
-        <texture_picker name="screenshot" />
-        <check_box label="Incluir screenshot" name="screen_check" />
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="Object Picker - Identifica um objeto com assunto deste report" />
+        <text name="pos_field">
+                {128.1, 128.1, 15.4}
+        </text>
         <text name="select_object_label">
                 Clique no botão e em seguida no objeto:
         </text>
+        <button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto com assunto deste report"/>
         <text name="object_name_label">
                 Nome:
         </text>
+        <text name="object_name">
+                Consetetur Sadipscing
+        </text>
         <text name="owner_name_label">
                 Proprietário:
         </text>
-        <combo_box name="category_combo"
-             tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
-                <combo_item name="Selectcategory">
-                        Selecione a Categoria
+        <text name="owner_name">
+                Hendrerit Vulputate
+        </text>
+        <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
+                <combo_item name="Select_category">
+                        Selecionar categoria
+                </combo_item>
+                <combo_item name="Age__Age_play">
+                        Idade &gt; Idade no jogo
+                </combo_item>
+                <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+                        Idade &gt; Residente adulto no Second Life Jovem
+                </combo_item>
+                <combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+                        Idade &gt; Residente menor no Second Life Adulto
+                </combo_item>
+                <combo_item name="Assault__Combat_sandbox___unsafe_area">
+                        Assalto &gt; Sandbox de combate / área não segura
+                </combo_item>
+                <combo_item name="Assault__Safe_area">
+                        Assalto &gt; �rea segura
+                </combo_item>
+                <combo_item name="Assault__Weapons_testing_sandbox">
+                        Assalto &gt; Testando armas em sandbox
+                </combo_item>
+                <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+                        Comércio &gt; Falha em enviar produto ou serviço
+                </combo_item>
+                <combo_item name="Disclosure__Real_world_information">
+                        Revelar &gt; Informação do mundo real
+                </combo_item>
+                <combo_item name="Disclosure__Remotely_monitoring chat">
+                        Revelar &gt; Conversa monitorada remotamente
+                </combo_item>
+                <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+                        Revelar &gt; Informação do Second Life/conversa/MIs
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+                        Distúrbio da paz &gt; Uso injusto dos recursos da região
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+                        Distúrbio da paz  &gt; Objetos com excesso de scripts
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Object_littering">
+                        Distúrbio da paz  &gt; Objeto despejando lixo
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Repetitive_spam">
+                        Distúrbio da paz &gt; Spam repetitivo
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+                        Distúrbio da paz &gt; Spam de anúncio indesejado
+                </combo_item>
+                <combo_item name="Fraud__L$">
+                        Fraude &gt; L$
+                </combo_item>
+                <combo_item name="Fraud__Land">
+                        Fraude &gt; Terra
+                </combo_item>
+                <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+                        Fraude &gt; Esquema de pirâmide ou cartas encadeadas
+                </combo_item>
+                <combo_item name="Fraud__US$">
+                        Fraude &gt; R$
+                </combo_item>
+                <combo_item name="Harassment__Advert_farms___visual_spam">
+                        Perturbação &gt; Fazendas de Anúncios / spam visual
+                </combo_item>
+                <combo_item name="Harassment__Defaming_individuals_or_groups">
+                        Perturbação &gt; Difamação de indivíduos ou grupos
+                </combo_item>
+                <combo_item name="Harassment__Impeding_movement">
+                        Perturbação &gt; Impedindo movimentos
+                </combo_item>
+                <combo_item name="Harassment__Sexual_harassment">
+                        Perturbação &gt; Perturbação sexual
+                </combo_item>
+                <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+                        Perturbação &gt; Solicitando/incitando outros a violarem o ToS
+                </combo_item>
+                <combo_item name="Harassment__Verbal_abuse">
+                        Perturbação &gt; Abuso verbal
+                </combo_item>
+                <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+                        Indecência &gt; Conteúdo ou conduta amplamente ofensivos
+                </combo_item>
+                <combo_item name="Indecency__Broadly_visible_mature_content">
+                        Indecência &gt; Conteúdo maduro visível de um modo geral
+                </combo_item>
+                <combo_item name="Indecency__Inappropriate_avatar_name">
+                        Indecência &gt; Nome de avatar inapropriado
+                </combo_item>
+                <combo_item name="Indecency__Mature_content_in_PG_region">
+                        Indecência &gt; Conteúdo maduro numa região PG
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_Content_Removal">
+                        Violação de propriedade intelectual &gt; Remoção de Conteúdo
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+                        Violação de Propriedade intelectual  &gt; Cópia Ilegal ou  Aproveitar-se de Permissões
                 </combo_item>
                 <combo_item name="Intolerance">
                         Intolerância
                 </combo_item>
-                <combo_item name="Harassment">
-                        Assédio
+                <combo_item name="Land__Abuse_of_sandbox_resources">
+                        Terra &gt; Abuso dos recursos da sandbox
                 </combo_item>
-                <combo_item name="Assault">
-                        Assalto
+                <combo_item name="Land__Encroachment__Objects_textures">
+                        Terra &gt; Invasão &gt; Objetos/texturas
                 </combo_item>
-                <combo_item name="Disclosure">
-                        Exposição
+                <combo_item name="Land__Encroachment__Particles">
+                        Terra &gt; Invasão &gt; Partículas
                 </combo_item>
-                <combo_item name="Indecency">
-                        Indecência
+                <combo_item name="Land__Encroachment__Trees_plants">
+                        Terra &gt; Violação &gt; �rvores/plantas
                 </combo_item>
-                <combo_item name="Age">
-                        Idade
+                <combo_item name="Wagering_gambling">
+                        Apostas/jogos de azar
                 </combo_item>
-                <combo_item name="Parcel">
-                        Lote
+                <combo_item name="Other">
+                        Outro
                 </combo_item>
         </combo_box>
         <text name="abuser_name_title">
                 Nome do Denunciado:
         </text>
-        <button label="Selecione" label_selected="" name="select_abuser"
-             tool_tip="Selecione o nome do Denuncionado numa lista" />
+        <button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denuncionado numa lista"/>
+        <check_box label="Não sei o nome do molestador" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do agressor"/>
         <text name="abuser_name_title2">
                 Local do Abuso:
         </text>
@@ -64,11 +170,11 @@
                 Detalhes:
         </text>
         <text name="bug_aviso">
-                Por favor, seja específico com a data, local , natureza do abuso, texto do chat ou MI relevânte e selecione o objeto se possível.
+                Por favor, seja específico(a) sobre data, localidade, natureza do abuso, texto relevante de conversa/MI e selecione o objeto, se possível.
         </text>
         <text name="incomplete_title">
-                Nota: Reports imcompletos não serão investigados
+                Nota: Relatos incompletos não serão investigados.
         </text>
-        <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn" />
-        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
+        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+        <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
index e166442..7ecb8c1 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
@@ -1,99 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="bug_reporter" title="Reportar Bug">
-        <text name="reporter_title">
-                Denunciador:
-        </text>
         <text name="sim_title">
-                Simulador:
-        </text>
-        <text name="pos_title">
-                Local:
+                Região:
         </text>
         <text name="select_object_label">
-                Clique no botão e em seguida no objeto:
-        </text>
-        <button label="" label_selected="" name="pick_btn"
-             tool_tip="Selecionador de objeto - Identifica um objeto como assunto deste report" />
-        <text name="object_name_label">
-                Nome:
-        </text>
-        <text name="owner_name_label">
-                Proprietário:
-        </text>
-        <check_box label="Incluir screenshot" name="screen_check" />
-        <texture_picker label="Trabalhando..." name="screenshot" />
-        <text name="category_label">
-                Categoria:
-        </text>
-        <combo_box name="category_combo"
-             tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
-                <combo_item name="Selectcategory">
-                        Selecione a Categoria
-                </combo_item>
-                <combo_item name="Building">
-                        Construção
-                </combo_item>
-                <combo_item name="Character">
-                        Personagem
-                </combo_item>
-                <combo_item name="Chat/IM">
-                        Chat/MI
-                </combo_item>
-                <combo_item name="Documentation">
-                        Documentação
-                </combo_item>
-                <combo_item name="Exploit">
-                        Exploração
-                </combo_item>
-                <combo_item name="Graphics">
-                        Gráficos
-                </combo_item>
-                <combo_item name="Inventory">
-                        Inventário
-                </combo_item>
-                <combo_item name="Lag">
-                        Lag
-                </combo_item>
-                <combo_item name="MissingContent">
-                        Conteúdo Faltando
-                </combo_item>
-                <combo_item name="LindenDollars(L$)">
-                        Linden Dollars (L$)
-                </combo_item>
-                <combo_item name="Permissions">
-                        Permissões
-                </combo_item>
-                <combo_item name="Physics">
-                        Física
-                </combo_item>
-                <combo_item name="Script">
-                        Script
-                </combo_item>
-                <combo_item name="Sound">
-                        Sons
-                </combo_item>
-                <combo_item name="Stipends">
-                        Valor de Entrada
-                </combo_item>
-                <combo_item name="Userinterface">
-                        Interface do Usuário
-                </combo_item>
-                <combo_item name="Miscellaneous">
-                        Miscelânia
-                </combo_item>
-        </combo_box>
-        <text name="sum_title">
-                Resumo:
-        </text>
-        <text name="dscr_title">
-                detalhes: (Por favor, forneceça o máximo de informação que puder)
-        </text>
-        <text_editor name="details_edit">
-                Passos para reproduzir o bug: Resultados Obtido: Resultados Esperados:
-        </text_editor>
-        <text name="bug_aviso">
-                Nota: Reports incompletos não serão investigados. Se este bug permite que você faça algo que não poderia fazer, especialmente se isso representa uma ameaça a performace ou segurança, por favor selecione a categoria Exploração. Obrigado!
+                Clique no botão e depois no objeto:
         </text>
-        <button label="Reportar Bug" label_selected="Reportar Bug" name="send_btn" />
-        <button label="Cancelar" label_selected="Cancelar" name="cancel_btn" />
+        <texture_picker label="" name="screenshot"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index fbbad17..5c38df6 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
@@ -1,6 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Script Errors/Warning">
-        <tab_container name="Preview Tabs">
-                <floater label="Script" name="all_scripts" title="[All scripts]" />
-        </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="script debug floater" title="Aviso de script/erro"/>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
index eb85ea1..c57a7e1 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
@@ -1,30 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="script panel">
-        <text_editor type="string" length="1" name="Script Editor">
+        <text_editor length="1" name="Script Editor" type="string">
                 Loading...
         </text_editor>
-        <button label="Salvar" label_selected="Salvar" name="Save_btn" />
+        <button label="Salvar" label_selected="Salvar" name="Save_btn"/>
+        <combo_box label="Inserir..." name="Insert..."/>
         <menu_bar name="script_menu">
                 <menu name="File">
-                        <menu_item_call label="Salvar" name="Save" />
-                        <menu_item_call label="Desfazer as Mudanças" name="Revert All Changes" />
+                        <menu_item_call label="Salvar" name="Save"/>
+                        <menu_item_call label="Desfazer as Mudanças" name="Revert All Changes"/>
                 </menu>
                 <menu name="Edit">
-                        <menu_item_call label="Desfazer" name="Undo" />
-                        <menu_item_call label="Desfazer" name="Redo" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="Recortar" name="Cut" />
-                        <menu_item_call label="Copiar" name="Copy" />
-                        <menu_item_call label="Colar" name="Paste" />
-                        <menu_item_separator label="-----------" name="separator2" />
-                        <menu_item_call label="Selecionar Tudo" name="Select All" />
-                        <menu_item_call label="Retirar seleção" name="Deselect" />
-                        <menu_item_separator label="-----------" name="separator3" />
-                        <menu_item_call label="Buscar / Substituir..." name="Search / Replace..." />
+                        <menu_item_call label="Desfazer" name="Undo"/>
+                        <menu_item_call label="Desfazer" name="Redo"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Recortar" name="Cut"/>
+                        <menu_item_call label="Copiar" name="Copy"/>
+                        <menu_item_call label="Colar" name="Paste"/>
+                        <menu_item_separator label="-----------" name="separator2"/>
+                        <menu_item_call label="Selecionar Tudo" name="Select All"/>
+                        <menu_item_call label="Retirar seleção" name="Deselect"/>
+                        <menu_item_separator label="-----------" name="separator3"/>
+                        <menu_item_call label="Buscar / Substituir..." name="Search / Replace..."/>
                 </menu>
                 <menu name="Help">
-                        <menu_item_call label="Ajuda..." name="Help..." />
-                        <menu_item_call label="Ajuda LSL Wiki..." name="LSL Wiki Help..." />
+                        <menu_item_call label="Ajuda..." name="Help..."/>
+                        <menu_item_call label="Ajuda LSL Wiki..." name="LSL Wiki Help..."/>
                 </menu>
         </menu_bar>
+        <string name="loading">
+                Carregando...
+        </string>
+        <string name="can_not_view">
+                Você não tem permissão de visualizar este script.
+        </string>
+        <string name="public_objects_can_not_run">
+                Objetos públicos não podem rodar scripts
+        </string>
+        <string name="script_running">
+                Funcionando
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
new file mode 100644
index 0000000..2fc2473
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floaterreleasemessage" title="Entrando na região">

+        <button label="fechar" name="close_btn"/>

+        <string name="in-world_help_title">

+                Ajuda no mundo

+        </string>

+        <string name="additional_help_title">

+                Ajuda adicional

+        </string>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 6c34ba3..b24d7fa 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -1,23 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Snapshot" title="Visualizar foto">
         <text name="type_label">
-                O que você gostaria de fazer?
+                Instantâneo do destino
         </text>
         <radio_group label="Tipo de Foto" name="snapshot_type_radio">
                 <radio_item name="postcard">
-                        Enviar um postcard
+                        Enviar por email
                 </radio_item>
                 <radio_item name="texture">
-                        Upload de uma foto
+                        Salvar no seu inventário (L$10)
                 </radio_item>
                 <radio_item name="local">
-                        Salvar foto no seu HD
+                        Salvar no seu disco rígido
                 </radio_item>
         </radio_group>
+        <text name="file_size_label">
+                Tamanho do arquivo: [SIZE] KB
+        </text>
+        <button label="Atualizar o Instantâneo" name="new_snapshot_btn"/>
+        <button label="Enviar" name="send_btn"/>
+        <button label="Salvar (L$10)" name="upload_btn"/>
+        <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
+                <flyout_button_item name="save_item">
+                        Salvar
+                </flyout_button_item>
+                <flyout_button_item name="saveas_item">
+                        Salvar como...
+                </flyout_button_item>
+        </flyout_button>
+        <button label="Cancelar" name="discard_btn"/>
+        <button label="Mais &gt;" name="more_btn" tool_tip="Opções Avançadas"/>
+        <button label="&lt; Menos" name="less_btn" tool_tip="Opções Avançadas"/>
         <text name="type_label2">
-                Que tamanho de imagem você precisa?
+                Tamanho
+        </text>
+        <text name="format_label">
+                Formato
         </text>
         <combo_box label="Resolução" name="postcard_size_combo">
+                <combo_item name="CurrentWindow">
+                        Janela Atual
+                </combo_item>
                 <combo_item name="640x480">
                         640x480
                 </combo_item>
@@ -27,9 +50,6 @@
                 <combo_item name="1024x768">
                         1024x768
                 </combo_item>
-                <combo_item name="CurrentWindow">
-                        Janela Atual
-                </combo_item>
                 <combo_item name="Custom">
                         Customizado
                 </combo_item>
@@ -77,9 +97,21 @@
                         Customizado
                 </combo_item>
         </combo_box>
-        <spinner label="Largura" name="snapshot_width" />
-        <spinner label="Altura" name="snapshot_height" />
-        <slider label="Qualidade da Imagem" name="image_quality_slider" />
+        <combo_box label="Formato" name="local_format_combo">
+                <combo_item name="PNG">
+                        PNG
+                </combo_item>
+                <combo_item name="JPEG">
+                        JPEG
+                </combo_item>
+                <combo_item name="BMP">
+                        BMP
+                </combo_item>
+        </combo_box>
+        <spinner label="Largura" name="snapshot_width"/>
+        <spinner label="Altura" name="snapshot_height"/>
+        <check_box label="Restringir proporções" name="keep_aspect_check"/>
+        <slider label="Qualidade da Imagem" name="image_quality_slider"/>
         <text name="layer_type_label">
                 Capturar:
         </text>
@@ -94,18 +126,12 @@
                         Decoração do Objeto
                 </combo_item>
         </combo_box>
-        <text name="file_size_label">
-                Tamanho do Arquivo: [SIZE]
-        </text>
-        <check_box label="Mostrar interface na Foto" name="ui_check" />
-        <check_box label="Mostrar Objetos HUD na Foto" name="hud_check" />
-        <check_box label="Manter aberto após salvar" name="keep_open_check" />
-        <check_box label="Manter aparência selecionada" name="keep_aspect_check" />
-        <check_box label="Quadro Congelado" name="freeze_frame_check" />
-        <button label="Nova foto" name="new_snapshot_btn" />
-        <check_box label="Auto-snapshot" name="auto_snapshot_check" />
-        <button label="Upload (L$10)" name="upload_btn" />
-        <button label="Enviar" name="send_btn" />
-        <button label="Salvar" name="save_btn" />
-        <button label="Descartar" name="discard_btn" />
+        <check_box label="Mostrar interface na Foto" name="ui_check"/>
+        <check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+        <check_box label="Manter aberto após salvar" name="keep_open_check"/>
+        <check_box label="Quadro Congelado" name="freeze_frame_check"/>
+        <check_box label="Auto-atualizar" name="auto_snapshot_check"/>
+        <string name="unknown">
+                desconhecido
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index b2b078a..b83fafe 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="Pegar: Textura">
-        <text type="string" length="1" name="Multiple">
+        <string name="choose_picture">
+                Clique para escolher uma imagem
+        </string>
+        <text length="1" name="Multiple" type="string">
                 Multiplo
         </text>
-        <text type="string" length="1" name="unknown">
-                Dimenções: 512 x 512
+        <text length="1" name="unknown" type="string">
+                Dimensões: [DIMENSIONS]
         </text>
-        <button label="Padrão" label_selected="Padrão" name="Default" />
-        <button label="Nenhum" label_selected="Nenhum" name="None" />
-        <button label="Branco" label_selected="Branco" name="Blank" />
-        <check_box label="Mostrar Pastas" name="show_folders_check" />
-        <check_box label="Aplicar Imediatamente" name="apply_immediate_check" />
-        <button label="" label_selected="" name="Pipette" />
-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <button label="Selecionar" label_selected="Selecionar" name="Select" />
+        <button label="Padrão" label_selected="Padrão" name="Default"/>
+        <button label="Nenhum" label_selected="Nenhum" name="None"/>
+        <button label="Branco" label_selected="Branco" name="Blank"/>
+        <check_box label="Mostrar Pastas" name="show_folders_check"/>
+        <search_editor label="Clique aqui para buscar" name="inventory search editor"/>
+        <check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
+        <button label="" label_selected="" name="Pipette"/>
+        <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+        <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+        <string name="pick title">
+                Pegar:
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_tools.xml b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
index fceea92..23099fe 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,46 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="toolbox floater" title="">
-        <button label="" label_selected="" name="button focus" />
-        <text name="tool label">
-                Foco
-        </text>
-        <button label="" label_selected="" name="button move" />
-        <text name="tool label2">
-                Mover
-        </text>
-        <button label="" label_selected="" name="button edit" />
-        <text name="tool label3">
-                Editar
-        </text>
-        <button label="" label_selected="" name="button create" />
-        <text name="tool label4">
-                Criar
-        </text>
-        <button label="" label_selected="" name="button land" />
-        <text name="tool label5">
-                Terra
-        </text>
-        <check_box label="Zoom" name="radio zoom" />
-        <check_box label="Orbita (Ctrl)" name="radio orbit" />
-        <check_box label="Pan (Ctrl-Shift)" name="radio pan" />
-        <check_box label="Mover" name="radio move" />
-        <check_box label="Suspender (Ctrl)" name="radio lift" />
-        <check_box label="Girar (Ctrl-Shift)" name="radio spin" />
-        <check_box label="Posição" name="radio position" />
-        <check_box label="Rotacionar (Ctrl)" name="radio rotate" />
-        <check_box label="Esticar (Ctrl-Shift)" name="radio stretch" />
-        <check_box label="Selecionar Textura" name="radio select face" />
-        <check_box label="Editar partes linkadas" name="checkbox edit linked parts" />
-        <check_box label="Grade" name="checkbox snap to grid" />
-        <button label="Opções..." label_selected="Opções..." name="Options..." />
-        <check_box label="Esticar ambos os lados" name="checkbox uniform" />
-        <check_box label="Esticar Texturas" name="checkbox stretch textures" />
+        <button label="" label_selected="" name="button focus" tool_tip="Foco"/>
+        <button label="" label_selected="" name="button move" tool_tip="Mover"/>
+        <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
+        <button label="" label_selected="" name="button create" tool_tip="Criar"/>
+        <button label="" label_selected="" name="button land" tool_tip="Terra"/>
+        <check_box label="Zoom" name="radio zoom"/>
+        <check_box label="Orbita (Ctrl)" name="radio orbit"/>
+        <check_box label="Pan (Ctrl-Shift)" name="radio pan"/>
+        <check_box label="Mover" name="radio move"/>
+        <check_box label="Suspender (Ctrl)" name="radio lift"/>
+        <check_box label="Girar (Ctrl-Shift)" name="radio spin"/>
+        <check_box label="Posição" name="radio position"/>
+        <check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
+        <check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
+        <check_box label="Selecionar Textura" name="radio select face"/>
+        <check_box label="Editar partes linkadas" name="checkbox edit linked parts"/>
         <text name="text ruler mode">
                 Modo
         </text>
-        <text name="text status">
-                Arraste para mover, shift+Arrastar para Copiar
-        </text>
         <combo_box name="combobox grid mode">
                 <combo_item name="World">
                         Mundo
@@ -52,32 +30,39 @@
                         Referência
                 </combo_item>
         </combo_box>
-        <button label="" label_selected="" name="ToolCube" />
-        <button label="" label_selected="" name="ToolPrism" />
-        <button label="" label_selected="" name="ToolPyramid" />
-        <button label="" label_selected="" name="ToolTetrahedron" />
-        <button label="" label_selected="" name="ToolCylinder" />
-        <button label="" label_selected="" name="ToolHemiCylinder" />
-        <button label="" label_selected="" name="ToolCone" />
-        <button label="" label_selected="" name="ToolHemiCone" />
-        <button label="" label_selected="" name="ToolSphere" />
-        <button label="" label_selected="" name="ToolHemiSphere" />
-        <check_box label="Copiar Seleção" name="checkbox copy selection" />
-        <button label="" label_selected="" name="ToolTorus" />
-        <button label="" label_selected="" name="ToolTube" />
-        <button label="" label_selected="" name="ToolRing" />
-        <button label="" label_selected="" name="ToolTree" />
-        <button label="" label_selected="" name="ToolGrass" />
-        <check_box label="Manter ferramenta selecionada" name="checkbox sticky" />
-        <check_box label="Copiar Centro" name="checkbox copy centers" />
-        <check_box label="Rotacionar Copia" name="checkbox copy rotates" />
-        <check_box label="Selecionar Terra" name="radio select land" />
-        <check_box label="Aplainar Terra" name="radio flatten" />
-        <check_box label="Elevar Terra" name="radio raise" />
-        <check_box label="Baixar Terra" name="radio lower" />
-        <check_box label="Suavizar Terra" name="radio smooth" />
-        <check_box label="Terrano Rígido" name="radio noise" />
-        <check_box label="Reverter Terra" name="radio revert" />
+        <check_box label="Esticar ambos os lados" name="checkbox uniform"/>
+        <check_box label="Esticar Texturas" name="checkbox stretch textures"/>
+        <check_box label="Grade" name="checkbox snap to grid"/>
+        <button label="Opções..." label_selected="Opções..." name="Options..."/>
+        <text name="text status">
+                Arraste para mover, shift+Arrastar para Copiar
+        </text>
+        <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
+        <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+        <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/>
+        <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
+        <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
+        <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semi-cilindro"/>
+        <button label="" label_selected="" name="ToolCone" tool_tip="Cone"/>
+        <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semi-cone"/>
+        <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+        <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semi-esfera"/>
+        <button label="" label_selected="" name="ToolTorus" tool_tip="Toróide"/>
+        <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+        <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/>
+        <button label="" label_selected="" name="ToolTree" tool_tip="�rvore"/>
+        <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/>
+        <check_box label="Manter ferramenta selecionada" name="checkbox sticky"/>
+        <check_box label="Copiar Seleção" name="checkbox copy selection"/>
+        <check_box label="Copiar Centro" name="checkbox copy centers"/>
+        <check_box label="Rotacionar Copia" name="checkbox copy rotates"/>
+        <check_box label="Selecionar Terra" name="radio select land"/>
+        <check_box label="Aplainar Terra" name="radio flatten"/>
+        <check_box label="Elevar Terra" name="radio raise"/>
+        <check_box label="Baixar Terra" name="radio lower"/>
+        <check_box label="Suavizar Terra" name="radio smooth"/>
+        <check_box label="Terrano Rígido" name="radio noise"/>
+        <check_box label="Reverter Terra" name="radio revert"/>
         <combo_box name="combobox brush size">
                 <combo_item name="Small">
                         Pequeno
@@ -89,11 +74,13 @@
                         Grande
                 </combo_item>
         </combo_box>
-        <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado"
-             name="button apply to selection" tool_tip="Modificar Terra Selecionada" />
-        <check_box label="Mostrar Proprietários" name="checkbox show owners" />
-        <button label="Mais &gt;&gt;" name="button more" tool_tip="Opções Avançadas" />
-        <button label="&lt;&lt; Menos" name="button less" tool_tip="Opções Avançadas" />
+        <text name="Strength:">
+                Força:
+        </text>
+        <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/>
+        <check_box label="Mostrar Proprietários" name="checkbox show owners"/>
+        <button label="Mais &gt;&gt;" name="button more" tool_tip="Opções Avançadas"/>
+        <button label="&lt;&lt; Menos" name="button less" tool_tip="Opções Avançadas"/>
         <tab_container name="Object Info Tabs">
                 <panel label="Comum" name="General">
                         <text name="Name:">
@@ -108,21 +95,21 @@
                         <text name="Creator Name">
                                 Thrax Linden
                         </text>
-                        <button label="Perfil..." label_selected="Perfil..." name="button creator profile" />
+                        <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
                         <text name="Owner:">
                                 Proprietário:
                         </text>
                         <text name="Owner Name">
                                 Thrax Linden
                         </text>
-                        <button label="Perfil..." label_selected="Perfil..." name="button owner profile" />
+                        <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
                         <text name="Group:">
                                 Grupo:
                         </text>
                         <text name="Group Name Proxy">
                                 Os Lindens
                         </text>
-                        <button label="Selecionar..." label_selected="Selecionar..." name="button set group" />
+                        <button label="Selecionar..." label_selected="Selecionar..." name="button set group"/>
                         <text name="prim info">
                                 1 Objeto, 1 Primitiva
                         </text>
@@ -132,20 +119,19 @@
                         <text name="perm_modify">
                                 Você pode modificar este objeto.
                         </text>
-                        <check_box label="Compartilhar com o Grupo" name="checkbox share with group"
-                             tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem" />
-                        <text name="text deed continued">
+                        <check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem"/>
+                        <string name="text deed continued">
                                 Acionar...
-                        </text>
-                        <text name="text deed">
+                        </string>
+                        <string name="text deed">
                                 Acionar
-                        </text>
-                        <button label="Acionar..." label_selected="Acionar..." name="button deed"
-                             tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo." />
-                        <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move" />
-                        <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy" />
-                        <check_box label="A Venda" name="checkbox for sale" />
-                        <text name="Price:  L$">
+                        </string>
+                        <button label="Acionar..." label_selected="Acionar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser acionados pelo gerente do grupo."/>
+                        <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
+                        <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
+                        <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
+                        <check_box label="A Venda" name="checkbox for sale"/>
+                        <text name="Cost">
                                 Preço:  L$
                         </text>
                         <radio_group name="sale type">
@@ -162,9 +148,9 @@
                         <text name="Next owner can:">
                                 Próximo Proprietário pode:
                         </text>
-                        <check_box label="Modificar" name="checkbox next owner can modify" />
-                        <check_box label="Copiar" name="checkbox next owner can copy" />
-                        <check_box label="Revender/Dar" name="checkbox next owner can transfer" />
+                        <check_box label="Modificar" name="checkbox next owner can modify"/>
+                        <check_box label="Copiar" name="checkbox next owner can copy"/>
+                        <check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
                         <text name="label click action">
                                 Quando clicado com o botão esquerdo:
                         </text>
@@ -184,6 +170,12 @@
                                 <combo_item name="Open">
                                         Abrir
                                 </combo_item>
+                                <combo_item name="Play">
+                                        Executar a mídia do terreno
+                                </combo_item>
+                                <combo_item name="Opemmedia">
+                                        Abrir a mídia do terreno
+                                </combo_item>
                         </combo_box>
                         <text name="B:">
                                 B:
@@ -203,21 +195,36 @@
                         <text name="F:">
                                 F:
                         </text>
-                        <text name="text modify info 1">
+                        <string name="text modify info 1">
                                 Você pode modificar este objeto.
-                        </text>
-                        <text name="text modify info 2">
+                        </string>
+                        <string name="text modify info 2">
                                 Você pode modificar estes objetos.
-                        </text>
-                        <text name="text modify info 3">
+                        </string>
+                        <string name="text modify info 3">
                                 Você não pode modificar este objeto.
-                        </text>
-                        <text name="text modify info 4">
+                        </string>
+                        <string name="text modify info 4">
                                 Você não pode modificar estes objetos.
-                        </text>
-                        <text name="text modify warning">
+                        </string>
+                        <string name="text modify warning">
                                 Você precisa selecionar o objeto todo para ajustar as permissões.
-                        </text>
+                        </string>
+                        <string name="Cost Default">
+                                Preço:           L$
+                        </string>
+                        <string name="Cost Total">
+                                Preço Total:  L$
+                        </string>
+                        <string name="Cost Per Unit">
+                                Preço Por:     L$
+                        </string>
+                        <string name="Cost Mixed">
+                                Preço Misturado
+                        </string>
+                        <string name="Sale Mixed">
+                                Venda Misturada
+                        </string>
                 </panel>
                 <panel label="Objeto" name="Object">
                         <text name="select_single">
@@ -226,32 +233,28 @@
                         <text name="edit_object">
                                 Editar os parâmetros do Objeto:
                         </text>
-                        <check_box label="Travado" name="checkbox locked"
-                             tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção." />
-                        <check_box label="Física" name="Physical Checkbox Ctrl"
-                             tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade" />
-                        <check_box label="Temporário" name="Temporary Checkbox Ctrl"
-                             tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado." />
-                        <check_box label="Fantasma" name="Phantom Checkbox Ctrl"
-                             tool_tip="Faz com que o objeto não colida com outros objetos ou avatares" />
+                        <check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
+                        <check_box label="Física" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados sofram efeito da gravidade"/>
+                        <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/>
+                        <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/>
                         <text name="label position">
                                 Posição (metros)
                         </text>
-                        <spinner label="X" name="Pos X" />
-                        <spinner label="Y" name="Pos Y" />
-                        <spinner label="Z" name="Pos Z" />
+                        <spinner label="X" name="Pos X"/>
+                        <spinner label="Y" name="Pos Y"/>
+                        <spinner label="Z" name="Pos Z"/>
                         <text name="label size">
                                 Tamanho (metros)
                         </text>
-                        <spinner label="X" name="Scale X" />
-                        <spinner label="Y" name="Scale Y" />
-                        <spinner label="Z" name="Scale Z" />
+                        <spinner label="X" name="Scale X"/>
+                        <spinner label="Y" name="Scale Y"/>
+                        <spinner label="Z" name="Scale Z"/>
                         <text name="label rotation">
                                 Rotação (graus)
                         </text>
-                        <spinner label="X" name="Rot X" />
-                        <spinner label="Y" name="Rot Y" />
-                        <spinner label="Z" name="Rot Z" />
+                        <spinner label="X" name="Rot X"/>
+                        <spinner label="Y" name="Rot Y"/>
+                        <spinner label="Z" name="Rot Z"/>
                         <text name="label material">
                                 Material
                         </text>
@@ -310,8 +313,8 @@
                         <text name="text cut">
                                 Recorte inicial e final
                         </text>
-                        <spinner label="B" name="cut begin" />
-                        <spinner label="E" name="cut end" />
+                        <spinner label="B" name="cut begin"/>
+                        <spinner label="E" name="cut end"/>
                         <text name="text hollow">
                                 Vazio
                         </text>
@@ -338,42 +341,63 @@
                         <text name="text twist">
                                 Torcer no Inicio e final
                         </text>
-                        <spinner label="B" name="Twist Begin" />
-                        <spinner label="E" name="Twist End" />
+                        <spinner label="B" name="Twist Begin"/>
+                        <spinner label="E" name="Twist End"/>
                         <text name="scale_taper">
                                 Afinar
                         </text>
                         <text name="scale_hole">
                                 Tamanho do Buraco
                         </text>
-                        <spinner label="X" name="Taper Scale X" />
-                        <spinner label="Y" name="Taper Scale Y" />
+                        <spinner label="X" name="Taper Scale X"/>
+                        <spinner label="Y" name="Taper Scale Y"/>
                         <text name="text topshear">
                                 Inclinar
                         </text>
-                        <spinner label="X" name="Shear X" />
-                        <spinner label="Y" name="Shear Y" />
+                        <spinner label="X" name="Shear X"/>
+                        <spinner label="Y" name="Shear Y"/>
                         <text name="advanced_cut">
                                 Perfil Recortado no Início e Final
                         </text>
                         <text name="advanced_dimple">
                                 Cova Inicio e Final
                         </text>
-                        <spinner label="B" name="Path Limit Begin" />
-                        <spinner label="E" name="Path Limit End" />
+                        <spinner label="B" name="Path Limit Begin"/>
+                        <spinner label="E" name="Path Limit End"/>
                         <text name="text taper2">
                                 Afinar
                         </text>
-                        <spinner label="X" name="Taper X" />
-                        <spinner label="Y" name="Taper Y" />
+                        <spinner label="X" name="Taper X"/>
+                        <spinner label="Y" name="Taper Y"/>
                         <text name="text radius delta">
-                                Radius Delta
+                                Raio
                         </text>
                         <text name="text revolutions">
                                 Revoluções
                         </text>
-                        <texture_picker label="Sculpt Texture" name="sculpt texture control"
-                             tool_tip="Click to choose a picture" />
+                        <texture_picker label="Sculpt Texture" name="sculpt texture control" tool_tip="Click to choose a picture"/>
+                        <check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/>
+                        <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/>
+                        <text name="label sculpt type">
+                                Tipo costura
+                        </text>
+                        <combo_box name="sculpt type control">
+                                <combo_item name="None">
+                                        (nenhum)
+                                </combo_item>
+                                <combo_item name="Sphere">
+                                        Esfera
+                                </combo_item>
+                                <combo_item name="Torus">
+                                        Toróide
+                                </combo_item>
+                                <combo_item name="Plane">
+                                        Plano
+                                </combo_item>
+                                <combo_item name="Cylinder">
+                                        Cilindro
+                                </combo_item>
+                        </combo_box>
                 </panel>
                 <panel label="Recursos" name="Features">
                         <text name="select_single">
@@ -382,34 +406,34 @@
                         <text name="edit_object">
                                 Editar recursos do Objeto:
                         </text>
-                        <check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl"
-                             tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)" />
-                        <spinner label="Suavidade" name="FlexNumSections" />
-                        <spinner label="Gravidade" name="FlexGravity" />
-                        <spinner label="Arrastar" name="FlexFriction" />
-                        <spinner label="Vento" name="FlexWind" />
-                        <spinner label="Tensão" name="FlexTension" />
-                        <spinner label="Força X" name="FlexForceX" />
-                        <spinner label="Força Y" name="FlexForceY" />
-                        <spinner label="Força Z" name="FlexForceZ" />
-                        <check_box label="Luz" name="Light Checkbox Ctrl"
-                             tool_tip="Faz com que o objeto emita luz" />
+                        <check_box label="Flexíbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/>
+                        <spinner label="Suavidade" name="FlexNumSections"/>
+                        <spinner label="Gravidade" name="FlexGravity"/>
+                        <spinner label="Arrastar" name="FlexFriction"/>
+                        <spinner label="Vento" name="FlexWind"/>
+                        <spinner label="Tensão" name="FlexTension"/>
+                        <spinner label="Força X" name="FlexForceX"/>
+                        <spinner label="Força Y" name="FlexForceY"/>
+                        <spinner label="Força Z" name="FlexForceZ"/>
+                        <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/>
                         <text name="label color">
                                 Cor
                         </text>
-                        <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores" />
-                        <spinner label="Intensidade" name="Light Intensity" />
-                        <spinner label="Radius" name="Light Radius" />
-                        <spinner label="Queda" name="Light Falloff" />
+                        <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o seletor de Cores"/>
+                        <spinner label="Intensidade" name="Light Intensity"/>
+                        <spinner label="Radius" name="Light Radius"/>
+                        <spinner label="Queda" name="Light Falloff"/>
                 </panel>
                 <panel label="Textura" name="Texture">
-                        <texture_picker label="Textura" name="texture control"
-                             tool_tip="Clique para escolher uma imagem" />
-                        <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores" />
+                        <texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
+                        <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o seletor de cores"/>
                         <text name="color trans">
                                 Transparência %
                         </text>
-                        <check_box label="Claridade" name="checkbox fullbright" />
+                        <text name="glow label">
+                                Brilho
+                        </text>
+                        <check_box label="Claridade" name="checkbox fullbright"/>
                         <text name="tex gen">
                                 Mapeamento
                         </text>
@@ -500,35 +524,35 @@
                         <text name="tex scale">
                                 Repetir por Face
                         </text>
-                        <spinner label="Horizontal (U)" name="TexScaleU" />
-                        <check_box label="Flip" name="checkbox flip s" />
-                        <spinner label="Vertical (V)" name="TexScaleV" />
-                        <check_box label="Flip" name="checkbox flip t" />
+                        <spinner label="Horizontal (U)" name="TexScaleU"/>
+                        <check_box label="Flip" name="checkbox flip s"/>
+                        <spinner label="Vertical (V)" name="TexScaleV"/>
+                        <check_box label="Flip" name="checkbox flip t"/>
                         <text name="tex rotate">
                                 Rotação (graus)
                         </text>
-                        <text name="string repeats per meter">
+                        <string name="string repeats per meter">
                                 Repetir por Metro
-                        </text>
-                        <text name="string repeats per face">
+                        </string>
+                        <string name="string repeats per face">
                                 Repetir por Face
-                        </text>
+                        </string>
                         <text name="rpt">
                                 Repetir por Metro
                         </text>
-                        <button label="Aplicar" label_selected="Aplicar" name="button apply" />
+                        <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
                         <text name="tex offset">
                                 Offset
                         </text>
-                        <spinner label="Horizontal (U)" name="TexOffsetU" />
-                        <spinner label="Vertical (V)" name="TexOffsetV" />
+                        <spinner label="Horizontal (U)" name="TexOffsetU"/>
+                        <spinner label="Vertical (V)" name="TexOffsetV"/>
                         <text name="textbox autofix">
                                 Alinhar Texturas (precisa ser carregada primeiro)
                         </text>
-                        <button label="Alinhar" label_selected="Alinhar" name="button align" />
+                        <button label="Alinhar" label_selected="Alinhar" name="button align"/>
                 </panel>
                 <panel label="Conteúdo" name="Contents">
-                        <button label="Novo Script..." label_selected="Novo Script..." name="button new script" />
+                        <button label="Novo Script..." label_selected="Novo Script..." name="button new script"/>
                 </panel>
         </tab_container>
         <panel name="land info panel">
@@ -538,14 +562,49 @@
                 <text name="label_area">
                         �rea: [AREA] m2.
                 </text>
-                <button label="Comprar Terra..." label_selected="Comprar Terra.."
-                     name="button buy land" />
-                <button label="Abandonar Terra..." label_selected="Abandonar Terra..."
-                     name="button abandon land" />
-                <button label="Sub-Dividir..." label_selected="Subdivide..."
-                     name="button subdivide land" />
-                <button label="Unir..." label_selected="Unir..." name="button join land" />
-                <button label="Sobre a Terra..." label_selected="Sobre a Terra..."
-                     name="button about land" />
+                <button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/>
+                <button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/>
+                <button label="Sub-Dividir..." label_selected="Subdivide..." name="button subdivide land"/>
+                <button label="Unir..." label_selected="Unir..." name="button join land"/>
+                <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
         </panel>
+        <string name="status_rotate">
+                Arrastar as bandas coloridas para girar o objeto
+        </string>
+        <string name="status_scale">
+                Clicar e arrastar para esticar o lado selecionado
+        </string>
+        <string name="status_move">
+                Arrastar para mover, Shift-arrastar para copiar
+        </string>
+        <string name="status_modifyland">
+                Clicar e reter para modificar a terra
+        </string>
+        <string name="status_camera">
+                Clicar e arrastar para mudar a vista
+        </string>
+        <string name="status_grab">
+                Arrastar para mover objetos, Ctrl para levantar, Ctrl-Shift para girar
+        </string>
+        <string name="status_place">
+                Clicar no mundo para criar, shift-clicar para selecionar
+        </string>
+        <string name="status_selectland">
+                Clicar e arrastar para selecionar a terra.
+        </string>
+        <string name="grid_screen_text">
+                Tela
+        </string>
+        <string name="grid_local_text">
+                Local
+        </string>
+        <string name="grid_world_text">
+                Mundo
+        </string>
+        <string name="grid_reference_text">
+                Referência
+        </string>
+        <string name="grid_attachment_text">
+                Anexo
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 3544b72..f2ba9d8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,50 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="top_objects" title="Carregando...">
         <text name="title_text">
                 Carregando...
         </text>
         <scroll_list name="objects_list">
-                <column label="Placar" name="score" />
-                <column label="Nome" name="name" />
-                <column label="Proprietário" name="owner" />
-                <column label="Local" name="location" />
+                <column label="Placar" name="score"/>
+                <column label="Nome" name="name"/>
+                <column label="Proprietário" name="owner"/>
+                <column label="Local" name="location"/>
+                <column label="Tempo" name="time"/>
         </scroll_list>
         <text name="id_text">
                 ID do Objeto:
         </text>
-        <button label="Mostrar Avisos" name="show_beacon_btn" />
+        <button label="Mostrar Avisos" name="show_beacon_btn"/>
         <text name="obj_name_text">
                 Nome do Objeto:
         </text>
-        <button label="Filtro" name="filter_object_btn" />
+        <button label="Filtro" name="filter_object_btn"/>
         <text name="owner_name_text">
                 Nome do Proprietário:
         </text>
-        <button label="Filtro" name="filter_owner_btn" />
-        <button label="Retornar Selecionado" name="return_selected_btn" />
-        <button label="Retornar Tudo" name="return_all_btn" />
-        <button label="Desabilitar Selecionado" name="disable_selected_btn" />
-        <button label="Desabilitar Tudo" name="disable_all_btn" />
-        <button label="Atualizar" name="refresh_btn" />
-        <text name="top_scripts_title">
+        <button label="Filtro" name="filter_owner_btn"/>
+        <button label="Retornar Selecionado" name="return_selected_btn"/>
+        <button label="Retornar Tudo" name="return_all_btn"/>
+        <button label="Desabilitar Selecionado" name="disable_selected_btn"/>
+        <button label="Desabilitar Tudo" name="disable_all_btn"/>
+        <button label="Atualizar" name="refresh_btn"/>
+        <string name="top_scripts_title">
                 Top Scripts
-        </text>
-        <text name="top_scripts_text">
+        </string>
+        <string name="top_scripts_text">
                 [COUNT] scripts tomando um total de [TIME] ms
-        </text>
-        <text name="scripts_score_label">
+        </string>
+        <string name="scripts_score_label">
                 Tempo
-        </text>
-        <text name="top_colliders_title">
+        </string>
+        <string name="top_colliders_title">
                 Top Colisões
-        </text>
-        <text name="top_colliders_text">
+        </string>
+        <string name="top_colliders_text">
                 Top [COUNT] objetos experimentando muitas colisções em potencial
-        </text>
-        <text name="colliders_score_label">
+        </string>
+        <string name="colliders_score_label">
                 Placar
-        </text>
-        <text name="none_descriptor">
+        </string>
+        <string name="none_descriptor">
                 Nenhum encotrado.
-        </text>
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_tos.xml b/linden/indra/newview/skins/default/xui/pt/floater_tos.xml
index be9d1fb..e5933f3 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="modal container" title=" ">
-        <button label="Continuar" label_selected="Continuar" name="Continue" />
-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <radio_group name="tos_agreement">
-                <radio_item name="radio_disagree">
-                        Eu não concordo com os Termos de Serviço
-                </radio_item>
-                <radio_item name="radio_agree">
-                        Eu concordo com os Termos de Serviço
-                </radio_item>
-        </radio_group>
-        <text name="tos_title">
-                Contrato dos Termos de Serviço
-        </text>
+        <button label="Continuar" label_selected="Continuar" name="Continue"/>
+        <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+        <check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
         <text name="tos_heading">
                 Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando Second Life, você precisa aceitar o acordo.
         </text>
         <text_editor name="tos_text">
                 TOS_TEXT
         </text_editor>
+        <string name="real_url">
+                http://secondlife.com/app/tos/
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
new file mode 100644
index 0000000..5a18297
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="url_entry" title="">

+        <text name="media_label">

+                Media URL:

+        </text>

+        <button label="OK" name="ok_btn"/>

+        <button label="Cancelar" name="cancel_btn"/>

+        <button label="Limpar" name="clear_btn"/>

+        <text name="loading_label">

+                Carregando..

+        </text>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_water.xml b/linden/indra/newview/skins/default/xui/pt/floater_water.xml
new file mode 100644
index 0000000..d6f261f
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Water Floater" title="Editor de �gua Avançado">

+        <text name="KeyFramePresetsText">

+                Pré-configurações da �gua:

+        </text>

+        <button label="Novo" label_selected="Novo" name="WaterNewPreset"/>

+        <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>

+        <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>

+        <tab_container name="Water Tabs">

+                <panel label="Configurações" name="Settings">

+                        <text name="BHText">

+                                Cor da névoa da �gua

+                        </text>

+                        <button label="?" name="WaterFogColorHelp"/>

+                        <color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>

+                        <text name="WaterFogDensText">

+                                Expoente da Densidade de névoa

+                        </text>

+                        <button label="?" name="WaterFogDensityHelp"/>

+                        <text name="WaterUnderWaterFogModText">

+                                Modificador da névoa Subaquática

+                        </text>

+                        <button label="?" name="WaterUnderWaterFogModHelp"/>

+                        <text name="BDensText">

+                                Escala da Marola de Reflexão

+                        </text>

+                        <button label="?" name="WaterNormalScaleHelp"/>

+                        <text name="BHText2">

+                                1

+                        </text>

+                        <text name="BHText3">

+                                2

+                        </text>

+                        <text name="BHText4">

+                                3

+                        </text>

+                        <text name="HDText">

+                                Escala de Fresnel

+                        </text>

+                        <button label="?" name="WaterFresnelScaleHelp"/>

+                        <text name="FresnelOffsetText">

+                                Deslocamento de Fresnel

+                        </text>

+                        <button label="?" name="WaterFresnelOffsetHelp"/>

+                        <text name="DensMultText">

+                                Refratar a Escala para Cima

+                        </text>

+                        <button label="?" name="WaterScaleAboveHelp"/>

+                        <text name="WaterScaleBelowText">

+                                Refratar a Escala para Baixo

+                        </text>

+                        <button label="?" name="WaterScaleBelowHelp"/>

+                        <text name="MaxAltText">

+                                Multiplicador de Difusão

+                        </text>

+                        <button label="?" name="WaterBlurMultiplierHelp"/>

+                </panel>

+                <panel label="Imagem" name="Waves">

+                        <text name="BHText">

+                                Direção da Onda Maior

+                        </text>

+                        <button label="?" name="WaterWave1Help"/>

+                        <text name="WaterWave1DirXText">

+                                X

+                        </text>

+                        <text name="WaterWave1DirYText">

+                                Y

+                        </text>

+                        <text name="BHText2">

+                                Direção da Onda Pequena

+                        </text>

+                        <button label="?" name="WaterWave2Help"/>

+                        <text name="WaterWave2DirXText">

+                                X

+                        </text>

+                        <text name="WaterWave2DirYText">

+                                Y

+                        </text>

+                        <text name="BHText3">

+                                Mapa Normal

+                        </text>

+                        <button label="?" name="WaterNormalMapHelp"/>

+                </panel>

+        </tab_container>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
new file mode 100644
index 0000000..ff22a87
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="WindLight floater" title="Editor de Céu Avançado">

+        <text name="KeyFramePresetsText">

+                Pré-definições de Céu:

+        </text>

+        <button label="Novo" label_selected="Novo" name="WLNewPreset"/>

+        <button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>

+        <button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>

+        <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />

+        <tab_container name="WindLight Tabs">

+                <panel label="Atmosfera" name="Atmosphere">

+                        <text name="BHText">

+                                Horizonte Azul

+                        </text>

+                        <button label="?" name="WLBlueHorizonHelp"/>

+                        <text name="BHText2">

+                                R

+                        </text>

+                        <text name="BHText3">

+                                G

+                        </text>

+                        <text name="BHText4">

+                                B

+                        </text>

+                        <text name="BHText5">

+                                I

+                        </text>

+                        <text name="BDensText">

+                                Horizonte da Neblina

+                        </text>

+                        <button label="?" name="WLHazeHorizonHelp"/>

+                        <text name="BDensText2">

+                                Densidade de Azul

+                        </text>

+                        <button label="?" name="WLBlueDensityHelp"/>

+                        <text name="BHText6">

+                                R

+                        </text>

+                        <text name="BHText7">

+                                G

+                        </text>

+                        <text name="BHText8">

+                                B

+                        </text>

+                        <text name="BHText9">

+                                I

+                        </text>

+                        <text name="HDText">

+                                Densidade da Neblina

+                        </text>

+                        <button label="?" name="WLHazeDensityHelp"/>

+                        <text name="DensMultText">

+                                Multiplicador de Densidade

+                        </text>

+                        <button label="?" name="WLDensityMultHelp"/>

+                        <text name="WLDistanceMultText">

+                                Multiplicador de Distância

+                        </text>

+                        <button label="?" name="WLDistanceMultHelp"/>

+                        <text name="MaxAltText">

+                                Altitude Máxima

+                        </text>

+                        <button label="?" name="WLMaxAltitudeHelp"/>

+                </panel>

+                <panel label="Iluminação" name="Lighting">

+                        <text name="SLCText">

+                                Cor do Sol/Lua

+                        </text>

+                        <button label="?" name="WLSunlightColorHelp"/>

+                        <text name="BHText">

+                                R

+                        </text>

+                        <text name="BHText2">

+                                G

+                        </text>

+                        <text name="BHText3">

+                                B

+                        </text>

+                        <text name="BHText4">

+                                I

+                        </text>

+                        <text name="TODText">

+                                Posição do Sol/Lua

+                        </text>

+                        <button label="?" name="WLTimeOfDayHelp"/>

+                        <text name="WLAmbientText">

+                                Ambiente

+                        </text>

+                        <button label="?" name="WLAmbientHelp"/>

+                        <text name="BHText5">

+                                R

+                        </text>

+                        <text name="BHText6">

+                                G

+                        </text>

+                        <text name="BHText7">

+                                B

+                        </text>

+                        <text name="BHText8">

+                                I

+                        </text>

+                        <text name="WLEastAngleText">

+                                Ângulo Leste

+                        </text>

+                        <button label="?" name="WLEastAngleHelp"/>

+                        <text name="SunGlowText">

+                                Brilho do Sol

+                        </text>

+                        <button label="?" name="WLSunGlowHelp"/>

+                        <slider label="Foco" name="WLGlowB"/>

+                        <slider label="Tamanho" name="WLGlowR"/>

+                        <text name="SceneGammaText">

+                                Gamma da Cena

+                        </text>

+                        <button label="?" name="WLSceneGammaHelp"/>

+                        <text name="WLStarText">

+                                Brilho da Estrela

+                        </text>

+                        <button label="?" name="WLStarBrightnessHelp"/>

+                </panel>

+                <panel label="Nuvens" name="Clouds">

+                        <text name="WLCloudColorText">

+                                Cor da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudColorHelp"/>

+                        <text name="BHText">

+                                R

+                        </text>

+                        <text name="BHText2">

+                                G

+                        </text>

+                        <text name="BHText3">

+                                B

+                        </text>

+                        <text name="BHText4">

+                                I

+                        </text>

+                        <text name="WLCloudColorText2">

+                                Densidade/ XY da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudDensityHelp"/>

+                        <text name="BHText5">

+                                X

+                        </text>

+                        <text name="BHText6">

+                                Y

+                        </text>

+                        <text name="BHText7">

+                                D

+                        </text>

+                        <text name="WLCloudCoverageText">

+                                Cobertura da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudCoverageHelp"/>

+                        <text name="WLCloudScaleText">

+                                Escala da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudScaleHelp"/>

+                        <text name="WLCloudDetailText">

+                                Detalhe da Nuvem  (XY/Densidade)

+                        </text>

+                        <button label="?" name="WLCloudDetailHelp"/>

+                        <text name="BHText8">

+                                X

+                        </text>

+                        <text name="BHText9">

+                                Y

+                        </text>

+                        <text name="BHText10">

+                                D

+                        </text>

+                        <text name="WLCloudScrollXText">

+                                Rolagem X da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudScrollXHelp"/>

+                        <check_box label="Travar" name="WLCloudLockX"/>

+                        <text name="WLCloudScrollYText">

+                                Rolagem Y da Nuvem

+                        </text>

+                        <button label="?" name="WLCloudScrollYHelp"/>

+                        <check_box label="Travar" name="WLCloudLockY"/>

+                        <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>

+                        <button label="?" name="WLClassicCloudsHelp"/>

+                </panel>

+        </tab_container>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml b/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
index b773503..0df12a5 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -50,15 +50,14 @@
                 Eventos (M)
         </text>
         <check_box label=" " name="event_mature_chk" />
-        <combo_box label="Meus Amigos" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
+        <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
                 <combo_item name="none_selected">
-                        Meus Amigos
+                        Amigos Conectados
                 </combo_item>
         </combo_box>
-        <combo_box label="Minhas Landmarks" name="landmark combo"
-             tool_tip="Landmark para mostrar no Mapa">
+        <combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
                 <combo_item name="none_selected">
-                        Minhas Landmarks
+                        Landmarks
                 </combo_item>
         </combo_box>
         <line_editor label="Procurar por nome de região" name="location"
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml b/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
index 7215cae..b3c6bde 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -29,7 +29,7 @@
                 <menu_item_call label="Novo cabelo" name="New Hair" />
                 <menu_item_call label="Novos olhos" name="New Eyes" />
         </menu>
-        <menu_item_call label="Abrir" name="Landmark Open" />
+        <menu_item_call label="Teletransporte" name="Landmark Open"/>
         <menu_item_call label="Abrir" name="Animation Open" />
         <menu_item_call label="Abrir" name="Sound Open" />
         <menu_item_call label="Remover item." name="Purge Item" />
@@ -48,7 +48,7 @@
         <menu_item_call label="Contatos IM Online na pasta." name="IM Online Contacts In Folder" />
         <menu_item_call label="Todos contantos MI na pasta." name="IM All Contacts In Folder" />
         <menu_item_call label="Executar" name="Sound Play" />
-        <menu_item_call label="Teleportar para Landmark" name="Teleport To Landmark" />
+        <menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/>
         <menu_item_call label="Executar in World" name="Animation Play" />
         <menu_item_call label="Executar localmente." name="Animation Audition" />
         <menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message" />
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_login.xml b/linden/indra/newview/skins/default/xui/pt/menu_login.xml
new file mode 100644
index 0000000..3aeb748
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<menu_bar name="Login Menu">

+        <menu label="Arquivo" name="File">

+                <menu_item_call label="Sair" name="Quit"/>

+        </menu>

+        <menu label="Editar" name="Edit">

+                <menu_item_call label="Preferências..." name="Preferences..."/>

+        </menu>

+        <menu label="Ajuda" name="Help">

+                <menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>

+                <menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>

+        </menu>

+</menu_bar>

diff --git a/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
index e7f9f6b..1c2e2a0 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <pie_menu name="Avatar Pie">
-        <menu_item_call label="Perfil.." name="Profile..." />
-        <menu_item_call label="Mudo" name="Avatar Mute" />
-        <menu_item_call label="Ir para" name="Go To" />
-        <menu_item_call label="Taxa" name="Rate" />
-        <menu_item_call label="Adicionar Amigo" name="Add Friend" />
-        <menu_item_call label="Pagar..." name="Pay..." />
+        <menu_item_call label="Perfil.." name="Profile..."/>
+        <menu_item_call label="Mudo" name="Avatar Mute"/>
+        <menu_item_call label="Ir para" name="Go To"/>
+        <menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+        <menu_item_call label="Pagar..." name="Pay..."/>
         <pie_menu label="Mais &gt;" name="More &gt;">
-                <menu_item_call label="Paralizar..." name="Freeze..." />
-                <menu_item_call label="Dar Cartão" name="Give Card" />
-                <menu_item_call label="Ejetar..." name="Eject..." />
-                <menu_item_call label="Debug..." name="Debug..." />
-                <menu_item_call label="Inspecionar" name="Object Inspect" />
+                <menu_item_call label="Paralizar..." name="Freeze..."/>
+                <menu_item_call label="Dar Cartão" name="Give Card"/>
+                <menu_item_call label="Convidar para o Grupo..." name="Invite..."/>
+                <menu_item_call label="Ejetar..." name="Eject..."/>
+                <menu_item_call label="Debug..." name="Debug..."/>
+                <menu_item_call label="Inspecionar" name="Object Inspect"/>
         </pie_menu>
-        <menu_item_call label="Enviar Mi..." name="Send IM..." />
+        <menu_item_call label="Enviar Mi..." name="Send IM..."/>
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml b/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml
new file mode 100644
index 0000000..e18e776
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/menu_slurl.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<menu name="Popup">

+        <menu_item_call label="Sobre a URL" name="about_url"/>

+        <menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>

+        <menu_item_call label="Mostrar no Mapa" name="show_on_map"/>

+</menu>

diff --git a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 84fdc3f..3118c28 100644
--- a/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -1,197 +1,201 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
         <menu label="Arquivo" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image" />
-                <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound" />
-                <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation" />
-                <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Fechar janela" name="Close Window" />
-                <menu_item_call label="Fechar todas as janelas" name="Close All Windows" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Salvar textura como" name="Save Texture As..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Tirar Foto" name="Take Snapshot" />
-                <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Ajustar o tamanho da janela" name="Set Window Size">
-                        <menu_item_call label="320x240" name="320x240" />
-                        <menu_item_call label="640x480" name="640x480" />
-                        <menu_item_call label="800x600" name="800x600" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="720x480 (NTSC)" name="720x480 (NTSC)" />
-                        <menu_item_call label="768x576 (PAL)" name="768x576 (PAL)" />
-                </menu>
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Sair" name="Quit" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image"/>
+                <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound"/>
+                <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation"/>
+                <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Fechar janela" name="Close Window"/>
+                <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Salvar textura como" name="Save Texture As..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Tirar Foto" name="Take Snapshot"/>
+                <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Sair" name="Quit"/>
         </menu>
         <menu label="Editar" name="Edit">
-                <menu_item_call label="Voltar" name="Undo" />
-                <menu_item_call label="Avançar" name="Redo" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Cortar" name="Cut" />
-                <menu_item_call label="Copiar" name="Copy" />
-                <menu_item_call label="Pasta" name="Paste" />
-                <menu_item_call label="Apagar" name="Delete" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Procurar..." name="Search..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Selecionar todos" name="Select All" />
-                <menu_item_call label="Retirar seleção" name="Deselect" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Duplicar" name="Duplicate" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu label="Anexar objeto" name="Attach Object" />
-                <menu label="Desanexar objeto" name="Detach Object" />
+                <menu_item_call label="Voltar" name="Undo"/>
+                <menu_item_call label="Avançar" name="Redo"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Cortar" name="Cut"/>
+                <menu_item_call label="Copiar" name="Copy"/>
+                <menu_item_call label="Pasta" name="Paste"/>
+                <menu_item_call label="Apagar" name="Delete"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Procurar..." name="Search..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Selecionar todos" name="Select All"/>
+                <menu_item_call label="Retirar seleção" name="Deselect"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Duplicar" name="Duplicate"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu label="Anexar objeto" name="Attach Object"/>
+                <menu label="Desanexar objeto" name="Detach Object"/>
                 <menu label="Tirar a roupa" name="Take Off Clothing">
-                        <menu_item_call label="Camiseta" name="Shirt" />
-                        <menu_item_call label="Calças" name="Pants" />
-                        <menu_item_call label="Sapatos" name="Shoes" />
-                        <menu_item_call label="Meias" name="Socks" />
-                        <menu_item_call label="Blusa" name="Jacket" />
-                        <menu_item_call label="Luvas" name="Gloves" />
-                        <menu_item_call label="Anágua" name="Menu Undershirt" />
-                        <menu_item_call label="Roupa de baixo" name="Menu Underpants" />
-                        <menu_item_call label="saia" name="Skirt" />
-                        <menu_item_call label="Toda a roupa" name="All Clothes" />
+                        <menu_item_call label="Camiseta" name="Shirt"/>
+                        <menu_item_call label="Calças" name="Pants"/>
+                        <menu_item_call label="Sapatos" name="Shoes"/>
+                        <menu_item_call label="Meias" name="Socks"/>
+                        <menu_item_call label="Blusa" name="Jacket"/>
+                        <menu_item_call label="Luvas" name="Gloves"/>
+                        <menu_item_call label="Anágua" name="Menu Undershirt"/>
+                        <menu_item_call label="Roupa de baixo" name="Menu Underpants"/>
+                        <menu_item_call label="saia" name="Skirt"/>
+                        <menu_item_call label="Toda a roupa" name="All Clothes"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Movimentos..." name="Gestures..." />
-                <menu_item_call label="Perfil..." name="Profile..." />
-                <menu_item_call label="Aparência..." name="Appearance..." />
-                <menu_item_separator label="-----------" name="separator7" />
-                <menu_item_check label="Amigos..." name="Friends..." />
-                <menu_item_call label="Grupos..." name="Groups..." />
-                <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="Preferências..." name="Preferences..." />
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Movimentos..." name="Gestures..."/>
+                <menu_item_call label="Perfil..." name="Profile..."/>
+                <menu_item_call label="Aparência..." name="Appearance..."/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_check label="Amigos..." name="Friends..."/>
+                <menu_item_call label="Grupos..." name="Groups..."/>
+                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_call label="Preferências..." name="Preferences..."/>
         </menu>
         <menu label="Exibir" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu_item_call label="Visão do mouse" name="Mouselook" />
-                <menu_item_check label="Construção" name="Build" />
-                <menu_item_call label="Resetar visão" name="Reset View" />
-                <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Barra de ferramentas" name="Toolbar" />
-                <menu_item_check label="Histórico de chat" name="Chat History" />
-                <menu_item_check label="Mensagem instantânea" name="Instant Message" />
-                <menu_item_call label="Inventário" name="Inventory" />
-                <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="Controle de câmeras" name="Camera Controls" />
-                <menu_item_check label="Controle de movimentos" name="Movement Controls" />
-                <menu_item_check label="Mapa do mundo" name="World Map" />
-                <menu_item_check label="Mini-Mapa" name="Mini-Map" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_check label="Barra de estatísticas" name="Statistics Bar" />
-                <menu_item_check label="Linhas de propriedades" name="Property Lines" />
-                <menu_item_check label="Dono de terrenos" name="Land Owners" />
-                <menu_item_separator label="-----------" name="separator4" />
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <menu_item_call label="Visão do mouse" name="Mouselook"/>
+                <menu_item_check label="Construção" name="Build"/>
+                <menu_item_check label="Joystick Flycam" name="Joystick Flycam"/>
+                <menu_item_call label="Resetar visão" name="Reset View"/>
+                <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Barra de ferramentas" name="Toolbar"/>
+                <menu_item_check label="Conversa local" name="Chat History"/>
+                <menu_item_check label="Comunicar" name="Instant Message"/>
+                <menu_item_check label="Inventário" name="Inventory"/>
+                <menu_item_check label="Microfone ativo" name="Active Speakers"/>
+                <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="Controle de câmeras" name="Camera Controls"/>
+                <menu_item_check label="Controle de movimentos" name="Movement Controls"/>
+                <menu_item_check label="Mapa do mundo" name="World Map"/>
+                <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
+                <menu_item_check label="Linhas de propriedades" name="Property Lines"/>
+                <menu_item_check label="Dono de terrenos" name="Land Owners"/>
+                <menu_item_separator label="-----------" name="separator4"/>
                 <menu label="Dicas" name="Hover Tips">
-                        <menu_item_check label="Mostrar dicas" name="Show Tips" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="Dicas de terreno" name="Land Tips" />
-                        <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects" />
-                </menu>
-                <menu_item_check label="Mostrar tamanho fisíco" name="Alt Shows Physical" />
-                <menu_item_check label="Luz para transparência" name="Highlight Transparent" />
-                <menu label="Piscar" name="Beacons">
-                        <menu_item_check label="Objetos com scripts" name="Scripted Objects" />
-                        <menu_item_check label="Objetos fisícos" name="Physical Objects" />
-                        <menu_item_check label="Recursos de som" name="Sound Sources" />
-                        <menu_item_check label="Recursos" name="Particle Sources" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="Partículas escondidas" name="Hide Particles" />
+                        <menu_item_check label="Mostrar dicas" name="Show Tips"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_check label="Dicas de terreno" name="Land Tips"/>
+                        <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/>
                 </menu>
-                <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Mais zoom" name="Zoom In" />
-                <menu_item_call label="Zoom padrão" name="Zoom Default" />
-                <menu_item_call label="Menos zoom" name="Zoom Out" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Tela cheia" name="Toggle Fullscreen" />
-                <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default" />
+                <menu_item_check label="Luz para transparência" name="Highlight Transparent"/>
+                <menu_item_check label="Balizas" name="beacons"/>
+                <menu_item_check label="Esconder partículas" name="Hide Particles"/>
+                <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Mais zoom" name="Zoom In"/>
+                <menu_item_call label="Zoom padrão" name="Zoom Default"/>
+                <menu_item_call label="Menos zoom" name="Zoom Out"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Tela cheia" name="Toggle Fullscreen"/>
+                <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/>
         </menu>
         <menu label="Mundo" name="World">
-                <menu_item_call label="Conversa" name="Chat" />
-                <menu_item_call label="Iniciar movimento" name="Start Gesture" />
-                <menu_item_check label="Sempre Correr" name="Always Run" />
-                <menu_item_check label="Voar" name="Fly" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here" />
-                <menu_item_call label="Marcar como  casa " name="Set Home to Here" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="Teleportar para casa" name="Teleport Home" />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Deixar ausente" name="Set Away" />
-                <menu_item_call label="Modo Ocupado" name="Set Busy" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Meu terreno..." name="My Land..." />
-                <menu_item_call label="Sobre terreno..." name="About Land..." />
-                <menu_item_call label="Comprar terreno..." name="Buy Land..." />
-                <menu_item_call label="Região/Estado..." name="Region/Estate..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Forçar o sol" name="Force Sun">
-                        <menu_item_call label="Amanhecer" name="Sunrise" />
-                        <menu_item_call label="Meio-dia" name="Noon" />
-                        <menu_item_call label="Pôr do sol" name="Sunset" />
-                        <menu_item_call label="Meia noite" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="Reverter para o padrão da região" name="Revert to Region Default" />
+                <menu_item_call label="Conversa" name="Chat"/>
+                <menu_item_check label="Sempre Correr" name="Always Run"/>
+                <menu_item_check label="Voar" name="Fly"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/>
+                <menu_item_call label="Marcar como  casa " name="Set Home to Here"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Teleportar para casa" name="Teleport Home"/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Deixar ausente" name="Set Away"/>
+                <menu_item_call label="Modo Ocupado" name="Set Busy"/>
+                <menu_item_call label="Parar todas as animações" name="Stop All Animations"/>
+                <menu_item_call label="Liberar controles" name="Release Keys"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Histórico de conta..." name="Account History..."/>
+                <menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
+                <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
+                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_call label="Meu terreno..." name="My Land..."/>
+                <menu_item_call label="Sobre terreno..." name="About Land..."/>
+                <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
+                <menu_item_call label="Região/Estado..." name="Region/Estate..."/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu label="Configurações de ambiente" name="Environment Settings">
+                        <menu_item_call label="Amanhecer" name="Sunrise"/>
+                        <menu_item_call label="Meio-dia" name="Noon"/>
+                        <menu_item_call label="Pôr do sol" name="Sunset"/>
+                        <menu_item_call label="Meia-noite" name="Midnight"/>
+                        <menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
+                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_call label="Editor de ambiente" name="Environment Editor"/>
                 </menu>
         </menu>
         <menu label="Ferramentas" name="Tools">
                 <menu label="Selecionar ferramenta" name="Select Tool">
-                        <menu_item_call label="Foco" name="Focus" />
-                        <menu_item_call label="Mover" name="Move" />
-                        <menu_item_call label="Editar" name="Edit" />
-                        <menu_item_call label="Criar" name="Create" />
-                        <menu_item_call label="Terreno" name="Land" />
+                        <menu_item_call label="Foco" name="Focus"/>
+                        <menu_item_call label="Mover" name="Move"/>
+                        <menu_item_call label="Editar" name="Edit"/>
+                        <menu_item_call label="Criar" name="Create"/>
+                        <menu_item_call label="Terreno" name="Land"/>
                 </menu>
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects" />
-                <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects" />
-                <menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding" />
-                <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection" />
-                <menu_item_check label="Mostrar luz radiante para solução"
-                     name="Show Light Radius for Selection" />
-                <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam" />
-                <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="Alinhar a grade" name="Snap to Grid" />
-                <menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid" />
-                <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid" />
-                <menu_item_call label="Opções de grade..." name="Grid Options..." />
-                <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="Unir" name="Link" />
-                <menu_item_call label="Desunir" name="Unlink" />
-                <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="Parar todas as animações" name="Stop All Animations" />
-                <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="Focus na seleção" name="Focus on Selection" />
-                <menu_item_call label="Zoom na Seleção" name="Zoom to Selection" />
-                <menu_item_call label="Comprar objetos" name="Menu Object Take" />
-                <menu_item_call label="Pegar cópia" name="Take Copy" />
-                <menu_item_call label="Salvar objeto direto no meu inventário"
-                     name="Save Object Back to My Inventory" />
-                <menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents" />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Mostrar scripts defeituosos/Erros de janela"
-                     name="Show Script Warning/Error Window" />
-                <menu_item_call label="Recolocar scripts na seleção" name="Recompile Scripts in Selection" />
-                <menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection" />
-                <menu_item_call label="Ajustar scripts para funcionar na seleção"
-                     name="Set Scripts to Running in Selection" />
-                <menu_item_call label="Ajustar scripts para não funcionar na seleção"
-                     name="Set Scripts to Not Running in Selection" />
-                <menu_item_separator label="-----------" name="separator6" />
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/>
+                <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/>
+                <menu_item_check label="Selecionar objetos pelo som" name="Select By Surrounding"/>
+                <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/>
+                <menu_item_check label="Mostrar luz radiante para solução" name="Show Light Radius for Selection"/>
+                <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_check label="Alinhar a grade" name="Snap to Grid"/>
+                <menu_item_call label="Alinhar objeto a grade XY" name="Snap Object XY to Grid"/>
+                <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/>
+                <menu_item_call label="Opções de grade..." name="Grid Options..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_check label="Editar partes ligadas" name="Edit Linked Parts"/>
+                <menu_item_call label="Unir" name="Link"/>
+                <menu_item_call label="Desunir" name="Unlink"/>
+                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_call label="Focus na seleção" name="Focus on Selection"/>
+                <menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
+                <menu_item_call label="Comprar objetos" name="Menu Object Take"/>
+                <menu_item_call label="Pegar cópia" name="Take Copy"/>
+                <menu_item_call label="Salvar objeto direto no meu inventário" name="Save Object Back to My Inventory"/>
+                <menu_item_call label="Salvar todos os objetos" name="Save Object Back to Object Contents"/>
+                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/>
+                <menu label="Recolocar scripts na seleção" name="Recompile Scripts in Selection">
+                        <menu_item_call label="Mono" name="Mono"/>
+                        <menu_item_call label="LSL" name="LSL"/>
+                </menu>
+                <menu_item_call label="Resetar script selecionado" name="Reset Scripts in Selection"/>
+                <menu_item_call label="Ajustar scripts para funcionar na seleção" name="Set Scripts to Running in Selection"/>
+                <menu_item_call label="Ajustar scripts para não funcionar na seleção" name="Set Scripts to Not Running in Selection"/>
         </menu>
         <menu label="Ajuda" name="Help">
-                <menu_item_call label="Ajuda Second Life" name="Second Life Help" />
-                <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="Reportar Abuso..." name="Report Abuse..." />
-                <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp;amp; Hits..." />
-                <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="Sobre Second Life..." name="About Second Life..." />
+                <menu_item_call label="Ajuda Second Life" name="Second Life Help"/>
+                <menu_item_call label="Tutorial" name="Tutorial"/>
+                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_call label="Blog oficial da Linden..." name="Official Linden Blog..."/>
+                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/>
+                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_call label="Reportar Abuso..." name="Report Abuse..."/>
+                <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="Medidor de Lag" name="Lag Meter"/>
+                <menu_item_separator label="-----------" name="separator7"/>
+                <menu label="Reportando Bug" name="Bug Reporting">
+                        <menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/>
+                        <menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/>
+                        <menu_item_separator label="-----------" name="separator7"/>
+                        <menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/>
+                        <menu_item_call label="Questões de Segurança..." name="Security Issues..."/>
+                        <menu_item_call label="Wiki de QA ..." name="QA Wiki..."/>
+                        <menu_item_separator label="-----------" name="separator9"/>
+                        <menu_item_call label="Reportar Bug..." name="Report Bug..."/>
+                </menu>
+                <menu_item_call label="Sobre Second Life..." name="About Second Life..."/>
         </menu>
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/pt/mime_types.xml b/linden/indra/newview/skins/default/xui/pt/mime_types.xml
new file mode 100644
index 0000000..7b6225e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<mimetypes name="default">

+        <widgetset name="web">

+                <label name="web_label">

+                        Conteúdo da Web

+                </label>

+                <tooltip name="web_tooltip">

+                        Esta região possui Conteúdo da Web disponível.

+                </tooltip>

+                <playtip name="web_playtip">

+                        Exibir Conteúdo da Web

+                </playtip>

+        </widgetset>

+        <widgetset name="movie">

+                <label name="movie_label">

+                        Filme

+                </label>

+                <tooltip name="movie_tooltip">

+                        Há um filme disponível para se assistir aqui

+                </tooltip>

+                <playtip name="movie_playtip">

+                        Iniciar filme

+                </playtip>

+        </widgetset>

+        <widgetset name="none">

+                <label name="none_label">

+                        Sem conteúdo disponível

+                </label>

+                <tooltip name="none_tooltip">

+                        Não há mídia disponível aqui.

+                </tooltip>

+        </widgetset>

+        <widgetset name="image">

+                <label name="image_label">

+                        Imagem

+                </label>

+                <tooltip name="image_tooltip">

+                        Há uma imagem neste local

+                </tooltip>

+                <playtip name="image_playtip">

+                        Ver a imagem disponível deste local.

+                </playtip>

+        </widgetset>

+        <widgetset name="audio">

+                <label name="audio_label">

+                        �udio

+                </label>

+                <tooltip name="audio_tooltip">

+                        Há um áudio neste local

+                </tooltip>

+                <playtip name="audio_playtip">

+                        Iniciar áudio disponível neste local

+                </playtip>

+        </widgetset>

+        <scheme name="rtsp">

+                <label name="rtsp_label">

+                        Transmissão em tempo real

+                </label>

+        </scheme>

+        <mimetype name="blank">

+                <label name="blank_label">

+                        - Nenhum -

+                </label>

+        </mimetype>

+        <mimetype name="none/none">

+                <label name="none/none_label">

+                        - Nenhum - 

+                </label>

+        </mimetype>

+        <mimetype name="audio/*">

+                <label name="audio2_label">

+                        �udio

+                </label>

+        </mimetype>

+        <mimetype name="video/*">

+                <label name="video2_label">

+                        Vídeo

+                </label>

+        </mimetype>

+        <mimetype name="image/*">

+                <label name="image2_label">

+                        Imagem

+                </label>

+        </mimetype>

+        <mimetype name="video/vnd.secondlife.qt.legacy">

+                <label name="vnd.secondlife.qt.legacy_label">

+                        Filme (QuickTime)

+                </label>

+        </mimetype>

+        <mimetype name="application/javascript">

+                <label name="application/javascript_label">

+                        Javascript

+                </label>

+        </mimetype>

+        <mimetype name="application/ogg">

+                <label name="application/ogg_label">

+                        �udio/Vídeo Ogg

+                </label>

+        </mimetype>

+        <mimetype name="application/pdf">

+                <label name="application/pdf_label">

+                        Documento PDF

+                </label>

+        </mimetype>

+        <mimetype name="application/postscript">

+                <label name="application/postscript_label">

+                        Documento Postscript

+                </label>

+        </mimetype>

+        <mimetype name="application/rtf">

+                <label name="application/rtf_label">

+                        Rich Text (RTF)

+                </label>

+        </mimetype>

+        <mimetype name="application/smil">

+                <label name="application/smil_label">

+                        Synchronized Multimedia Integration Language (SMIL)

+                </label>

+        </mimetype>

+        <mimetype name="application/xhtml+xml">

+                <label name="application/xhtml+xml_label">

+                        Página Web (XHTML)

+                </label>

+        </mimetype>

+        <mimetype name="application/x-director">

+                <label name="application/x-director_label">

+                        Macromedia Director

+                </label>

+        </mimetype>

+        <mimetype name="application/x-shockwave-flash">

+                <label name="application/x-shockwave-flash_label">

+                        Flash

+                </label>

+        </mimetype>

+        <mimetype name="audio/mid">

+                <label name="audio/mid_label">

+                        �udio (MIDI)

+                </label>

+        </mimetype>

+        <mimetype name="audio/mpeg">

+                <label name="audio/mpeg_label">

+                        �udio (MP3)

+                </label>

+        </mimetype>

+        <mimetype name="audio/x-aiff">

+                <label name="audio/x-aiff_label">

+                        �udio (AIFF)

+                </label>

+        </mimetype>

+        <mimetype name="audio/x-wav">

+                <label name="audio/x-wav_label">

+                        �udio (WAV)

+                </label>

+        </mimetype>

+        <mimetype name="image/bmp">

+                <label name="image/bmp_label">

+                        Imagem (BMP)

+                </label>

+        </mimetype>

+        <mimetype name="image/gif">

+                <label name="image/gif_label">

+                        Imagem (GIF)

+                </label>

+        </mimetype>

+        <mimetype name="image/jpeg">

+                <label name="image/jpeg_label">

+                        Imagem (JPEG)

+                </label>

+        </mimetype>

+        <mimetype name="image/png">

+                <label name="image/png_label">

+                        Imagem (PNG)

+                </label>

+        </mimetype>

+        <mimetype name="image/svg+xml">

+                <label name="image/svg+xml_label">

+                        Imagem (SVG)

+                </label>

+        </mimetype>

+        <mimetype name="image/tiff">

+                <label name="image/tiff_label">

+                        Imagem (TIFF)

+                </label>

+        </mimetype>

+        <mimetype name="text/html">

+                <label name="text/html_label">

+                        Página Web

+                </label>

+        </mimetype>

+        <mimetype name="text/plain">

+                <label name="text/plain_label">

+                        Texto

+                </label>

+        </mimetype>

+        <mimetype name="text/xml">

+                <label name="text/xml_label">

+                        XML

+                </label>

+        </mimetype>

+        <mimetype name="video/mpeg">

+                <label name="video/mpeg_label">

+                        Filme (MPEG)

+                </label>

+        </mimetype>

+        <mimetype name="video/mp4">

+                <label name="video/mp4_label">

+                        Filme (MP4)

+                </label>

+        </mimetype>

+        <mimetype name="video/quicktime">

+                <label name="video/quicktime_label">

+                        Filme (QuickTime)

+                </label>

+        </mimetype>

+        <mimetype name="video/x-ms-asf">

+                <label name="video/x-ms-asf_label">

+                        Filme (Windows Media ASF)

+                </label>

+        </mimetype>

+        <mimetype name="video/x-ms-wmv">

+                <label name="video/x-ms-wmv_label">

+                        Filme (Windows Media WMV)

+                </label>

+        </mimetype>

+        <mimetype name="video/x-msvideo">

+                <label name="video/x-msvideo_label">

+                        Filme (AVI)

+                </label>

+        </mimetype>

+</mimetypes>

diff --git a/linden/indra/newview/skins/default/xui/pt/notify.xml b/linden/indra/newview/skins/default/xui/pt/notify.xml
index a070cee..6e4a23c 100644
--- a/linden/indra/newview/skins/default/xui/pt/notify.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <notifications>
         <notify name="SystemMessageTip">
                 <message name="message">
@@ -77,12 +77,13 @@
         </notify>
         <notify name="GestureMissing">
                 <message name="message">
-                        A animação foi perdida.
+                        O Gesto [NAME] não se encontra na base de dados
                 </message>
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        Impossível fazer o download da imagem. Por favor, tente de novo.
+                        Impossível de carregar o gesto [NAME].
+Por favor, tente novamente.
                 </message>
         </notify>
         <notify name="InventoryLoaded">
@@ -115,6 +116,11 @@
                         Permissões insuficientes para visualizar o notecard
                 </message>
         </notify>
+        <notify name="RezItemNoPermissions">
+                <message name="message">
+                        Sem permissões suficientes para criar objetos.
+                </message>
+        </notify>
         <notify name="UnableToLoadNotecard">
                 <message name="message">
                         Impossível carregar o notecard. Por favor, tente novamente.
@@ -155,11 +161,6 @@
                         Você deve oferecer um chamado a [FIRST] [LAST]
                 </message>
         </notify>
-        <notify name="OfferedFriendship">
-                <message name="message">
-                        Você ofereceu um pedido de amizade a  [FIRST] [LAST]
-                </message>
-        </notify>
         <notify name="UnableToBuyWhileDownloading">
                 <message name="message">
                         Impossível comprar o objeto enquanto ele está sendo carregado. Por favor, tente novamente.
@@ -222,12 +223,14 @@
         </notify>
         <notify name="TeleportToLandmark">
                 <message name="message">
-                        Agora que você alcançou o mainland, você pode teleport a qualquer ponto do mapa. Clicando na opção  do inventário na direita de sua tela, e selecione.Dois clicks no lugar escolhido e você será teletransportado para este local.
+                        Agora que você chegou à mainland, você pode se teletransportar para locais como '[NAME]' clicando no botão de Inventário, no canto direito inferior de sua tela, e selecionando a pasta Landmarks.
+Dê um duplo-clique na landmark e clique Teletransportar para viajar para o local desejado.
                 </message>
         </notify>
         <notify name="TeleportToPerson">
                 <message name="message">
-                        Agora  que você alcançou o mainland, você pode contatar os  residentes [NAME] .Clique no inventário da direita do  sua tela, e dê dois cliques no calling card. Clique sobre sobre o calling card, que aparece  a mensagem instantânea.
+                        Agora que você chegou à mainland, você pode contatar residentes como &apos;[NAME]&apos;  clicando no botão de Inventário, canto direito inferior de sua tela, e selecionando a pasta Cartões de Visita
+Dê um duplo-clique num cartão de visitas e em Mensagem Instantânea e digite sua mensagem
                 </message>
         </notify>
         <notify name="CantSelectLandFromMultipleRegions">
@@ -341,7 +344,12 @@
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        Esta terra tem propriedades especificas. Você não pode fazer nenhuma ação grave nela.
+                        Esta terra é “Não empurre�. Você não pode empurrar os outros, a não ser que seja o proprietário da terra.
+                </message>
+        </notify>
+        <notify name="NoVoice">
+                <message name="message">
+                        O uso de voz está desabilitado nesta terra.
                 </message>
         </notify>
         <notify name="NoBuild">
@@ -437,6 +445,9 @@
                 <option name="Decline">
                         Saia
                 </option>
+                <option name="Info">
+                        Informações
+                </option>
         </notify>
         <notify name="JoinGroupOfficerNoFee">
                 <message name="message">
@@ -495,7 +506,11 @@
         </notify>
         <notify name="OfferFriendship">
                 <message name="message">
-                        [NAME] está te oferecendo um convite de amizade.
+                        [NAME] está lhe oferecendo sua amizade
+ 
+[MESSAGE]
+ 
+(Por definição vocês serão capazes de ver um ao outro online)
                 </message>
                 <option name="Accept">
                         Aceitar
@@ -504,6 +519,19 @@
                         Negar
                 </option>
         </notify>
+        <notify name="OfferFriendshipNoMessage">
+                <message name="message">
+                        [NAME] está lhe oferecendo sua amizade.
+
+(Por definição vocês poderão ver se o outro está online.)
+                </message>
+                <option name="Accept">
+                        Aceitar
+                </option>
+                <option name="Decline">
+                        Recusar
+                </option>
+        </notify>
         <notify name="FriendshipAccepted">
                 <message name="message">
                         [NAME] aceitou seu convite de amizade.
@@ -548,12 +576,20 @@
         </notify>
         <notify name="FailedToLoadWearableUnnamed">
                 <message name="message">
-                        Falha ao carregar a página [TYPE].Por favor, notifique o vendedor que lhe vendeu este produto
+                        Opa!
+Você tentou vestir um/uma [TYPE] que não carregou.
+
+Não se apavore
+Tente novamente em alguns minutos para que tudo se ajeite
                 </message>
         </notify>
         <notify name="FailedToLoadWearable">
                 <message name="message">
-                        Falha ao carregar [TYPE] nomeado [DESC].Por favor, notifique o vendedor que lhe vendeu os objetos
+                        Opa!
+Você tentou vestir um/uma [TYPE] chamado/a [DESC] que não carregou
+
+Não se apavore
+Tente novamente em alguns minutos para que tudo se ajeite.
                 </message>
         </notify>
         <notify name="FailedToFindWearableUnnamed">
@@ -631,6 +667,38 @@
                 <option name="No">
                         Não
                 </option>
+                <option name="Mute">
+                        Mudo
+                </option>
+        </notify>
+        <notify name="ScriptQuestionCautionChatGranted">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;Um objeto de  &apos;[OWNERNAME]&apos;, localizado em[REGIONNAME] a [REGIONPOS], está lhe dando permissão para: [PERMISSIONS].
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCautionChatDenied">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], revogou suas permissões para: [PERMISSIONS].
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCaution">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, um objeto de  &apos;[NAME]&apos;, gostaria de:
+ 
+[QUESTIONS]
+Se você não confia neste objeto ou em seu criador, você deveria negar o pedido. Para informações adicionais clique no botão Detalhes.
+
+Autorizar este pedido?
+                </message>
+                <option name="Grant">
+                        Autorizar
+                </option>
+                <option name="Deny">
+                        Negar
+                </option>
+                <option name="Details">
+                        Detalhes...
+                </option>
         </notify>
         <notify name="ScriptDialog">
                 <message name="message">
@@ -662,7 +730,6 @@
                 <message name="message">
                         Você está sentado. Use as setas  (or AWSD) para mudar a visão.Clique em &apos;Stand Up&apos; para levantar.
                 </message>
-                Você foi teleportado
         </notify>
         <notify name="FirstMap">
                 <message name="message">
@@ -681,7 +748,9 @@
         </notify>
         <notify name="FirstTeleport">
                 <message name="message">
-                        Você foi teleportado
+                        Esta região não permite teletransporte ponto-a-ponto, assim você foi teletransportado para o telehub mais próximo. 
+Seu destino está assinalado com um farol. 
+Siga a flecha vermelha até o farol, ou clique nela para apagar o farol.
                 </message>
         </notify>
         <notify name="FirstOverrideKeys">
@@ -709,9 +778,174 @@
                         Este objeto tem a propriedade flexível
                 </message>
         </notify>
+        <notify name="FirstDebugMenus">
+                <message name="message">
+                        Você ativou o menu Avançado. Este menu contém funcionalidades úteis para desenvolvedores debugarem o Second Life. Para mostrar esse menu no Windows pressione Ctrl-Alt-D. No Mac pressione Cmd-Opt-Shift-D.
+                </message>
+        </notify>
+        <notify name="FirstSculptedPrim">
+                <message name="message">
+                        Você está editando um sculpted prim. Sculpted prims requerem uma textura especial para especificar suas formas. Você encontrará exemplos dessas texturas na Biblioteca do Inventário.
+                </message>
+        </notify>
+        <notify name="FirstMedia">
+                <message name="message">
+                        Você começou a tocar uma mídia. Mídias podem ser autorizadas a iniciar automaticamente se você assim escolher na janela de Preferências, sob Audio/Vídeo. Atente para o risco de segurança que pode haver ao acessar websites de mídia que você não confia.
+                </message>
+        </notify>
         <notify name="MaxListSelectMessage">
                 <message name="message">
                         Você pode selecionar este objeto [MAX_SELECT] da  lista
                 </message>
         </notify>
+        <notify name="VoiceInviteP2P">
+                <message name="message">
+                        [NAME] está lhe convidando para uma conversa com voz. 
+Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando
+                </message>
+                <option name="Accept">
+                        Aceitar
+                </option>
+                <option name="Decline">
+                        Recusar
+                </option>
+                <option name="Mute">
+                        Mudo
+                </option>
+        </notify>
+        <notify name="AutoUnmuteByIM">
+                <message name="message">
+                        [FIRST] [LAST] recebeu uma Mensagem Instantânea sua e automáticamente não está mais no modo mudo.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney">
+                <message name="message">
+                        [FIRST] [LAST] recebeu pagamento seu e automaticamente não está mais no modo mudo.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory">
+                <message name="message">
+                        [FIRST] [LAST] recebeu inventário seu e automaticamente não está mais mudo.
+                </message>
+        </notify>
+        <notify name="VoiceInviteGroup">
+                <message name="message">
+                        [NAME] juntou-se a uma conversa com voz do grupo [GROUP]. 
+Clique Aceitar para atender, ou Recusar para recusar o convite. Clique Mudo para calar quem está chamando.
+                </message>
+                <option name="Accept">
+                        Aceitar
+                </option>
+                <option name="Decline">
+                        Recusar
+                </option>
+                <option name="Mute">
+                        Mudo
+                </option>
+        </notify>
+        <notify name="VoiceInviteAdHoc">
+                <message name="message">
+                        [NAME] juntou-se a uma chamada de Conferência com voz...
+Clique Aceitar para jumtar-se à chamada ou Recusar para recusar o convite. Clique Mudo para calar este usuário.
+                </message>
+                <option name="Accept">
+                        Aceitar
+                </option>
+                <option name="Decline">
+                        Recusar
+                </option>
+                <option name="Mute">
+                        Mudo
+                </option>
+        </notify>
+        <notify name="InviteAdHoc">
+                <message name="message">
+                        [NAME] está lhe convidando para uma conversa em conferência...
+ Clique Aceitar para se juntar à conversa, ou Recusar para recusar o convite. Clique Mudo para calar este usuário.
+                </message>
+                <option name="Accept">
+                        Aceitar
+                </option>
+                <option name="Decline">
+                        Recusar
+                </option>
+                <option name="Mute">
+                        Mudo
+                </option>
+        </notify>
+        <notify name="VoiceChannelFull">
+                <message name="message">
+                        A chamada de voz a qual você está tentando juntar-se, [VOICE_CHANNEL_NAME],  atingiu sua máxima capacidade. Favor tentar novamente mais tarde.
+                </message>
+        </notify>
+        <notify name="ProximalVoiceChannelFull">
+                <message name="message">
+                        Desculpe-nos. Esta área atingiu seu limite de capacidade para conversas com voz. Favor tentar o usar voz em outra área.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnected">
+                <message name="message">
+                        Você foi desconectado de [VOICE_CHANNEL_NAME].  Voce será reconectado agora a Conversa com voz local.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnectedP2P">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] desligou a chamada. Voce será reconectado agora a Conversa com voz local.
+                </message>
+        </notify>
+        <notify name="P2PCallDeclined">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] recusou sua chamada.  Voce será reconectado agora a Conversa com voz local.
+                </message>
+        </notify>
+        <notify name="P2PCallNoAnswer">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] não está disponível para aceitar sua chamada. Voce será reconectado agora a Conversa com voz local.
+                </message>
+        </notify>
+        <notify name="VoiceChannelJoinFailed">
+                <message name="message">
+                        Falha na conexão com [VOICE_CHANNEL_NAME], tente novamente mais tarde. Voce será reconectado agora a Conversa com voz local. 
+                </message>
+        </notify>
+        <notify name="VoiceLoginRetry">
+                <message name="message">
+                        Estamos criando uma canal de voz para você. Isto pode levar até um minuto.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not a group member">
+                <message name="message">
+                        Você não pode entrar nessa terra, você não é membro do grupo autorizado.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: banned">
+                <message name="message">
+                        Você não pode entrar nessa terra, você foi banido.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not on access list">
+                <message name="message">
+                        Você não pode entrar nessa terra, você não está na lista de acesso.
+                </message>
+        </notify>
+        <notify name="VoiceNotAllowed">
+                <message name="message">
+                        Você não tem permissão para se conectar à conversa com voz de [VOICE_CHANNEL_NAME].
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError">
+                <message name="message">
+                        Ocorreu um erro enquanto você tentava se conectar à conversa de voz de [VOICE_CHANNEL_NAME].  Favor tentar novamente mais tarde.
+                </message>
+        </notify>
+        <notify name="ServerVersionChanged">
+                <message name="message">
+                        A região que você entrou está rodando uma versão do simulador diferente da sua. Clique aqui para mais detalhes.
+                </message>
+        </notify>
+        <notify name="UnableToOpenCommandURL">
+                <message name="message">
+                        A URL que vocÊ clicou não pôde ser aberta no navegador web.
+                </message>
+        </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
new file mode 100644
index 0000000..9581413
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="device_settings">

+        <text name="Audio Devices">

+                Dispositivos de �udio

+        </text>

+        <text name="Input device (microphone):">

+                Dispositivo de entrada (microfone):

+        </text>

+        <text name="Input level:">

+                Nível de Entrada

+        </text>

+        <string name="default_text">

+                Padrão

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml b/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
index ee8ab6c..6e04a8b 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
@@ -1,31 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
                 <panel label="2nd Life" name="2nd Life">
-                        <text name="CaptionTextAcctInfo">
+                        <string name="CaptionTextAcctInfo">
                                 [ACCTTYPE][PAYMENTINFO]
-                        </text>
-                        <text name="AcctTypeResident">
+                        </string>
+                        <string name="AcctTypeResident">
                                 Residente
-                        </text>
-                        <text name="AcctTypeTrial">
+                        </string>
+                        <string name="AcctTypeTrial">
                                 Teste
-                        </text>
-                        <text name="AcctTypeCharterMember">
+                        </string>
+                        <string name="AcctTypeCharterMember">
                                 Estatuto do membro.
-                        </text>
-                        <text name="AcctTypeEmployee">
+                        </string>
+                        <string name="AcctTypeEmployee">
                                 Contratado da Linden Lab.
-                        </text>
-                        <text name="PaymentInfoUsed">
+                        </string>
+                        <string name="PaymentInfoUsed">
                                 Informações de pagamento utilizado.
-                        </text>
-                        <text name="PaymentInfoOnFile">
+                        </string>
+                        <string name="PaymentInfoOnFile">
                                 Informações de pagamento no arquivo.
-                        </text>
-                        <text name="NoPaymentInfoOnFile">
+                        </string>
+                        <string name="NoPaymentInfoOnFile">
                                 Sem informações de pagamento no arquivo.
-                        </text>
+                        </string>
+                        <string name="AgeVerified">
+                                Idade Verificada
+                        </string>
+                        <string name="NotAgeVerified">
+                                Idade não Verificada
+                        </string>
                         <text name="Name:">
                                 Nome:
                         </text>
@@ -38,21 +44,18 @@
                         <text name="label2">
                                 Conta:
                         </text>
-                        <text name="partner_label"
-                             tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
+                        <text name="partner_label" tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
                                 Parceiro:
                         </text>
-                        <line_editor name="partner_edit"
-                             tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
+                        <button label="i" label_selected="i" name="partner_info" tool_tip="Clique para abrir o perfil do(a) parceiro(a)"/>
+                        <button label="?" label_selected="?" name="partner_help"/>
+                        <line_editor name="partner_edit" tool_tip="Afiliado Second Life. Para mais informações, veja www.secondlife.com/partner">
                                 [FIRST] [LAST]
                         </line_editor>
                         <text name="Photo:">
                                 Foto:
                         </text>
-                        <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto" />
-                        <text name="Ratings:">
-                                Avaliação
-                        </text>
+                        <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto"/>
                         <text name="Groups:">
                                 Grupos:
                         </text>
@@ -65,57 +68,52 @@
                         <text name="Give item:">
                                 Doar item:
                         </text>
-                        <text name="Give inventory"
-                             tool_tip="Arraste e solte o item aqui para da-lo a pessoa desejada.">
+                        <text name="Give inventory" tool_tip="Arraste e solte o item aqui para da-lo a pessoa desejada.">
                                 Arraste e solte o item aqui.
                         </text>
-                        <check_box label="Publicar na Web." name="allow_publish"
-                             tool_tip="Publica as informações do seu perfil na web." />
-                        <button label="?" label_selected="?" name="?" />
-                        <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" />
-                        <button label="Oferecer teleporte..." label_selected="Oferecer teleporte..."
-                             name="Offer Teleport..." />
-                        <button label="Adicionar amigo..." label_selected="Adicionar amigo..."
-                             name="Add Friend..." />
-                        <button label="Pagar..." label_selected="Pagar..." name="Pay..." />
-                        <button label="Mensagem Instantânea..." label_selected="Mensagem Instantânea..."
-                             name="Instant Message..." />
-                        <button label="Silenciar" label_selected="Silenciar" name="Mute" />
+                        <check_box label="Mostrar na busca" name="allow_publish" tool_tip="Publicar informações de perfil adicionais, como descrição e imagem, na Busca."/>
+                        <button label="?" label_selected="?" name="?"/>
+                        <button label="Encontrar no Mapa" label_selected="Encontrar no Mapa" name="Find on Map"/>
+                        <button label="Oferecer teleporte..." label_selected="Oferecer teleporte..." name="Offer Teleport..."/>
+                        <button label="Adicionar amigo..." label_selected="Adicionar amigo..." name="Add Friend..."/>
+                        <button label="Pagar..." label_selected="Pagar..." name="Pay..."/>
+                        <button label="Mensagem Instantânea..." label_selected="Mensagem Instantânea..." name="Instant Message..." tool_tip="Mensagem Instantânea (MI)"/>
+                        <button label="Silenciar" label_selected="Silenciar" name="Mute"/>
                 </panel>
                 <panel label="Web" name="WebProfile">
-                        <button label="Inicío" label_selected="Home" name="home" />
-                        <button label="Carregar" label_selected="Carregar" name="load"
-                             tool_tip="Carrega o seu perfil no seu navegador." />
-                        <button label="Abrir..." label_selected="Abrir..." name="open"
-                             tool_tip="Abre essa página no seu navegador externo." />
-                        <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="Carregar Perfis da Web" name="auto_load"
-                             tool_tip="Carrega automaticamente os perfis da Web sem perguntar antes." />
-                        <text name="status_text">
-                                Feito.
-                        </text>
+                        <flyout_button label="Carregar" label_selected="Carregar" name="load" tool_tip="Carrega o seu perfil no seu navegador.">
+                                <flyout_button_item name="open_item">
+                                        No navegador externo
+                                </flyout_button_item>
+                                <flyout_button_item name="home_item">
+                                        URL de Casa
+                                </flyout_button_item>
+                        </flyout_button>
+                        <button label="?" label_selected="?" name="web_profile_help"/>
+                        <check_box label="Carregar Perfis da Web" name="auto_load" tool_tip="Carrega automaticamente os perfis da Web sem perguntar antes."/>
+                        <text name="status_text"/>
                 </panel>
                 <panel label="Interesses" name="Interests">
                         <text name="I Want To:">
                                 Eu quero:
                         </text>
-                        <check_box label="Construção." name="chk0" />
-                        <check_box label="Explorar" name="chk1" />
-                        <check_box label="Encontros." name="chk2" />
-                        <check_box label="Ser contratado" name="chk6" />
-                        <check_box label="Grupo" name="chk3" />
-                        <check_box label="Comprar" name="chk4" />
-                        <check_box label="Vender" name="chk5" />
-                        <check_box label="Contratar" name="chk7" />
+                        <check_box label="Construção." name="chk0"/>
+                        <check_box label="Explorar" name="chk1"/>
+                        <check_box label="Encontros." name="chk2"/>
+                        <check_box label="Ser contratado" name="chk6"/>
+                        <check_box label="Grupo" name="chk3"/>
+                        <check_box label="Comprar" name="chk4"/>
+                        <check_box label="Vender" name="chk5"/>
+                        <check_box label="Contratar" name="chk7"/>
                         <text name="Skills:">
                                 Habilidades:
                         </text>
-                        <check_box label="Texturas" name="schk0" />
-                        <check_box label="Arquitetura:" name="schk1" />
-                        <check_box label="Planejador de Eventos" name="schk2" />
-                        <check_box label="Modelador" name="schk3" />
-                        <check_box label="Programador" name="schk4" />
-                        <check_box label="Personagens customizados." name="schk5" />
+                        <check_box label="Texturas" name="schk0"/>
+                        <check_box label="Arquitetura:" name="schk1"/>
+                        <check_box label="Planejador de Eventos" name="schk2"/>
+                        <check_box label="Modelador" name="schk3"/>
+                        <check_box label="Programador" name="schk4"/>
+                        <check_box label="Personagens customizados." name="schk5"/>
                         <text name="Languages:">
                                 Línguas:
                         </text>
@@ -124,8 +122,8 @@
                         <text name="Tell everyone about your favorite places in Second Life.">
                                 Diga a todos os seus lugares favoritos em Second Life.
                         </text>
-                        <button label="Novo..." label_selected="Novo..." name="New..." />
-                        <button label="Apagar..." label_selected="Apagar..." name="Delete..." />
+                        <button label="Novo..." label_selected="Novo..." name="New..."/>
+                        <button label="Apagar..." label_selected="Apagar..." name="Delete..."/>
                         <text name="loading_text">
                                 Carregando...
                         </text>
@@ -134,8 +132,8 @@
                         <text name="Place an ad in Second Life&apos;s classified listings.">
                                 Adicione no Second Life sua lista de classificados.
                         </text>
-                        <button label="Novo..." label_selected="Novo..." name="New..." />
-                        <button label="Apagar..." label_selected="Apagar..." name="Delete..." />
+                        <button label="Novo..." label_selected="Novo..." name="New..."/>
+                        <button label="Apagar..." label_selected="Apagar..." name="Delete..."/>
                         <text name="loading_text">
                                 Carregando...
                         </text>
@@ -144,7 +142,7 @@
                         <text name="Photo:">
                                 Foto:
                         </text>
-                        <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto" />
+                        <texture_picker label="" name="img" tool_tip="Clique para selecionar uma foto"/>
                         <text name="Info:">
                                 Sobre:
                         </text>
@@ -153,36 +151,39 @@
                         </text>
                 </panel>
                 <panel label="Minhas anotações" name="My Notes">
+                        <string name="Loading">
+                                Carregando...
+                        </string>
                         <text name="label">
                                 Use esse espaço para falar sobre essa pessoa. Coloque aqui o que desejar, projetos, lembretes e etc. Somente você poderá ver essa anotação.
                         </text>
                 </panel>
         </tab_container>
-        <button label="OK" label_selected="OK" name="OK" />
-        <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-        <button label="Retirar" label_selected="Retirar" name="Kick" />
-        <button label="Paralizar" label_selected="Paralizar" name="Freeze"
-             tool_tip="Paraliza o movimento e conversa desse residente." />
-        <button label="Unfreeze" label_selected="Unfreeze" name="Unfreeze"
-             tool_tip="Libera o residente" />
-        <button label="CSR" label_selected="CSR" name="csr_btn"
-             tool_tip="Abre a ferramenta de cliente para esse residente." />
-        <text name="ShowOnMapNonFriend">
+        <button label="OK" label_selected="OK" name="OK"/>
+        <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+        <button label="Retirar" label_selected="Retirar" name="Kick"/>
+        <button label="Paralizar" label_selected="Paralizar" name="Freeze" tool_tip="Paraliza o movimento e conversa desse residente."/>
+        <button label="Unfreeze" label_selected="Unfreeze" name="Unfreeze" tool_tip="Libera o residente"/>
+        <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Abre a ferramenta de cliente para esse residente."/>
+        <string name="ShowOnMapNonFriend">
                 Mostra a localização no mapa. Desativado porque ainda não é amigo desse residente.
-        </text>
-        <text name="ShowOnMapFriendOffline">
-                Mostra a localização no mapa. Desativado pois ele não está online.
-        </text>
-        <text name="ShowOnMapFriendOnline">
+        </string>
+        <string name="ShowOnMapFriendOffline">
+                Mostrar a localidade no mapa. Desabilitar porque eles não estão conectados.
+        </string>
+        <string name="ShowOnMapFriendOnline">
                 Mostra localização no mapa.
-        </text>
-        <text name="TeleportGod">
+        </string>
+        <string name="TeleportGod">
                 Força teleporte até a sua localização.
-        </text>
-        <text name="TeleportPrelude">
+        </string>
+        <string name="TeleportPrelude">
                 Oferece teleporte para a sua lozalização. Desativado até que você saia da ilha da Orientação.
-        </text>
-        <text name="TeleportNormal">
+        </string>
+        <string name="TeleportNormal">
                 Oferece teleporte para a sua localização.
-        </text>
+        </string>
+        <string name="Loading">
+                Carregando...
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
index 4d11567..0ee81da 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
@@ -1,25 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Classified" title="Classificados">
-        <line_editor name="given_name_editor"
-             tool_tip="O Nome precisa começar com uma letra ou número, não pontuação." />
-        <line_editor name="location_editor"
-             tool_tip="Defina a posição para este classificado para sua posição atual." />
-        <button label="Definir Posição" name="set_location_btn" />
-        <button label="Teleporte" name="classified_teleport_btn" />
-        <button label="Mapa" name="classified_map_btn" />
-        <combo_box label="" name="classified_category_combo" />
-        <check_box label="Adulto" name="classified_mature_check" />
-        <text name="classified_info_text"
-             tool_tip="Quando mais você escolhe pagar pelo seu anúncio, melhor será sua visualizaçã na lista.">
+        <line_editor name="given_name_editor" tool_tip="O Nome precisa começar com uma letra ou número, não pontuação."/>
+        <line_editor name="location_editor" tool_tip="Defina a posição para este classificado para sua posição atual."/>
+        <button label="Definir Posição" name="set_location_btn"/>
+        <button label="Teleporte" name="classified_teleport_btn"/>
+        <button label="Mapa" name="classified_map_btn"/>
+        <combo_box label="" name="classified_category_combo"/>
+        <combo_box label="" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - Selecione Maduro -
+                </combo_item>
+                <combo_item name="mature">
+                        Conteúdo Maduro
+                </combo_item>
+                <combo_item name="not_mature">
+                        Conteúdo Não Maduro
+                </combo_item>
+        </combo_box>
+        <text name="classified_info_text" tool_tip="Quando mais você escolhe pagar pelo seu anúncio, melhor será sua visualizaçã na lista.">
                 Lugar do Anúncio: Ainda não publicado
         </text>
-        <text name="click_through_text"
-             tool_tip="Número total de cliques em cada botão desde que este classificado foi posicionado.">
+        <text name="click_through_text" tool_tip="Número total de cliques em cada botão desde que este classificado foi posicionado.">
                 Cliques:
         </text>
-        <button label="Publicar..." name="classified_update_btn" />
-        <check_box label="Auto-Renovar a cada Semana" name="auto_renew_check" />
-        <text name="ad_placed_paid">
+        <button label="Publicar..." name="classified_update_btn"/>
+        <check_box label="Auto-Renovar a cada Semana" name="auto_renew_check"/>
+        <string name="ad_placed_paid">
                 Anúncio publicado em: [DATE], Pago L$[AMT] para listar.
-        </text>
+        </string>
+        <string name="update_txt">
+                Atualizar
+        </string>
+        <string name="publish_txt">
+                Publicar…
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
index d086cfc..7522e48 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="chat_bar">
-        <button label="Histórico" label_selected="Histórico" name="History"
-             tool_tip="Clique aqui para ver o que foi dito" />
-        <line_editor label="Clique aqui para iniciar o chat" name="Chat Editor"
-             tool_tip="Pressione Enter para dizer" />
-        <button label="Dizer" label_selected="Dizer" name="Say" tool_tip="Enter" />
-        <button label="Gritar" label_selected="Gritar" name="Shout" tool_tip="Ctrl-Enter" />
-        <combo_box label="Gestos" name="Gesture">
-                <combo_item name="Gestures">
-                        Gestos
-                </combo_item>
-        </combo_box>
+        <button label="Conversa local" label_selected="Histórico" name="History" tool_tip="Clique aqui para ver o que foi dito"/>
+        <line_editor label="Clique aqui para iniciar o chat" name="Chat Editor" tool_tip="Pressione Enter para dizer"/>
+        <flyout_button label="Falar" label_selected="Dizer" name="Say" tool_tip="Enter">
+                <flyout_button_item name="shout_item">
+                        Gritar
+                </flyout_button_item>
+                <flyout_button_item name="say_item">
+                        Falar
+                </flyout_button_item>
+                <flyout_button_item name="whisper_item">
+                        Sussurrar
+                </flyout_button_item>
+        </flyout_button>
+        <combo_box label="Gestos" name="Gesture"/>
+        <string name="gesture_label">Gestos</string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_classified.xml b/linden/indra/newview/skins/default/xui/pt/panel_classified.xml
index 5b5f22b..44c2159 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_classified.xml
@@ -1,13 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Classified" title="Classificados">
-        <line_editor name="given_name_editor"
-             tool_tip="O nome deve começar com uma letra ou um número, não pontuação." />
-        <line_editor name="location_editor" tool_tip="Ajustar a posição para sua localização." />
-        <button label="Ajuste" name="set_location_btn" />
-        <button label="Tele-transporte" name="classified_teleport_btn" />
-        <button label="Mostrar no mapa" name="classified_map_btn" />
-        <button label="Perfil" name="classified_profile_btn" />
-        <check_box label="Maduro" name="classified_mature_check" />
-        <combo_box label="" name="classified_category_combo" />
-        <button label="Update" name="classified_update_btn" />
+        <line_editor name="given_name_editor" tool_tip="O nome deve começar com uma letra ou um número, não pontuação."/>
+        <line_editor name="location_editor" tool_tip="Ajustar a posição para sua localização."/>
+        <button label="Ajuste" name="set_location_btn"/>
+        <button label="Tele-transporte" name="classified_teleport_btn"/>
+        <button label="Mostrar no mapa" name="classified_map_btn"/>
+        <button label="Perfil" name="classified_profile_btn"/>
+        <combo_box label="Maduro" name="classified_mature_check">
+                <combo_item name="select_mature">
+                        - Selecionar Adulto -
+                </combo_item>
+                <combo_item name="mature">
+                        Conteúdo Adulto
+                </combo_item>
+                <combo_item name="not_mature">
+                        Conteúdo Não Adulto
+                </combo_item>
+        </combo_box>
+        <combo_box label="" name="classified_category_combo"/>
+        <button label="Update" name="classified_update_btn"/>
+        <string name="ad_placed_paid">
+                Anúncio colocado: [DATE], Pagos L$[AMT] para constar na lista.
+        </string>
+        <string name="update_txt">
+                Atualizar
+        </string>
+        <string name="publish_txt">
+                Publicar...
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_event.xml b/linden/indra/newview/skins/default/xui/pt/panel_event.xml
index 05497ef..600cd04 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_event.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Event" title="Evento">
         <text name="event_name_label">
                 Nome:
@@ -15,8 +15,11 @@
         <text name="event_mature_label">
                 �ndice:
         </text>
-        <text name="event_mature">
-                (desconhecido)
+        <text name="event_mature_yes">
+                sim
+        </text>
+        <text name="event_mature_no">
+                Não
         </text>
         <text name="event_date_label">
                 Data:
@@ -51,8 +54,17 @@
         <text name="event_desc_label">
                 Descrição:
         </text>
-        <button label="Tele-transportar" name="teleport_btn" />
-        <button label="Mostrar no mapa" name="map_btn" />
-        <button label="Notificar" name="notify_btn" />
-        <button label="Criar Evento..." name="create_event_btn" />
+        <button label="Tele-transportar" name="teleport_btn"/>
+        <button label="Mostrar no mapa" name="map_btn"/>
+        <button label="Notificar" name="notify_btn"/>
+        <button label="Criar Evento..." name="create_event_btn"/>
+        <string name="none">
+                nenhum
+        </string>
+        <string name="notify">
+                Avisar
+        </string>
+        <string name="dont_notify">
+                Não avisar
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_friends.xml b/linden/indra/newview/skins/default/xui/pt/panel_friends.xml
new file mode 100644
index 0000000..9a69ec1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="friends">

+        <string name="Multiple">

+                Multiplos amigos...

+        </string>

+        <scroll_list name="friend_list" tool_tip="Hold shift or control while clicking to select multiple friends">

+                <column name="icon_online_status" tool_tip="Status Online"/>

+                <column label="Name" name="friend_name" tool_tip="Nome"/>

+                <column name="icon_visible_online" tool_tip="Amigo pod ever quando você está online"/>

+                <column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>

+                <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar os seus objetos"/>

+                <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>

+        </scroll_list>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
index d833394..d1a759b 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Geral" name="general_tab">
-        <text name="help_text">
+        <string name="help_text">
                 A aba diversos contém informações gerais sobre esse grupo, a lista dos donos e seus membros, preferências gerais do grupo e opções dos membros. Passe o seu mouse por cima para ver mais informações. Ajuda.
-        </text>
-        <button label="?" label_selected="?" name="help_button" />
-        <line_editor name="group_name_editor">
-                Digite o nome do seu novo grupo aqui
-        </line_editor>
+        </string>
+        <string name="group_info_unchanged">
+                Informações gerais do grupo foram modificadas
+        </string>
+        <button label="?" label_selected="?" name="help_button"/>
+        <line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/>
         <text name="group_name">
                 Digite o nome do seu novo grupo aqui
         </text>
@@ -19,54 +20,57 @@
         <text name="group_charter_label">
                 Patente do Grupo
         </text>
-        <texture_picker label="Group Insignia" name="insignia"
-             tool_tip="Clique para escolher uma imagem" />
+        <texture_picker label="Group Insignia" name="insignia" tool_tip="Clique para escolher uma imagem"/>
         <text_editor name="charter">
                 Patente do grupo
         </text_editor>
-        <button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button" />
-        <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button" />
-        <text>
-                Donos &amp; Membros visíveis
+        <button label="Juntar (L$0)" label_selected="Juntar (L$0)" name="join_button"/>
+        <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
+        <text name="text_owners_and_visible_members">
+                Proprietários &amp; Membros visíveis
         </text>
-        <text>
-                Os proprietários são mostrados em realce
+        <text name="text_owners_are_shown_in_bold">
+                (Proprietários são mostrados em negrito )
         </text>
         <name_list name="visible_members">
-                <column label="Nome do membro" name="name" />
-                <column label="Título" name="title" />
-                <column label="Último login" name="online" />
+                <column label="Nome do membro" name="name"/>
+                <column label="Título" name="title"/>
+                <column label="Último login" name="online"/>
         </name_list>
-        <text name="incomplete_member_data_str">
-                Recuperando dados do membro
-        </text>
-        <text name="confirm_group_create_str">
-                Criar este grupo custará L$100. Você está certo que quer gastar L$100 para criar este grupo?
-        </text>
-        <text>
-                Preferências do grupo
+        <text name="text_group_preferences">
+                Preferências de Grupos
         </text>
         <panel name="preferences_container">
-                <check_box label="Mostrar na lista do grupo." name="show_in_group_list"
-                     tool_tip="Selecione onde esse grupo será exibido.   janela de procura e no perfil dos membros." />
-                <check_box label="Publicar na Web." name="publish_on_web"
-                     tool_tip="Selecione onde a informações desse grupo irá ser publicada na Web." />
-                <check_box label="Abrir o registro" name="open_enrollement"
-                     tool_tip="Esse grupo permite que novos membros entrem sem serem convidados" />
-                <check_box label="Tx. de adesão: L$" name="check_enrollment_fee"
-                     tool_tip="É necessário uma taxa de registro." />
-                <spinner name="spin_enrollment_fee"
-                     tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo." />
-                <check_box label="Adulto" name="mature"
-                     tool_tip="Selecione se o grupo possuir conteúdo adulto." />
+                <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca. "/>
+                <check_box label="Aberta inscrição" name="open_enrollement" tool_tip="Esse grupo permite que novos membros entrem sem serem convidados"/>
+                <check_box label="Taxa de inscrição: L$" name="check_enrollment_fee" tool_tip="É necessário uma taxa de registro."/>
+                <spinner name="spin_enrollment_fee" tool_tip="Os novos membros terão de pagar a taxa de registro para fazerem parte do grupo."/>
+                <combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada adulta.">
+                        <combo_item name="select_mature">
+                                - Selecionar conteúdo adulto -
+                        </combo_item>
+                        <combo_item name="mature">
+                                Conteúdo adulto
+                        </combo_item>
+                        <combo_item name="not_mature">
+                                Conteúdo não adulto
+                        </combo_item>
+                </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 Meu título ativo
                         </text>
-                        <combo_box name="active_title"
-                             tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo." />
+                        <combo_box name="active_title" tool_tip="Mude o título que aparece em seu avatar quando o grupo estiver ativo."/>
                 </panel>
-                <check_box label="Receba notícias do grupo." name="receive_notices"
-                     tool_tip="Você quer receber notícias desse grupo" />
+                <check_box label="Receber avisos do grupo" name="receive_notices" tool_tip="Você quer receber notícias desse grupo"/>
+                <check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/>
         </panel>
+        <string name="incomplete_member_data_str">
+                Recuperando dados do membro
+        </string>
+        <string name="confirm_group_create_str">
+                Criar este grupo irá custar L$100. 
+Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo? 
+Esteja consciente de que se ninguém mais se juntar este grupo dentro de 48 horas, este será dissolvido e o nome não estará disponível para uso futuro.
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index a9dea33..ec8ea44 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Convidar um membro" name="invite_panel">
         <text name="help_text">
-                Você pode seleciolar vários residentes para convidar para o seu grupo. Clique &apos;Selecionador de pessoas&apos; para iniciar.
+                Você pode selecionar múltiplos residentes para convidar ao seu grupo. Clique &apos;Abra o Selecionador de Pessoas&apos; para iniciar.
         </text>
-        <button label="Abrir selecionador de pessoas." name="add_button" tool_tip="" />
-        <name_list name="invitee_list"
-             tool_tip="Segure a tecla Ctrl e clique no nome dos residentes para selecionar multiplos personagens." />
-        <button label="Remove Selected from List" name="remove_button"
-             tool_tip="Remove os residentes selecionados acima  da lista de convite." />
+        <button label="Abrir selecionador de pessoas." name="add_button" tool_tip=""/>
+        <name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
+        <button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima  da lista de convite."/>
         <text name="role_text">
-                Selecione a função a ser dada a eles:
+                Escolha que Função atribuir a eles:
         </text>
-        <combo_box name="role_name"
-             tool_tip="Selecione da lista de Funções os que você está permitido a dar aos membros." />
-        <button label="Mandar convite." name="ok_button" />
-        <button label="Cancelar" name="cancel_button" />
+        <combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/>
+        <button label="Mandar convite." name="ok_button"/>
+        <button label="Cancelar" name="cancel_button"/>
+        <string name="confirm_invite_owner_str">
+                Você tem certeza de que deseja convidar novo(s) proprietário(s)?  Esta ação é permanente!
+        </string>
+        <string name="loading">
+                (carregando...)
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index 8d1fe30..d06f447 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,51 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Terra L$" name="land_money_tab">
-        <text name="help_text">
-                Lotes pertencentes ao grupo são listadas com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo.
-        </text>
-        <button label="?" name="help_button" />
-        <text name="cant_view_group_land_text">
+        <string name="help_text">
+                Lotes pertencentes ao grupo são listadas com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Detalhes e Vendas fornecem informações sobre as finanças do grupo.
+        </string>
+        <button label="?" name="help_button"/>
+        <string name="cant_view_group_land_text">
                 Você não tem permissão para ver as terras pertencentes ao grupo.
-        </text>
-        <text name="cant_view_group_accounting_text">
+        </string>
+        <string name="cant_view_group_accounting_text">
                 Você não tem permissão para ver as informações sobre as contas do grupo.
-        </text>
+        </string>
+        <string name="loading_txt">
+                Carregando...
+        </string>
         <text name="group_land_heading">
                 Terra percentence ao grupo
         </text>
         <scroll_list name="group_parcel_list">
-                <column label="Nome do Lote" name="name" />
-                <column label="Região" name="location" />
-                <column label="�rea" name="area" />
-                <column label="" name="hidden" />
+                <column label="Nome do Lote" name="name"/>
+                <column label="Região" name="location"/>
+                <column label="�rea" name="area"/>
+                <column label="" name="hidden"/>
         </scroll_list>
-        <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button" />
+        <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
         <text name="total_contributed_land_label">
                 Contribuição Total:
         </text>
         <text name="total_contributed_land_value">
-                0 metros quadrados
+                [AREA] m2
         </text>
         <text name="total_land_in_use_label">
                 Total de Terra em Uso:
         </text>
         <text name="total_land_in_use_value">
-                0 metros quadrados
+                [AREA] m2
         </text>
         <text name="land_available_label">
                 Terra Disponível:
         </text>
         <text name="land_available_value">
-                0 metros quadrados
+                [AREA] m2
         </text>
         <text name="your_contribution_label">
                 Sua Contribuição:
         </text>
-        <text name="your_contribution_max_value_append">
-                metros quadrados
-        </text>
+        <string name="land_contrib_error">
+                Não é possível definir sua contribuição para o terreno.
+        </string>
         <text name="your_contribution_max_value">
-                (aguardado)
+                m2 ([AMOUNT] máxima)
         </text>
         <text name="group_over_limit_text">
                 Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
@@ -54,28 +57,19 @@
                 Grupo L$
         </text>
         <tab_container name="group_money_tab_container">
-                <panel label="Planejamento" name="group_money_planning_tab">
-                        <text_editor name="group_money_planning_text">
-                                Computando...
-                        </text_editor>
-                </panel>
                 <panel label="Detalhes" name="group_money_details_tab">
                         <text_editor name="group_money_details_text">
                                 Computando...
                         </text_editor>
-                        <button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button"
-                             tool_tip="Voltar no Tempo" />
-                        <button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button"
-                             tool_tip="Adiantar o Tempo" />
+                        <button label="&lt; Cedo" label_selected="&lt; Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+                        <button label="Tarde &gt;" label_selected="Tarde &gt;" name="later_details_button" tool_tip="Adiantar o Tempo"/>
                 </panel>
                 <panel label="Vendas" name="group_money_sales_tab">
                         <text_editor name="group_money_sales_text">
                                 Computando...
                         </text_editor>
-                        <button label="&lt; Mais Cedo" label_selected="&lt; Mais Cedo"
-                             name="earlier_sales_button" tool_tip="Voltar no Tempo" />
-                        <button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button"
-                             tool_tip="Adiantar o Tempo" />
+                        <button label="&lt; Mais Cedo" label_selected="&lt; Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/>
+                        <button label="Mais Tarde" label_selected="Mais Tarde" name="later_sales_button" tool_tip="Adiantar o Tempo"/>
                 </panel>
         </tab_container>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 7ca536d..a7731ac 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -11,7 +11,9 @@
                 Arquivo de notícias do grupo
         </text>
         <text name="lbl2">
-                As notícias são mantidas por 14 dias. Clicar na notícia que você desejar ver.
+                As notícias são mantidas por 14 dias. Clique na notícia abaixo que você deseja ver.
+Clique no botão “Atualizar� para verificar se novas notícias foram recebidas.
+Listas de aviso estão limitadas a 200 por grupo, diariamente.
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 1cea79d..ed3efe0 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,15 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Membros e Funções" name="roles_tab">
-        <text name="default_needs_apply_text">
+        <string name="default_needs_apply_text">
                 Existem alterações
-        </text>
-        <text name="want_apply_text">
+        </string>
+        <string name="want_apply_text">
                 Você quer aplicar essas alterações?
-        </text>
-        <text name="cant_delete_role">
-                Todos os proprietários possuem funções especiais que não podem ser apagadas.
-        </text>
-        <button label="?" name="help_button" />
+        </string>
+        <button label="?" name="help_button"/>
         <panel name="members_header">
                 <text name="static">
                         Membros e Funções
@@ -46,43 +43,46 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
         </panel>
         <tab_container name="roles_tab_container">
                 <panel label="Membros" name="members_sub_tab" tool_tip="Membros">
-                        <button label="Pesquisar" name="search_button" />
-                        <button label="Mostrar todos" name="show_all_button" />
+                        <button label="Pesquisar" name="search_button"/>
+                        <button label="Mostrar todos" name="show_all_button"/>
                         <name_list name="member_list">
-                                <column label="Nome do membro" name="name" />
-                                <column label="Tarefa cedida." name="donated" />
-                                <column label="Último login" name="online" />
+                                <column label="Nome do membro" name="name"/>
+                                <column label="Tarefa cedida." name="donated"/>
+                                <column label="Último login" name="online"/>
                         </name_list>
-                        <button label="Convidar nova pessoa" name="member_invite" />
-                        <button label="Sair do Grupo" name="member_eject" />
-                        <text name="help_text">
-                                Você pode adicionar ou remover as funções atribuídas ou selecionar múltiplos membros pressionando o Ctrl e clicando em seus nomes.
-                        </text>
+                        <button label="Convidar nova pessoa" name="member_invite"/>
+                        <button label="Sair do Grupo" name="member_eject"/>
+                        <string name="help_text">
+                                Você pode adicionar ou remover os direitos designados aos membros.Selecione vários membros segurando a tecla Ctrl e clicando em seus nomes.
+                        </string>
                 </panel>
                 <panel label="Funções" name="roles_sub_tab">
-                        <button label="Busca" name="search_button" />
-                        <button label="Mostrar todos" name="show_all_button" />
+                        <button label="Busca" name="search_button"/>
+                        <button label="Mostrar todos" name="show_all_button"/>
                         <scroll_list name="role_list">
-                                <column label="Nome da função" name="name" />
-                                <column label="Título" name="title" />
-                                <column label="Membro" name="members" />
+                                <column label="Nome da função" name="name"/>
+                                <column label="Título" name="title"/>
+                                <column label="Membro" name="members"/>
                         </scroll_list>
-                        <button label="Criar nova função..." name="role_create" />
-                        <button label="Apagar função" name="role_delete" />
-                        <text name="help_text">
+                        <button label="Criar nova função..." name="role_create"/>
+                        <button label="Apagar função" name="role_delete"/>
+                        <string name="help_text">
                                 Funções e habilidades permitidas para os membros da lista. Os membros poderão ter um ou mais funções. O grupo poderá ter 10 ou mais funções, Incluíndo as funções dos membros e do dono do grupo.
-                        </text>
+                        </string>
+                        <string name="cant_delete_role">
+                                Os direitos de “Todos� e dos “Donos� são especiais e não podem ser apagados
+                        </string>
                 </panel>
                 <panel label="Habilidades" name="actions_sub_tab">
-                        <button label="Busca" name="search_button" />
-                        <button label="Mostrar todos" name="show_all_button" />
+                        <button label="Busca" name="search_button"/>
+                        <button label="Mostrar todos" name="show_all_button"/>
                         <scroll_list name="action_list" tool_tip="Selecionar habilidade e ver detalhes.">
-                                <column label="" name="icon" />
-                                <column label="" name="action" />
+                                <column label="" name="icon"/>
+                                <column label="" name="action"/>
                         </scroll_list>
-                        <text name="help_text">
+                        <string name="help_text">
                                 Habilidades permite que os membros façam coisas especificas dentro do grupo.Há uma grande variedade de habilidades.
-                        </text>
+                        </string>
                 </panel>
         </tab_container>
         <panel name="members_footer">
@@ -93,13 +93,12 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
                         Habilidades permitidas
                 </text>
                 <scroll_list name="member_assigned_roles">
-                        <column label="" name="checkbox" />
-                        <column label="" name="role" />
+                        <column label="" name="checkbox"/>
+                        <column label="" name="role"/>
                 </scroll_list>
-                <scroll_list name="member_allowed_actions"
-                     tool_tip="Ver detalhes das habilidades permitidas">
-                        <column label="" name="icon" />
-                        <column label="" name="action" />
+                <scroll_list name="member_allowed_actions" tool_tip="Ver detalhes das habilidades permitidas">
+                        <column label="" name="icon"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="roles_footer">
@@ -124,17 +123,14 @@ Estes ajustes podem ser customizados para uma flexibilidade maior.
                 <text name="static4">
                         Membros atribuídos
                 </text>
-                <text name="static5"
-                     tool_tip="A list of Abilities the currently selected role can perform.">
+                <text name="static5">
                         Habilidades permitidas
                 </text>
-                <check_box label="Membros visivéis" name="role_visible_in_list"
-                     tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo." />
-                <scroll_list name="role_allowed_actions"
-                     tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
-                        <column label="" name="icon" />
-                        <column label="" name="checkbox" />
-                        <column label="" name="action" />
+                <check_box label="Membros visivéis" name="role_visible_in_list" tool_tip="Selecione se os membros estarão visivéis na aba diversos para as pessoas de fora do grupo."/>
+                <scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habiliadade permitida veja a aba correspondente.">
+                        <column label="" name="icon"/>
+                        <column label="" name="checkbox"/>
+                        <column label="" name="action"/>
                 </scroll_list>
         </panel>
         <panel name="actions_footer">
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
index c3d512a..31f6815 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
@@ -1,51 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Propostas" name="voting_tab">
-        <text name="help_text">
+        <string name="help_text">
                 As propostas do grupo poderá mostrar para os outros como esse determinado grupo se sente sobre determinado assunto.Se vocÊ possuir poder de propriedade você poderá abrir novas propostas, votar em propostas abertas e visualizar propostas antigas.
-        </text>
-        <button label="?" name="help_button" />
+        </string>
+        <button label="?" name="help_button"/>
         <text name="proposal_header">
                 Abrir propostas do grupo
         </text>
-        <text name="proposals_header_view_txt">
-                Abrir propostas do grupo
-        </text>
-        <text name="proposals_header_create_txt">
-                Criar proposta
-        </text>
-        <text name="proposals_header_vote_txt">
-                Votar na proposta
-        </text>
-        <text name="empty_proposal_txt">
-                A proposta que você está tentando criar encontra-se vazia.
-        </text>
         <text name="proposal_instructions">
                 Clique duas vezes sobre a proposta que desejar votar.
         </text>
         <text name="proposal_lbl">
-                Proposta:
+                Descrição da Proposta
         </text>
-        <button label="Criar proposta" label_selected="Criar proposta" name="btn_proposal" />
-        <button label="Ver proposta" label_selected="Ver proposta"
-             name="btn_view_proposal_item" />
-        <button label="Ver Lista" label_selected="Ver Lista" name="btn_view_proposal_list" />
+        <text name="proposal_voting_lbl">
+                Proposta                                                         Término da votação                    Votado?
+        </text>
+        <button label="Criar proposta" label_selected="Criar proposta" name="btn_proposal"/>
+        <button label="Ver proposta" label_selected="Ver proposta" name="btn_view_proposal_item"/>
+        <button label="Ver Lista" label_selected="Ver Lista" name="btn_view_proposal_list"/>
         <text name="quorum_lbl">
                 Quantidade:
         </text>
-        <spinner name="quorum"
-             tool_tip="# do número de votos necessário para eleger a proposta" />
+        <spinner name="quorum" tool_tip="# do número de votos necessário para eleger a proposta"/>
         <text name="quorum_text">
-                x é o número de membros fora do grupo.
+                de [MEMBERS] membros precisam votar.
         </text>
         <text name="duration_lbl">
                 Duração:
         </text>
-        <spinner name="duration" tool_tip="# de dias que a eleição irá durar." />
+        <spinner name="duration" tool_tip="# de dias que a eleição irá durar."/>
         <text name="duration_text">
                 dias
         </text>
-        <radio_group name="majority"
-             tool_tip="A maioria de 2/3 dos votos é necessário para ganhar">
+        <radio_group name="majority" tool_tip="A maioria de 2/3 dos votos é necessário para ganhar">
                 Simples maioria 2/3 maioria unanime
         </radio_group>
         <text name="start_lbl">
@@ -54,12 +42,11 @@
         <text name="end_lbl">
                 Voto final:
         </text>
-        <button label="Submeter a proposta" label_selected="Submeter a proposta"
-             name="btn_submit" />
-        <button label="Cancelar" label_selected="Cancelar" name="btn_cancel" />
-        <button label="Sim" label_selected="Sim" name="btn_yes" />
-        <button label="Não" label_selected="Não" name="btn_no" />
-        <button label="Abstencia" label_selected="Abstencia" name="btn_abstain" />
+        <button label="Submeter a proposta" label_selected="Submeter a proposta" name="btn_submit"/>
+        <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
+        <button label="Sim" label_selected="Sim" name="btn_yes"/>
+        <button label="Não" label_selected="Não" name="btn_no"/>
+        <button label="Abstencia" label_selected="Abstencia" name="btn_abstain"/>
         <text name="txt">
                 Histórico de votos do grupo
         </text>
@@ -69,15 +56,49 @@
         <text name="history_list_lbl">
                 Após o voto                                                    Voto finalizado
         </text>
-        <button label="Visualizar Item" label_selected="Visualizar Item"
-             name="btn_view_history_item" />
+        <button label="Visualizar Item" label_selected="Visualizar Item" name="btn_view_history_item"/>
         <text name="vote_text_lbl">
                 Resultado:
         </text>
-        <button label="Visualizar lista" label_selected="Visualizar lista"
-             name="btn_view_history_list" />
-        # o número de votos necessário para eleger a proposta
-
-
-# é o número de dias da eleição.
+        <button label="Visualizar lista" label_selected="Visualizar lista" name="btn_view_history_list"/>
+        <string name="proposals_header_view_txt">
+                Abrir propostas do grupo
+        </string>
+        <string name="proposals_header_view_inst">
+                Dê um duplo click na proposta a qual você gostaria de votar ou pressione Criar Proposto para criar uma nova proposta 
+        </string>
+        <string name="proposals_header_create_txt">
+                Criar proposta
+        </string>
+        <string name="proposals_header_vote_txt">
+                Votar na proposta
+        </string>
+        <string name="proposals_header_vote_inst">
+                Pressione o botão Sim ou Não para votar na proposta,
+Ou escolha de abster nesta proposta.
+        </string>
+        <string name="proposals_header_voted_inst">
+                Você já votou: [VOTE]
+        </string>
+        <string name="empty_proposal_txt">
+                A proposta que você está tentando criar encontra-se vazia.
+        </string>
+        <string name="proposals_submit_yes_txt">
+                Submeter Sim à proposta...
+        </string>
+        <string name="proposals_submit_no_txt">
+                Submeter Não à proposta...
+        </string>
+        <string name="proposals_submit_abstain_txt">
+                Submetendo abster a Proposta...
+        </string>
+        <string name="proposals_submit_new_txt">
+                Submetendo nova proposta...
+        </string>
+        <string name="vote_recorded">
+                Seu voto foi recebido.
+        </string>
+        <string name="vote_previously_recorded">
+                Você já votou antes. Você só pode votar uma vez durante uma eleição
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_login.xml b/linden/indra/newview/skins/default/xui/pt/panel_login.xml
index 4665483..3442d68 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_login">
         <text name="first_name_text">
                 Primeiro nome:
@@ -23,15 +23,15 @@
                         &lt; Digite o nome da região;
                 </combo_item>
         </combo_box>
-        <check_box label="Lembrar senha" name="remember_check" />
-        <text name="full_screen_text">
-                O visor indicará a tela cheia quando entrar.
+        <check_box label="Lembrar senha" name="remember_check"/>
+        <button label="Entrar" label_selected="Entrar" name="connect_btn"/>
+        <text name="create_new_account_text">
+                Registrar-se para uma conta
         </text>
-        <button label="Preferências..." label_selected="Preferências..."
-             name="preferences_btn" />
-        <button label="Conectar" label_selected="Conectar" name="connect_btn" />
-        <button label="Sair" label_selected="Sair" name="quit_btn" />
-        <text name="version_text">
-                1.23.4 (5)
+        <text name="forgot_password_text">
+                Esqueceu seu nome de usuário e senha?
+        </text>
+        <text name="channel_text">
+                [CHANNEL] [VERSION]
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml
new file mode 100644
index 0000000..65a6077
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_media_controls.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="media_controls">

+        <icon label="" name="music_icon" tool_tip="Executar/pausar fluxo de música"/>

+        <button label="" name="music_play" tool_tip="Executar/pausar fluxo de música"/>

+        <button label="" name="music_pause" tool_tip="Pausar fluxo de música"/>

+        <button label="" name="music_stop" tool_tip="Parar o fluxo de música"/>

+        <icon label="" name="media_icon" tool_tip="Executar/pausar o fluxo de música"/>

+        <button label="" name="media_play" tool_tip="Executar/pausar o fluxo de música"/>

+        <button label="" name="media_pause" tool_tip="Pausar o fluxo de mídia"/>

+        <button label="" name="media_stop" tool_tip="Parar o fluxo de mídia"/>

+        <volume_slider name="volume_slider" tool_tip="Volume Mestre"/>

+        <button label="" name="mute_master" tool_tip="Emudecedor Mestre"/>

+        <button label="" name="expand" tool_tip="Ajustar níveis de volume individuais"/>

+        <string name="play_label">

+                Executar

+        </string>

+        <string name="stop_label">

+                Parar

+        </string>

+        <string name="pause_label">

+                Pausar

+        </string>

+        <string name="default_tooltip_label">

+                Nenhuma Mídia Especificada

+        </string>

+        <string name="media_hidden_label">

+                (URL escondida pelo dono do terreno)

+        </string>

+        <string name="media_icon_tooltip_web">

+                Esta localidade mostra conteúdo da World Wide Web. Clique no botão Play para mostrar conteúdo da web.

+        </string>

+        <string name="media_icon_tooltip_movie">

+                Esta localidade mostra conteúdo de Vídeo. Clique no botão Play para executar o vídeo.

+        </string>

+        <string name="media_play_tooltip">

+                Mostra conteúdo da Web nesta localidade.

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..ed34f2a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_media_remote_expanded.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="media_remote">

+        <panel label="�udio &amp; Vídeo" name="Volume Panel"/>

+        <string name="play_label">

+                Executar

+        </string>

+        <string name="stop_label">

+                Parar

+        </string>

+        <string name="pause_label">

+                Pausar

+        </string>

+        <string name="default_tooltip_label">

+                Nenhuma Mídia Especificada

+        </string>

+        <string name="media_hidden_label">

+                (URL escondida pelo dono do terreno)

+        </string>

+        <string name="media_icon_tooltip_web">

+                Esta localidade mostra conteúdo da World Wide Web. Clique no botão Executar para mostrar o conteúdo Web.

+        </string>

+        <string name="media_icon_tooltip_movie">

+                Esta localidade mostra conteúdo de Vídeo. Clique no botão Executar para executar o vídeo.

+        </string>

+        <string name="media_play_tooltip">

+                Mostra conteúdo Web nesta localidade.

+        </string>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
index 223e88e..60f43cb 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
@@ -1,20 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="overlay">
         <layout_stack name="overlay_layout_panel">
                 <layout_panel name="main_panel">
                         <layout_stack name="chatbar_and_buttons">
                                 <layout_panel name="state_buttons">
-        <button label="MI Recebida" label_selected="MI Recebida" name="IM Received"
-             tool_tip="Você tem uma mensagem instantânea pendente. Clique para visualizar." />
-        <button label="Ajustar como não ocupado" label_selected="Ajustar como não ocupado"
-             name="Set Not Busy"
-             tool_tip="O chat e o MI não aparecem. Clique aqui para solucionar." />
-        <button label="Liberar Teclas" label_selected="Liberar Teclas" name="Release Keys"
-             tool_tip="Foi feito um controle em suas teclas. Clique aqui para liberá-las." />
-        <button label="Mouselook" label_selected="Mouselook" name="Mouselook"
-             tool_tip="Use o mouse para aproximar sua visualização." />
-        <button label="Levantar" label_selected="Levantar" name="Stand Up"
-             tool_tip="Clique aqui para levantar" />
+                                        <button label="MI recebida" label_selected="MI recebida" name="IM Received" tool_tip="Você tem uma mensagem instantânea pendente. Clique para mostrar as MIs."/>
+                                        <button label="Ajustar para Não Ocupado" label_selected="Ajustar para desocupado" name="Set Not Busy" tool_tip="Conversa e MI estão ocultas para você. Clique aqui para se colocar desocupado."/>
+                                        <button label="Olhar com mouse" label_selected="Olhar com mouse" name="Mouselook" tool_tip="Use o mouse para pilotar sua visão. Se você tiver uma arma, clicando, ela dispara."/>
+                                        <button label="Levantar" label_selected="Levantar" name="Stand Up" tool_tip="Clique aqui para levantar."/>
                                 </layout_panel>
                         </layout_stack>
                 </layout_panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_place.xml b/linden/indra/newview/skins/default/xui/pt/panel_place.xml
index 7a5fd99..40ceca2 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_place.xml
@@ -1,6 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Place" title="Lugar">
-        <button label="Teleportar" name="teleport_btn" />
-        <button label="Mostrar no mapa" name="map_btn" />
-        <button label="Ofertas..." name="auction_btn" />
+        <text name="name_label">
+                Nome:
+        </text>
+        <text name="description_label">
+                Descrição:
+        </text>
+        <text name="information_label">
+                Informação:
+        </text>
+        <text name="location_label">
+                Localidade:
+        </text>
+        <button label="Teleportar" name="teleport_btn"/>
+        <button label="Mostrar no mapa" name="map_btn"/>
+        <button label="Ofertas..." name="auction_btn"/>
+        <string name="traffic_text">
+                Tráfego: [TRAFFIC]
+        </string>
+        <string name="area_text">
+                �rea: [AREA] m2.
+        </string>
+        <string name="forsale_text">
+                À venda por L$ [PRICE]
+        </string>
+        <string name="auction_text">
+                ID do leilão [ID].
+        </string>
+        <string name="server_update_text">
+                Informação do local indisponível sem a atualização do servidor.
+        </string>
+        <string name="server_error_text">
+                A informação sobre esta localidade está indisponível no momento, por favor tente novamente mais tarde.
+        </string>
+        <string name="server_forbidden_text">
+                Informações sobre esta localidade estão indisponíveis devido a restrições de acesso. Por favor, verifique suas permissões com o dono do terreno.
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml b/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
index eebdd74..217b322 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
@@ -1,6 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="Place" title="Lugar">
-        <button label="Tele-transportar" name="teleport_btn" />
-        <button label="Mostrar no mapa" name="map_btn" />
-        <button label="Ofertas..." name="auction_btn" />
+        <text name="name_label">
+                Nome:
+        </text>
+        <text name="description_label">
+                Descrição:
+        </text>
+        <text name="information_label">
+                Informações:
+        </text>
+        <text name="location_label">
+                Localidade:
+        </text>
+        <button label="Tele-transportar" name="teleport_btn"/>
+        <button label="Mostrar no mapa" name="map_btn"/>
+        <button label="Ofertas..." name="auction_btn"/>
+        <string name="traffic_text">
+                Tráfego: [TRAFFIC]
+        </string>
+        <string name="area_text">
+                �rea: [AREA] m2
+        </string>
+        <string name="forsale_text">
+                À venda por L$ [PRICE]
+        </string>
+        <string name="auction_text">
+                ID do Leilão [ID].
+        </string>
+        <string name="server_update_text">
+                Informação do local indisponível sem a atualização do servidor.
+        </string>
+        <string name="server_error_text">
+                Informações sobre esta localidade estão indisponíveis no momento, por favor tente novamente mais tarde.
+        </string>
+        <string name="server_forbidden_text">
+                Informações sobre esta localidade estão indisponíveis. Por favor, verifique suas permissões com o dono do terreno.
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
index 1ec9e30..8494e98 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
@@ -1,53 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="�udio &amp; Vídeo" name="Media panel">
-        <text type="string" length="1" name="muting_text">
-                Silenciar:
-        </text>
-        <check_box label="Silenciar �udio" name="disable audio" />
-        <check_box label="Silenciar �udio Quando Minimizar Janela" name="mute_when_minimized" />
-        <text type="string" length="1" name="streaming_text">
-                Streaming:
-        </text>
-        <check_box label="Executar Música em Streaming Quando Disponível" name="streaming_music" />
-        <check_box label="Executar Vídeo em Streaming Quando Disponível" name="streaming_video" />
-        <text type="string" length="1" name="system_volume_text">
-                Efeitos Sonoros:
-        </text>
-        <text type="string" length="1" name="wind_volume_text">
-                Volume do Vento:
-        </text>
-        <text type="string" length="1" name="footsteps_volume_text">
-                Volume dos Passos:
-        </text>
-        <text type="string" length="1" name="ui_volume_text">
-                Volume de interface:
-        </text>
-        <spinner label="Alerta de L$" name="L$ Change Threshold" />
-        <spinner label="Alerta de Saúde" name="Health Change Threshold" />
-        <text type="string" length="1" name="doppler_effect_text">
-                Efeito Doppler:
-        </text>
-        <text type="string" length="1" name="distance_factor_text">
-                Fator Distância:
-        </text>
-        <text type="string" length="1" name="rolloff_factor_text">
-                Fator Perda:
-        </text>
-        <text type="string" length="1" name="default_upload_bitrate_text">
-                Bitrate para Upload:
-        </text>
-        <radio_group name="bitrate">
-                <radio_item type="string" length="1" name="32kbps">
-                        32 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="64kbps">
-                        64 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="96kbps">
-                        96 kbps
-                </radio_item>
-                <radio_item type="string" length="1" name="128kbps">
-                        128 kbps
-                </radio_item>
-        </radio_group>
+        <text length="1" name="muting_text" type="string">
+                Volume:
+        </text>
+        <text name="streaming_prefs_text">
+                Preferências de &#10;Streaming:
+        </text>
+        <text name="audio_prefs_text">
+                Preferências de �udio:
+        </text>
+        <panel label="Volume" name="Volume Panel"/>
+        <check_box label="Tocar música em streaming quando disponível (usa mais banda)" name="streaming_music"/>
+        <check_box label="Tocar corrente de Media quando disponível (usa mais banda)" name="streaming_video"/>
+        <check_box label="Tocar mídia automaticamente" name="auto_streaming_video"/>
+        <check_box label="Silenciar �udio quando minimizar janela" name="mute_when_minimized"/>
+        <slider label="Efeito Doppler" name="Doppler Effect"/>
+        <slider label="Fator Distância" name="Distance Factor"/>
+        <slider label="Fator Rolloff" name="Rolloff Factor"/>
+        <spinner label="Alerta de L$" name="L$ Change Threshold"/>
+        <spinner label="Alerta de Saúde" name="Health Change Threshold"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 48e82b6..2bb8a82 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,56 +1,58 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-        <text type="string" length="1" name="text_box">
-                Tamanho da Fonte do Chat:
+        <text length="1" name="text_box" type="string">
+                Tamanho da Fonte &#10;do Chat:
         </text>
-        <radio_group name="chat font size">
-                <radio_item type="string" length="1" name="radio">
+        <radio_group name="chat_font_size">
+                <radio_item name="radio">
                         Pequeno
                 </radio_item>
-                <radio_item type="string" length="1" name="radio2">
+                <radio_item name="radio2">
                         Médio
                 </radio_item>
-                <radio_item type="string" length="1" name="radio3">
+                <radio_item name="radio3">
                         Grande
                 </radio_item>
         </radio_group>
-        <text type="string" length="1" name="text_box2">
+        <text length="1" name="text_box2" type="string">
                 Cor do Chat:
         </text>
-        <color_swatch label="Sistema" name="system" />
-        <color_swatch label="Usuários" name="users" />
-        <color_swatch label="Objetos" name="objects" />
-        <color_swatch label="Bubble" name="background" />
-        <color_swatch label="URLs" name="links" />
-        <text type="string" length="1" name="text_box3">
+        <color_swatch label="Você" name="user"/>
+        <color_swatch label="Outros" name="agent"/>
+        <color_swatch label="MI" name="im"/>
+        <color_swatch label="Sistema" name="system"/>
+        <color_swatch label="Erros" name="script_error"/>
+        <color_swatch label="Objetos" name="objects"/>
+        <color_swatch label="Dono" name="owner"/>
+        <color_swatch label="Bubble" name="background"/>
+        <color_swatch label="URLs" name="links"/>
+        <text length="1" name="text_box8" type="string">
+                Erros de Script:
+        </text>
+        <check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
+        <text length="1" name="text_box3" type="string">
                 Console do Chat:
         </text>
-        <spinner label="Ocultar Chat depois" name="fade_chat_time" />
-        <text type="string" length="1" name="text_box4">
+        <spinner label="Ocultar Chat depois" name="fade_chat_time" label_width="112" width="162"/>
+        <text length="1" name="text_box4" type="string" left="310">
                 (segundos)
         </text>
-        <text type="string" length="1" name="text_box5">
+        <spinner left="373" name="max_chat_count"/>
+        <text length="1" name="text_box5" type="string" left="435" width="94">
                 (# linhas)
         </text>
-        <slider label="Opacidade" name="console_opacity" />
-        <text type="string" length="1" name="text_box6">
+        <slider label="Opacidade" name="console_opacity"/>
+        <check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
+        <text length="1" name="text_box6" type="string">
                 Opções do Chat:
         </text>
-        <check_box label="Usar largura da tela cheia no Chat (depois do reinício)"
-             name="chat_full_width_check" />
-        <check_box label="Fechar Chat depois de tocar voltar" name="close_chat_on_return_check" />
-        <check_box label="Teclas de Setas movem o avatar durante o chat"
-             name="arrow_keys_move_avatar_check" />
-        <check_box label="Mostrar data e hora no chat" name="show_timestamps_check" />
-        <text type="string" length="1" name="text_box7">
+        <check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
+        <check_box label="Teclas de Setas movem o avatar durante o chat" name="arrow_keys_move_avatar_check"/>
+        <check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
+        <check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+        <text length="1" name="text_box7" type="string">
                 Bubble Chat:
         </text>
-        <check_box label="Mostrar bolhas do chat" name="bubble_text_chat" />
-        <slider label="Opacidade" name="bubble_chat_opacity" />
-        <text type="string" length="1" name="text_box8">
-                Erros de Script:
-        </text>
-        <check_box label="Mostrar Erros de Script e avisos como chat comum"
-             name="script_errors_as_chat" />
-        <color_swatch label="Cor" name="script_error" />
+        <check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
+        <slider label="Opacidade" name="bubble_chat_opacity"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 07117dd..8eccaf3 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -1,67 +1,105 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Geral" name="general_panel">
-        <combo_box name="location_combobox">
-                <combo_item name="MyHome">
+        <radio_group name="default_start_location">
+                <radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
                         Minha Casa
-                </combo_item>
-        </combo_box>
-        <check_box label="Mostrar Posição Inicial na Tela de Login"
-             name="show_location_checkbox" />
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        Nunca
                 </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        Temporariamente
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        Sempre
+                <radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
+                        Minha Última Localidade
                 </radio_item>
         </radio_group>
-        <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox" />
-        <check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox" />
-        <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox" />
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="Clique para abrir po seletor de cores" />
-        <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner" />
-        <check_box label="Avisar meus amigos que estou online"
-             name="friends_online_notify_checkbox" />
-        <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox" />
-        <check_box label="Avisar quando receber ou gastar Linden dollars (L$)"
-             name="notify_money_change_checkbox" />
-        <check_box label="Usar a paleta de cores padrão do sistema"
-             name="use_system_color_picker_checkbox"
-             tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life." />
-        <text type="string" length="1" name="start_location_textbox">
+        <check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
+        <combo_box name="fade_out_combobox" width="166">
+                <combo_item name="Never">
+                        Nunca
+                </combo_item>
+                <combo_item name="Show Temporarily">
+                        Mostrar Temporariamente
+                </combo_item>
+                <combo_item name="Always">
+                        Sempre
+                </combo_item>
+        </combo_box>
+        <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
+        <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
+        <text name="group_titles_textbox">
+                Títulos dos Grupos:
+        </text>
+        <check_box label="Esconder Todos os Títulos de Grupos" name="show_all_title_checkbox"/>
+        <check_box label="Ocultar meu Título no Grupo" name="show_my_title_checkbox"/>
+        <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir po seletor de cores"/>
+        <text name="UI Size:">
+                Tamanho da UI:
+        </text>
+        <check_box label="Usar escala independente da resolução" name="ui_auto_scale"/>
+        <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
+        <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox"/>
+        <check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/>
+        <check_box label="Usar a paleta de cores padrão do sistema" name="use_system_color_picker_checkbox" tool_tip="Usar a palheta de cores padrão do sistema ao invés de uma feita dentro de Second Life."/>
+        <check_box label="Mostrar o painel de busca na barra sobreposta" name="show_search_panel" tool_tip="Mostrar o painel de busca embutido."/>
+        <text length="1" name="start_location_textbox" type="string">
                 Posição Inicial:
         </text>
-        <text type="string" length="1" name="show_names_textbox">
+        <text length="1" name="show_names_textbox" type="string">
                 Mostrar Nomes:
         </text>
-        <text type="string" length="1" name="effects_color_textbox">
+        <text length="1" name="effects_color_textbox" type="string">
                 Cores para Meus Efeitos:
         </text>
-        <text type="string" length="1" name="seconds_textbox">
+        <text length="1" name="seconds_textbox" type="string">
                 segundos
         </text>
-        <text type="string" length="1" name="crash_report_textbox">
+        <text length="1" name="crash_report_textbox" type="string">
                 Relatórios de Falhas:
         </text>
-        <text type="string" length="1" name="language_textbox2">
+        <text name="language_textbox">
+                Linguagem:
+        </text>
+        <text length="1" name="language_textbox2" type="string" left_delta="313">
                 (Precisa de reinício para efetivar)
         </text>
-        <text name="region_name_prompt">
+        <string name="region_name_prompt">
                 Digite o nome da Região
-        </text>
-        <combo_box name="crash_behavior_combobox">
-                <combo_item type="string" length="1" name="Askbeforesending">
+        </string>
+        <combo_box name="crash_behavior_combobox" width="166">
+                <combo_item length="1" name="Askbeforesending" type="string">
                         Perguntar antes de enviar
                 </combo_item>
-                <combo_item type="string" length="1" name="Alwayssend">
+                <combo_item length="1" name="Alwayssend" type="string">
                         Sempre enviar
                 </combo_item>
-                <combo_item type="string" length="1" name="Neversend">
+                <combo_item length="1" name="Neversend" type="string">
                         Nunca Enviar
                 </combo_item>
         </combo_box>
+        <combo_box name="language_combobox" width="166">
+                <combo_item name="System Default Language">
+                        Padrão do Sistema
+                </combo_item>
+                <combo_item name="English">
+                        English (Inglês)
+                </combo_item>
+                <combo_item name="Deutsch(German)">
+                        Deutsch (Alemão) - Beta
+                </combo_item>
+                <combo_item name="Spanish">
+                        Español (Espanhol) - Beta
+                </combo_item>
+                <combo_item name="French">
+                        Français (Francês) - Beta
+                </combo_item>
+                <combo_item name="Portugese">
+                        Português - Beta
+                </combo_item>
+                <combo_item name="Chinese">
+                        中文 (简体) (Chinês) - Beta
+                </combo_item>
+                <combo_item name="(Japanese)">
+                        日本語 (Japonês) - Beta
+                </combo_item>
+                <combo_item name="(Korean)">
+                        한국어 (Coreano) - Beta
+                </combo_item>
+        </combo_box>
+        <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 265a70f..eca25a9 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,40 +1,176 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
-        <check_box label="Executar em Janela" name="windowed mode" />
-        <text type="string" length="1" name="Fullscreen Aspect Ratio:">
-                Aparência de Tela Cheia:
+        <button label="?" name="GraphicsPreferencesHelpButton"/>
+        <check_box label="Execute Second Life emu ma janela" name="windowed mode"/>
+        <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
+                Caso contrário, visualizador irá exibir em tela inteira quando fizer o acesso.
+        </text_editor>
+        <text name="WindowSizeLabel">
+                Tamanho da Janela:
         </text>
-        <text type="string" length="1" name="(width / height)">
-                (largura / altura)
+        <combo_box name="windowsize combo">
+                <combo_item name="640x480">
+                        640x480
+                </combo_item>
+                <combo_item name="800x600">
+                        800x600
+                </combo_item>
+                <combo_item name="720x480">
+                        720x480 (NTSC)
+                </combo_item>
+                <combo_item name="768x576">
+                        768x576 (PAL)
+                </combo_item>
+                <combo_item name="1024x768">
+                        1024x768
+                </combo_item>
+        </combo_box>
+        <text name="DisplayResLabel">
+                Resolução de Display:
         </text>
-        <combo_box name="aspect_ratio">
-                <combo_item type="string" length="1" name="4:3(StandardCRT)">
+        <text name="AspectRatioLabel1" tool_tip="largura / altura">
+                Aspecto da tela:
+        </text>
+        <combo_box name="aspect_ratio" tool_tip="largura / altura">
+                <combo_item length="1" name="4:3(StandardCRT)" type="string">
                         4:3 (CRT Padrão)
                 </combo_item>
-                <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+                <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
                         5:4 (1280x1024 LCD)
                 </combo_item>
-                <combo_item type="string" length="1" name="16:9(Widescreen)">
+                <combo_item name="8:5(Widescreen)">
+                        8:5 (tela ampla)
+                </combo_item>
+                <combo_item length="1" name="16:9(Widescreen)" type="string">
                         16:9 (Widescreen)
                 </combo_item>
         </combo_box>
-        <check_box label="Auto detectar" name="aspect_auto_detect" />
-        <text type="string" length="1" name="UI Size:">
-                Tamanho da interface:
+        <check_box label="Auto-detectar ratio" name="aspect_auto_detect"/>
+        <text name="HigherText">
+                Qualidade e
         </text>
-        <text type="string" length="1" name="(meters, lower is faster)">
-                (metros, menor é mais rápido)
+        <text name="QualityText">
+                Performance:
         </text>
-        <text type="string" length="1" name="text2">
-                Mostrar Opções:
+        <text name="FasterText">
+                Mais &#10;rápido
         </text>
-        <check_box label="Usar resolução de escala independente" name="ui_auto_scale" />
-        <spinner label="Desenhar Distância:" name="draw_distance" />
-        <check_box label="Mostrar Avatar em Mouselook" name="avfp" />
-        <text name="resolution_format">
-                [RES_X] x [RES_Y]
+        <text name="ShadersPrefText">
+                Baixo
         </text>
-        <text name="aspect_ratio_text">
-                [NUM]:[DEN]
+        <text name="ShadersPrefText2">
+                Mid
+        </text>
+        <text name="ShadersPrefText3">
+                Alto
+        </text>
+        <text name="ShadersPrefText4">
+                Ultra
+        </text>
+        <text name="HigherText2">
+                Mais alto
+        </text>
+        <text name="QualityText2">
+                Qualidade
+        </text>
+        <check_box label="Padrão" name="CustomSettings" left="395" />
+        <text name="ShadersText">
+                Sombreamentos:
+        </text>
+        <check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
+        <check_box label="Sombreamento básico" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
+        <check_box label="Sombreamento Atmosférico" name="WindLightUseAtmosShaders"/>
+        <check_box label="Reflexos de �gua" name="Reflections"/>
+        <text name="ReflectionDetailText">
+                Detalhes de Reflexão:
         </text>
+        <radio_group name="ReflectionDetailRadio">
+                <radio_item name="0">
+                        Terreno e �rvores
+                </radio_item>
+                <radio_item name="1">
+                        Todos os objetos estáticos
+                </radio_item>
+                <radio_item name="2">
+                        Todos os avatares e Objetos
+                </radio_item>
+                <radio_item name="3">
+                        Tudo
+                </radio_item>
+        </radio_group>
+        <text name="AvatarRenderingText">
+                Renderização de Avatar:
+        </text>
+        <check_box label="Avatar Impostors" name="AvatarImpostors"/>
+        <check_box label="Hardware Skinning" name="AvatarVertexProgram"/>
+        <check_box label="Vestimenta do Avatar" name="AvatarCloth"/>
+        <text name="DrawDistanceMeterText1">
+                m
+        </text>
+        <text name="DrawDistanceMeterText2">
+                m
+        </text>
+        <slider label="Medir Distancia:" name="DrawDistance" width="255" label_width="146" />
+        <slider label="Contador máx de partículas:" name="MaxParticleCount" width="262" label_width="146" />
+        <slider label="Qualidade de Post Process:" name="RenderPostProcess" width="223" label_width="146" />
+        <text name="MeshDetailText">
+                Detalhes de Malha:
+        </text>
+        <slider label="Objetos:" name="ObjectMeshDetail"/>
+        <slider label="Primitivos Flexiveis:" name="FlexibleMeshDetail"/>
+        <slider label="�rvores:" name="TreeMeshDetail"/>
+        <slider label="Avatares:" name="AvatarMeshDetail"/>
+        <slider label="Terreno:" name="TerrainMeshDetail"/>
+        <slider label="Céu:" name="SkyMeshDetail"/>
+        <text name="PostProcessText">
+                Baixo
+        </text>
+        <text name="ObjectMeshDetailText">
+                Baixo
+        </text>
+        <text name="FlexibleMeshDetailText">
+                Baixo
+        </text>
+        <text name="TreeMeshDetailText">
+                Baixo
+        </text>
+        <text name="AvatarMeshDetailText">
+                Baixo
+        </text>
+        <text name="TerrainMeshDetailText">
+                Baixo
+        </text>
+        <text name="SkyMeshDetailText">
+                Baixo
+        </text>
+        <text name="LightingDetailText">
+                Detalhes de Iluminação:
+        </text>
+        <radio_group name="LightingDetailRadio">
+                <radio_item name="SunMoon">
+                        Sol e Lua apenas
+                </radio_item>
+                <radio_item name="LocalLights">
+                        Luzes locais nas proximidades
+                </radio_item>
+        </radio_group>
+        <text name="TerrainDetailText">
+                Detalhes do Terreno:
+        </text>
+        <radio_group name="TerrainDetailRadio" left_delta="45" width="276">
+                <radio_item name="0">
+                        Baixo
+                </radio_item>
+                <radio_item name="2">
+                        Alto
+                </radio_item>
+        </radio_group>
+        <button label="Configurações Recomendadas" name="Defaults"/>
+        <button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
+        <string name="resolution_format">
+                [RES_X] x [RES_Y]
+        </string>
+        <string name="aspect_ratio_text">
+                [NUM]:[DEN]
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
index 7da6bf5..5456544 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
@@ -1,24 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Comunicação" name="im">
-        <text type="string" length="1" name="text_box">
-                Situação do Perfil On-Line:
+        <text length="1" name="text_box" type="string">
+                Minha situação online:
         </text>
-        <check_box label="Fazer com que meus amigos saibam que estou on-line"
-             name="online_visibility" />
-        <text type="string" length="1" name="text_box2">
+        <check_box label="Apenas meus Amigos e Grupos podem me ver online" name="online_visibility"/>
+        <text length="1" name="text_box2" type="string">
                 Opções MI:
         </text>
-        <text name="log_in_to_change">
+        <string name="log_in_to_change">
                 Logar para Alterar
-        </text>
-        <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email" />
-        <check_box label="Incluir MI no Histórico do Chat" name="include_im_in_chat_history" />
-        <check_box label="Mostrar data e hora na MI" name="show_timestamps_check" />
-        <check_box label="Registrar Mensagens Instantâneas" name="log_instant_messages" />
-        <check_box label="Registrar Chat" name="log_chat" />
-        <check_box label="Mostrar final da última conversa MI" name="log_show_history" />
-        <button label="Alt. Caminho" label_selected="Alt. Caminho" name="log_path_button" />
-        <text type="string" length="1" name="text_box3">
+        </string>
+        <check_box label="Enviar MI para o e-mail ([EMAIL])" name="send_im_to_email"/>
+        <check_box label="Incluir MIs no histórico de conversas" name="include_im_in_chat_history"/>
+        <check_box label="Mostrar data e hora na MI" name="show_timestamps_check"/>
+        <check_box label="Mostrar notificação de Amigo online" name="friends_online_notify_checkbox"/>
+        <text length="1" name="text_box3" type="string" width="134">
                 Resp. no Modo Ocupado:
         </text>
+        <text name="text_box4">
+                Opções de Registro:
+        </text>
+        <check_box label="Salvar um registro das MIs em meu computador" name="log_instant_messages"/>
+        <check_box label="Mostrar a hora nas MIs" name="log_instant_messages_timestamp"/>
+        <check_box label="Mostrar o final da última conversa em MI" name="log_show_history"/>
+        <check_box label="Salvar um registro da Conversa local em meu computador" name="log_chat"/>
+        <check_box label="Mostrar a hora no registro da Conversa local" name="log_chat_timestamp"/>
+        <check_box label="Mostrar MIs recebidas no registro de Conversa local" name="log_chat_IM"/>
+        <check_box label="Incluir data e hora" name="log_date_timestamp"/>
+        <button label="Alt. Caminho" label_selected="Alt. Caminho" name="log_path_button"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
index 177dd12..f10f33c 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
@@ -1,26 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Câmera" name="Input panel">
-        <text type="string" length="1" name=" Mouselook Options:">
+        <text length="1" name=" Mouselook Options:" type="string">
                 Opções de Mouselook:
         </text>
-        <text type="string" length="1" name=" Mouse Sensitivity:">
+        <text length="1" name=" Mouse Sensitivity:" type="string">
                 Sensibilidade do Mouse:
         </text>
-        <check_box label="Inverter Mouse" name="invert mouse" />
-        <text type="string" length="1" name=" Auto Fly Options:">
-                Opções de Vôo Automático:
+        <check_box label="Inverter o  Mouse" name="invert_mouse"/>
+        <text length="1" name=" Auto Fly Options:" type="string">
+                Vôo Automático:
         </text>
-        <check_box label="Voar/Pousar segurando Para Cima/Para Baixo" name="automatic fly" />
-        <text type="string" length="1" name=" Camera Options:">
+        <check_box label="Voar/Aterrissar pressionando teclar para cima/baixo" name="automatic_fly"/>
+        <text length="1" name=" Camera Options:" type="string">
                 Opções de Câmera:
         </text>
-        <text type="string" length="1" name="Camera Springiness:">
-                Elasticidade da Câmera:
+        <text name="Camera Follow Distance:" width="178">
+                Distância de Acompanhamento da Camêra:
         </text>
-        <check_box label="Movimento Automático da Câmera de Edição"
-             name="edit camera movement"
-             tool_tip="Usar posicionamento automático de câmera quando estiver entrando ou saindo do modo de edição" />
-        <check_box label="Movimento Automático da Câmera de Aparência"
-             name="appearance camera movement"
-             tool_tip="Usar posicionamento automático da câmera enquanto no modo de edição" />
+        <slider left="325" name="dynamic_camera_strength" />
+        <text name="Camera Transition Time:" width="178">
+                Tempo de transição da câmera :
+        </text>
+        <slider left="325" name="zoom_time" />
+        <slider left="325" name="camera_position_smoothing" />
+        <check_box label="Movimento automático da câmera de edição" name="edit_camera_movement" tool_tip="Usar posicionamento automático da câmera quando entrar e sair do modo de edição"/>
+        <check_box label="Movimento Automático da Câmera na edição de aparência" name="appearance_camera_movement" tool_tip="Usar posicionamento automático da câmera em  modo de edição"/>
+        <text name="text2">
+                Opções de Exibição &#10;do Avatar:
+        </text>
+        <check_box label="Mostra o avatar em primeira pessoa" name="first_person_avatar_visible"/>
+        <text name="text5">
+                Opções de Joystick:
+        </text>
+        <button label="Configuração do Joystick" name="joystick_setup_button" width="165"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
index a3bc97e..a49bbc6 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
@@ -1,20 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Rede" name="network">
-        <text type="string" length="1" name="text_box">
+        <text length="1" name="text_box" type="string">
                 Banda Máxima:
         </text>
-        <text type="string" length="1" name="text_box2">
+        <text length="1" name="text_box2" type="string">
                 kbps(kilobits por segundo)
         </text>
-        <text type="string" length="1" name="cache_size_label_l">
-                Cache em Disco:
+        <text length="1" name="cache_size_label_l" type="string">
+                Tamanho do Cachê de Disco:
         </text>
-        <button label="Limpar Cache" name="clear_cache" />
-        <text type="string" length="1" name="cache_location_label">
+        <text name="text_box5">
+                MB
+        </text>
+        <button label="Limpar Cache" name="clear_cache"/>
+        <text length="1" name="cache_location_label" type="string">
                 Local do Cache em Disco:
         </text>
-        <button label="Ajusta" label_selected="Ajusta" name="set_cache" />
-        <button label="Inicia" label_selected="Inicia" name="reset_cache" />
-        <check_box label="Conexão de porta personalizada" name="connection_port_enabled" />
-        <spinner label="          Porta:" name="connection_port" />
+        <button label="Ajusta" label_selected="Ajusta" name="set_cache"/>
+        <button label="Inicia" label_selected="Inicia" name="reset_cache"/>
+        <check_box label="Conexão de porta personalizada" name="connection_port_enabled"/>
+        <spinner label="          Porta:" name="connection_port"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
index 1aec4ec..280096d 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Popups" name="popups">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Popups" name="popups" title="Popups">
         <text name="dont_show_label">
-                Não mostrar popups:
+                Não mostrar estas popups:
         </text>
-        <button label="Habilitar este popup" label_selected="Habilitar este popup"
-             name="enable_popup" />
-        <text type="string" length="1" name="show_label">
-                Mostrar popups:
+        <button label="Habilitar este popup" label_selected="Habilitar este popup" name="enable_popup"/>
+        <button width="200" label="Habilitar todas as popups..." label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..." name="reset_dialogs_btn" tool_tip="Habilitar todas as popups opcionais e notificações de “primeiro uso�."/>
+        <text length="1" name="show_label" type="string">
+                Mostrar estas popups:
         </text>
-        <check_box label="Aceitar automaticamente" name="accept_new_inventory" />
-        <check_box label="Visualizar após aceitar" name="show_new_inventory" />
-        <button label="Reiniciar Dialogos que serão mostrados na próxima vez..."
-             label_selected="Reiniciar Dialogos que serão mostrados na próxima vez..."
-             name="reset_dialogs_btn" />
+        <button width="200" label="Desabilitar todas estas popups..." name="skip_dialogs_btn" tool_tip="Desabilitar todas as popups opcionais e notificações de “primeiro uso�."/>
+        <text name="text_box2">
+                Ofertas de notecards, texturas e landmarks:
+        </text>
+        <check_box label="Aceitar automaticamente" name="accept_new_inventory"/>
+        <check_box label="Visualizar após aceitar" name="show_new_inventory"/>
+        <check_box label="Mostrar automaticamente objetos aceitos recentemente no inventário." name="show_in_inventory"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
new file mode 100644
index 0000000..6564953
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_skins.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel label="Peles" name="Skins panel">

+        <text name="muting_text">

+                Selecione uma pele (necessita reiniciar):

+        </text>

+        <radio_group name="skin_selection">

+                <radio_item name="default">

+                        Padrão

+                </radio_item>

+                <radio_item name="silver">

+                        Prata

+                </radio_item>

+        </radio_group>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
new file mode 100644
index 0000000..9a38bff
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel label="Voice Chat" name="chat">

+        <button label="Configurações do dispositivo" name="device_settings_btn" width="180" />

+        <text_editor name="device_settings_text" height="48" bottom_delta="-45">

+                NOTA: Executar o Configurações do dispositivo vai desligá-lo temporariamente do Bate- papo de voz, e as mudanças que você fizer serão imediatamente aplicadas.

+        </text_editor>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
index 7da48d5..cd626c8 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
@@ -1,12 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Web" name="web">
-        <text type="string" length="1" name="cache_size_label_l">
+        <radio_group name="use_external_browser">
+                <radio_item name="external" tool_tip="Use o sistema navegador web padrão sistema para ajuda, links, etc. Não é recomendável se estiver sendo executado em tela cheia.">
+                        Use navegador externo (Firefox, Safari, Internet Explorer)
+                </radio_item>
+                <radio_item name="internal" tool_tip="Use o navegador web embutido para ajudar, links, etc Este navegador abre uma nova janela dentro do Second Life.">
+                        Use navegador built-in
+                </radio_item>
+        </radio_group>
+        <text length="1" name="cache_size_label_l" type="string">
                 Cache do Browser:
         </text>
-        <button label="Limpar Agora" name="clear_cache" />
-        <text type="string" length="1" name="cookie_label">
+        <button label="Limpar Agora" name="clear_cache" width="105" />
+        <text length="1" name="cookie_label" type="string">
                 Cookies:
         </text>
-        <check_box label="Aceitar cookies de websites" name="cookies_enabled" />
-        <button label="Limpar Agora" name="clear_cookies" />
+        <check_box label="Aceitar cookies de websites" name="cookies_enabled"/>
+        <text name="proxy_label">
+                Web Proxy:
+        </text>
+        <check_box label="Permitir Web Proxy" name="web_proxy_enabled"/>
+        <text name="proxy_text_label">
+                Endereço:
+        </text>
+        <line_editor name="web_proxy_editor" tool_tip="Nome ou endereço de IP do proxy que você gostaria de usar" left="237" />
+        <spinner label="Número da porta:" name="web_proxy_port" label_width="95" width="170"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index fee0329..7aa408b 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Corretagem" name="Covenant">
-        <text name="covenant_help_text">
-                As mudanças à informação do convénio mostrarão em todos os pacotes na propriedade.
+        <text name="covenant_help_text" bottom="-25">
+                As mudanças à informação do convénio mostrarão em todos os pacotes
+na propriedade.
         </text>
-        <text name="region_name_lbl">
+        <text name="region_name_lbl" bottom_delta="-31">
                 Região:
         </text>
         <text name="region_name_text">
                 (desconhecido)
         </text>
-        <text name="estate_name_lbl">
+        <text name="estate_name_lbl" bottom_delta="-19">
                 Propriedade:
         </text>
         <text name="estate_name_text">
                 (desconhecido)
         </text>
         <text name="covenent_instructions">
-                Arraste o cartao de um Corretor 
-para este estado.
+                Arraste e solte um notecard para alterar o Contrato para este Terreno.
         </text>
         <button label="?" name="covenant_help" />
         <button label="Resetar" name="reset_covenant" />
-        <text name="estate_owner_lbl">
+        <text name="estate_owner_lbl" bottom_delta="-19">
                 Proprietário final:
         </text>
         <text name="estate_owner_text">
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index 32315e1..eb0f83d 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Debug" name="Debug">
         <text name="region_text_lbl">
                 Região:
@@ -6,29 +6,35 @@
         <text name="region_text">
                 nenhum
         </text>
-        <check_box label="Desabilitar Scripts" name="disable_scripts_check"
-             tool_tip="Desabilitar todos scripts nesta região" />
-        <button label="?" name="disable_scripts_help" />
-        <check_box label="Desabilitar colisões" name="disable_collisions_check"
-             tool_tip="Desabilitar colisões dos avateres nessa região" />
-        <button label="?" name="disable_collisions_help" />
-        <check_box label="Desabilitar física" name="disable_physics_check"
-             tool_tip="Desabilitar fisíca nessa região" />
-        <button label="?" name="disable_physics_help" />
-        <button label="Aplicar" name="apply_btn" />
-        <button label="Escolher o avatar..." name="choose_avatar_btn" />
-        <button label="Retornar objetos com scripts no terreno de outros"
-             name="return_scripted_other_land_btn" />
-        <button label="Retornar todos os objetos com script" name="return_scripted_all_btn" />
-        <button label="Ranking-Colisões" name="top_colliders_btn"
-             tool_tip="Lista dos objetos que experimentam as colisões " />
-        <button label="?" name="top_colliders_help" />
-        <button label="Ranking-Scripts" name="top_scripts_btn"
-             tool_tip="List of objects spending the most time running scripts" />
-        <button label="?" name="top_scripts_help" />
-        <button label="Restart Region" name="restart_btn"
-             tool_tip="Inicio da contagem regressiva em 2 minutos" />
-        <button label="?" name="restart_help" />
-        <button label="Cancelar Reinicio" name="cancel_restart_btn"
-             tool_tip="Cancelar o reinicio da região" />
+        <check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos scripts nesta região"/>
+        <button label="?" name="disable_scripts_help"/>
+        <check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões dos avateres nessa região"/>
+        <button label="?" name="disable_collisions_help"/>
+        <check_box label="Desabilitar física" name="disable_physics_check" tool_tip="Desabilitar fisíca nessa região"/>
+        <button label="?" name="disable_physics_help"/>
+        <button label="Aplicar" name="apply_btn"/>
+        <text name="objret_text_lbl">
+                Retornar objeto
+        </text>
+        <text name="resident_text_lbl">
+                Residente:
+        </text>
+        <line_editor name="target_avatar_name">
+                (nenhum)
+        </line_editor>
+        <button label="Escolher..." name="choose_avatar_btn"/>
+        <text name="options_text_lbl">
+                Opções:
+        </text>
+        <check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/>
+        <check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam em uma terra pertencente a alguém"/>
+        <check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
+        <button label="Retornar" name="return_btn"/>
+        <button label="Ranking-Colisões" name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as colisões "/>
+        <button label="?" name="top_colliders_help"/>
+        <button label="Ranking-Scripts" name="top_scripts_btn" tool_tip="List of objects spending the most time running scripts"/>
+        <button label="?" name="top_scripts_help"/>
+        <button label="Restart Region" name="restart_btn" tool_tip="Inicio da contagem regressiva em 2 minutos"/>
+        <button label="?" name="restart_help"/>
+        <button label="Cancelar Reinicio" name="cancel_restart_btn" tool_tip="Cancelar o reinicio da região"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index f6423fe..d7b993f 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Estado" name="Estate">
         <text name="estate_help_text">
-                As mudanças aos ajustes nesta aba afetarão todas as regiões na propriedade.
+                Mudanças nas definições nesta guia irá afetar
+todas as regiões do Terreno.
         </text>
         <text name="estate_text">
                 Estado:
@@ -15,49 +16,54 @@
         <text name="estate_owner">
                 (nenhum)
         </text>
-        <text name="estate_manager_label">
-                Gerentes da propriedade:
+        <check_box label="Usar Tempo global " name="use_global_time_check"/>
+        <button label="?" name="use_global_time_help"/>
+        <check_box label="Sol fixo " name="fixed_sun_check"/>
+        <button label="?" name="fixed_sun_help"/>
+        <slider label="Fase " name="sun_hour_slider"/>
+        <check_box label="Permitir acesso público" name="externally_visible_check"/>
+        <button label="?" name="externally_visible_help"/>
+        <text name="Only Allow">
+                Acesso restrito a:
         </text>
-        <button label="?" name="estate_manager_help" />
-        <button label="Adicionar..." name="add_estate_manager_btn" />
-        <button label="Remover..." name="remove_estate_manager_btn" />
-        <check_box label="Usar Tempo global " name="use_global_time_check" />
-        <button label="?" name="use_global_time_help" />
-        <check_box label="Sol fixo " name="fixed_sun_check" />
-        <button label="?" name="fixed_sun_help" />
-        <slider label="Fase " name="sun_hour_slider" />
-        <check_box label="Acesso público " name="externally_visible_check" />
-        <button label="?" name="externally_visible_help" />
-        <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport" />
-        <button label="?" name="allow_direct_teleport_help" />
-        <text name="region_text_lbl">
-                Proibir acesso a:
-        </text>
-        <check_box label="Informações de não pagamento" name="deny_anonymous" />
-        <check_box label="Informações de pagamento" name="deny_identified" />
-        <check_box label="Informações de pagtos realizados" name="deny_transacted" />
+        <check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+        <check_box label="Idade verificada -adultos" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
+        <check_box label="Permitir conversa de voz" name="voice_chat_check"/>
+        <button label="?" name="voice_chat_help"/>
+        <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
+        <button label="?" name="allow_direct_teleport_help"/>
         <text name="abuse_email_text">
-                E-mail do abuso:
+                Endereço de email de Abuso:
+        </text>
+        <string name="email_unsupported">
+                Funcionalidade não suportada
+        </string>
+        <button label="?" name="abuse_email_address_help"/>
+        <button label="Aplicar" name="apply_btn"/>
+        <button label="Descartar Estado" name="kick_user_from_estate_btn"/>
+        <button label="Enviar mensagem ao Estado " name="message_estate_btn"/>
+        <text name="estate_manager_label">
+                Gerentes da propriedade:
         </text>
-        <button label="Aplicar" name="apply_btn" />
+        <button label="?" name="estate_manager_help"/>
+        <button label="Remover..." name="remove_estate_manager_btn"/>
+        <button label="Adicionar..." name="add_estate_manager_btn"/>
         <text name="allow_resident_label">
                 Residentes permitidos:
         </text>
-        <button label="?" name="allow_resident_help" />
-        <button label="Adicionar..." name="add_allowed_avatar_btn" />
-        <button label="Remover..." name="remove_allowed_avatar_btn" />
+        <button label="?" name="allow_resident_help"/>
+        <button label="Remover..." name="remove_allowed_avatar_btn"/>
+        <button label="Adicionar..." name="add_allowed_avatar_btn"/>
         <text name="allow_group_label">
-                Grupos reservados:
+                Grupos permitidos:
         </text>
-        <button label="?" name="allow_group_help" />
-        <button label="Adicionar..." name="add_allowed_group_btn" />
-        <button label="Remover..." name="remove_allowed_group_btn" />
+        <button label="?" name="allow_group_help"/>
+        <button label="Remover..." name="remove_allowed_group_btn"/>
+        <button label="Adicionar..." name="add_allowed_group_btn"/>
         <text name="ban_resident_label">
-                Residentes proibidos:
+                Residentes banidos:
         </text>
-        <button label="?" name="ban_resident_help" />
-        <button label="Adicionar..." name="add_banned_avatar_btn" />
-        <button label="Remover..." name="remove_banned_avatar_btn" />
-        <button label="Enviar mensagem ao Estado " name="message_estate_btn" />
-        <button label="Descartar Estado" name="kick_user_from_estate_btn" />
+        <button label="?" name="ban_resident_help"/>
+        <button label="Remover..." name="remove_banned_avatar_btn"/>
+        <button label="Adicionar..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml b/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
index 5c915b3..d70cb48 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Região" name="General">
         <text name="region_text_lbl">
                 Região:
@@ -6,23 +6,30 @@
         <text name="region_text">
                 desconhecido
         </text>
-        <check_box label="Bloquear Terraform" name="block_terraform_check" />
-        <button label="?" name="terraform_help" />
-        <check_box label="Bloquear Vôo" name="block_fly_check" />
-        <button label="?" name="fly_help" />
-        <check_box label="Permitir Dano" name="allow_damage_check" />
-        <button label="?" name="damage_help" />
-        <check_box label="Restringir Empurrar" name="restrict_pushobject" />
-        <button label="?" name="restrict_pushobject_help" />
-        <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check" />
-        <button label="?" name="land_resell_help" />
-        <check_box label="Permitir Compartilhamento/Divisão de Lotes"
-             name="allow_parcel_changes_check" />
-        <button label="?" name="parcel_changes_help" />
-        <spinner label="Agente Limite" name="agent_limit_spin" />
-        <button label="?" name="agent_limit_help" />
-        <spinner label="Objeto Bonus" name="object_bonus_spin" />
-        <button label="?" name="object_bonus_help" />
+        <text name="version_channel_text_lbl">
+                Versão:
+        </text>
+        <text name="version_channel_text">
+                desconhecido
+        </text>
+        <check_box label="Bloquear Terraform" name="block_terraform_check"/>
+        <button label="?" name="terraform_help"/>
+        <check_box label="Bloquear Vôo" name="block_fly_check"/>
+        <button label="?" name="fly_help"/>
+        <check_box label="Permitir Dano" name="allow_damage_check"/>
+        <button label="?" name="damage_help"/>
+        <check_box label="Restringir Empurrar" name="restrict_pushobject"/>
+        <button label="?" name="restrict_pushobject_help"/>
+        <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
+        <button label="?" name="land_resell_help"/>
+        <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
+        <button label="?" name="parcel_changes_help"/>
+        <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus terrenos nos resultados de busca"/>
+        <button label="?" name="parcel_search_help"/>
+        <spinner label="Agente Limite" name="agent_limit_spin"/>
+        <button label="?" name="agent_limit_help"/>
+        <spinner label="Objeto Bonus" name="object_bonus_spin"/>
+        <button label="?" name="object_bonus_help"/>
         <text label="Maturidade" name="access_text">
                 Maturidade:
         </text>
@@ -34,10 +41,10 @@
                         Adulto
                 </combo_item>
         </combo_box>
-        <button label="?" name="access_help" />
-        <button label="Aplicar" name="apply_btn" />
-        <button label="Teleportar um usuário para Casa..." name="kick_btn" />
-        <button label="Teleportar Todos os Usuários..." name="kick_all_btn" />
-        <button label="Enviar Mensagem para Região..." name="im_btn" />
-        <button label="Gerenciar Telehub..." name="manage_telehub_btn" />
+        <button label="?" name="access_help"/>
+        <button label="Aplicar" name="apply_btn"/>
+        <button label="Teleportar um usuário para Casa..." name="kick_btn"/>
+        <button label="Teleportar Todos os Usuários..." name="kick_all_btn"/>
+        <button label="Enviar Mensagem para Região..." name="im_btn"/>
+        <button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
new file mode 100644
index 0000000..1967362
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="active_speakers_panel">

+        <string name="moderator_label">

+                (Moderador)

+        </string>

+        <layout_stack name="panels">

+                <layout_panel name="moderation_mode_panel">

+                        <combo_box name="moderation_mode">

+                                <combo_item name="OpenVoice">

+                                        Voz ativada por padrão

+                                </combo_item>

+                                <combo_item name="ModeratedVoice">

+                                        Voz desligada por padrão

+                                </combo_item>

+                        </combo_box>

+                </layout_panel>

+                <layout_panel name="moderate_chat_panel">

+                        <scroll_list name="speakers_list">

+                                <column label="Nome" name="speaker_name"/>

+                        </scroll_list>

+                        <panel name="speaker_controls">

+                                <button label="" name="mute_btn" tool_tip="Emudecer a voz para este residente"/>

+                                <check_box label="Emudecer Texto" name="mute_text_btn"/>

+                        </panel>

+                </layout_panel>

+                <layout_panel name="moderator_controls">

+                        <text name="moderator_controls_label">

+                                Controles do Moderador:

+                        </text>

+                        <check_box name="moderator_allow_voice">

+                                Permitir conversa por voz

+                        </check_box>

+                        <check_box name="moderator_allow_text">

+                                Permitir conversa por texto

+                        </check_box>

+                </layout_panel>

+        </layout_stack>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 25e2a15..0fca748 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,32 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-        <text type="string" length="1" name="ParcelNameText"
-             tool_tip="Nome do pedaço de terra em que você esta. Clique para informações.">
+        <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você esta. Clique para informações." type="string">
                 Nome do pedaço de terra vai aqui.
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="Cotação de Compra">
+        <text length="1" name="BalanceText" tool_tip="Cotação de Compra" type="string">
                 L$
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="Compras" />
-        <text type="string" length="12" name="TimeText" tool_tip="Hora atual (Pacific)">
+        <button label="" label_selected="" name="buycurrency" tool_tip="Compras"/>
+        <text length="12" name="TimeText" tool_tip="Hora atual (Pacific)" type="string">
                 12:00 AM
         </text>
-        <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script" />
-        <button label="" label_selected="" name="health" tool_tip="Saúde" />
-        <text type="string" length="1" name="HealthText" tool_tip="Saúde">
+        <string name="StatBarDaysOfWeek">
+                Domingo:Segunda-feira:terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
+        </string>
+        <string name="StatBarMonthsOfYear">
+                Janeiro: Fevereiro: Março: Abril: Maio: Junho: Julho: Agosto: Setembro: Outubro: Novembro: Dezembro
+        </string>
+        <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
+        <button label="" label_selected="" name="health" tool_tip="Saúde"/>
+        <text length="1" name="HealthText" tool_tip="Saúde" type="string">
                 100%
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="Sem voar." />
-        <button label="" label_selected="" name="build" tool_tip="Sem construções." />
-        <button label="" label_selected="" name="scripts" tool_tip="Sem scripts." />
-        <button label="" label_selected="" name="restrictpush"
-             tool_tip="Restriro llEmpurrar objeto." />
-        <button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço" />
-        <line_editor label="Procurar" name="search_editor" tool_tip="Procurar em Second Life" />
-        <text name="packet_loss_tooltip">
+        <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
+        <button label="" label_selected="" name="no_build" tool_tip="construir/Rezzar não permitido"/>
+        <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
+        <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
+        <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponível aqui"/>
+        <button label="" label_selected="" name="buyland" tool_tip="Comprar esse pedaço"/>
+        <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
+        <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
+        <string name="packet_loss_tooltip">
                 Perda de pacote
-        </text>
-        <text name="bandwidth_tooltip">
+        </string>
+        <string name="bandwidth_tooltip">
                 Banda
-        </text>
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
index cda9440..a5a8c83 100644
--- a/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
@@ -1,21 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="toolbar">
+        <string name="Redock Windows">
+                Reagrupar as janelas
+        </string>
         <layout_stack name="toolbar_stack">
-        <button label="MI" name="im_btn" tool_tip="Mensagens Instantâneas para seus amigos" />
-        <button label="" name="chat_btn"
-             tool_tip="Conversar com as pessoas próximas. (Enter)" />
-        <button label="Amigos" name="friends_btn"
-             tool_tip="Ache e converse com os seus camaradas." />
-        <button label="Voar" label_selected="Parar de voar" name="fly_btn"
-             tool_tip="Comece a voar. Use E/C ou PgUp/PgDn para voar para cima e para baixo." />
-        <button label="Foto" name="snapshot_btn"
-             tool_tip="Salve uma foto em seu disco ou inventário." />
-        <button label="Procurar" name="directory_btn"
-             tool_tip="Procurar por lugares, eventos, pessoas, e muito mais." />
-        <button label="Construir" name="build_btn" tool_tip="Construa novos objetos" />
-        <button label="Mini-Mapa" name="radar_btn"
-             tool_tip="Mapa da área próxima a você. (Ctrl-Shift-M)" />
-        <button label="Mapa" name="map_btn" tool_tip="Map do mundo todo. (Ctrl-M)" />
-        <button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)" />
-    </layout_stack>
+                <button label="" name="chat_btn" tool_tip="Mostrar a barra de Conversa por Texto. (Enter)"/>
+                <flyout_button label="Comunicar-se" name="communicate_btn" tool_tip="Comunicar-se com seus Amigos e Grupos."/>
+                <button label="Voar" label_selected="Parar de voar." name="fly_btn" tool_tip="Começar a voar. Use E/C ou  PgUp/PgDn  para voar para cima ou para baixo."/>
+                <button label="Instantâneo" name="snapshot_btn" tool_tip="Salvar uma foto da tela no disco ou no inventário."/>
+                <button label="Busca" name="directory_btn" tool_tip="Busca a lugares, eventos, pessoas e mais."/>
+                <button label="Construir" name="build_btn" tool_tip="Criar novos objetos."/>
+                <button label="Mapa" name="map_btn" tool_tip="Mapa do Mundo. (Ctrl-M)"/>
+                <button label="Mini-Mapa" name="radar_btn" tool_tip="Mapa da área ao seu redor. (Ctrl-Shift-M)"/>
+                <button label="Inventário" name="inventory_btn" tool_tip="Seus itens. (Ctrl-I)"/>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
new file mode 100644
index 0000000..29ecfbf
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="voice_controls">

+        <button label="" name="speakers_btn" tool_tip="Mostra os residentes que estão usando bate-papo em voz em torno de ti."/>

+        <button label="Falar" name="push_to_talk" tool_tip="Segure o botão para falar"/>

+        <button label="" name="ptt_lock" tool_tip="Clique na fechadura para entrar no modo de falar"/>

+        <button label="" name="show_channel" tool_tip="Clique para mostrar o canal corrente de voz"/>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
new file mode 100644
index 0000000..b159ec7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="content_panel">

+        <text_editor name="voice_intro_text1">

+                Bem-vindo ao Bate-Papo em voz do Second Life! O Bate-papo em Voz lhe permite falar com outros residentes. Este assistente irá guiá-lo através dos passos necessários para configurar o Bate-papo em voz. Utilizá-lo exige falantes e áudio, se quiser falar com outras pessoas, use um microfone ou headset estéreo com microfone.

+        </text_editor>

+        <text_editor name="voice_intro_text2">

+                Bate-papo em voz é ativado por padrão. Quer continuar usando a conversa em voz?

+        </text_editor>

+        <radio_group name="voice_enable">

+                <radio_item name="1">

+                        Sim, continue com o Bate-papo em Voz.

+                </radio_item>

+                <radio_item name="0">

+                        Não, desative o Bate-papo em Voz.

+                </radio_item>

+        </radio_group>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
new file mode 100644
index 0000000..31468b7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="content_panel">

+        <check_box label="Permitir somente amigos de iniciar chamadas de voz comigo." name="friends_only_check"/>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..feb407e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel name="voice_remote">

+        <button label="" name="end_call_btn" tool_tip="Clique para deixar em espera"/>

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/pt/strings.xml b/linden/indra/newview/skins/default/xui/pt/strings.xml
new file mode 100644
index 0000000..bc0e1ea
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/pt/strings.xml
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<!-- This file contains strings that used to be hardcoded in the source.

+     It is only for those strings which don&apos;t belong in a floater.

+     For example, the strings used in avatar chat bubbles, and strings 

+     that are returned from one component and may appear in many places-->

+<strings>

+        <string name="LoginInProgress">

+                Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.

+        </string>

+        <string name="LoginAuthenticating">

+                Autenticando

+        </string>

+        <string name="LoginMaintenance">

+                Executando manutenção da conta...

+        </string>

+        <string name="LoginAttempt">

+                Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]

+        </string>

+        <string name="LoginPrecaching">

+                Carregando mundo...

+        </string>

+        <string name="LoginInitializingBrowser">

+                Inicializando navegador embutido...

+        </string>

+        <string name="LoginInitializingMultimedia">

+                Inicializando multimídia...

+        </string>

+        <string name="LoginVerifyingCache">

+                Verificando arquivos no cache (pode levar 60-90 segundos)...

+        </string>

+        <string name="LoginProcessingResponse">

+                Processando Resposta...

+        </string>

+        <string name="LoginInitializingWorld">

+                Inicializando Mundo...

+        </string>

+        <string name="LoginDecodingImages">

+                Decodificando imagens...

+        </string>

+        <string name="LoginInitializingQuicktime">

+                Inicializando o QuickTime...

+        </string>

+        <string name="LoginQuicktimeNotFound">

+                O QuickTime não foi encontrado - incapaz de inicializar.

+        </string>

+        <string name="LoginQuicktimeOK">

+                O QuickTime foi inicializado com sucesso.

+        </string>

+        <string name="LoginWaitingForRegionHandshake">

+                Aguardando o handshake com a região...

+        </string>

+        <string name="LoginConnectingToRegion">

+                Conectando à região...

+        </string>

+        <string name="LoginDownloadingClothing">

+                Baixando roupas...

+        </string>

+        <string name="LoginFailedNoNetwork">

+                Erro de Rede: Não foi possível estabelecer uma conexão. Por favor, verifique sua conexão de rede.

+        </string>

+        <string name="AgentLostConnection">

+                Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.

+        </string>

+        <string name="TooltipPerson">

+                Pessoa

+        </string>

+        <string name="TooltipNoName">

+                (sem nome)

+        </string>

+        <string name="TooltipOwner">

+                Proprietário:

+        </string>

+        <string name="TooltipPublic">

+                Público

+        </string>

+        <string name="TooltipIsGroup">

+                (Grupo)

+        </string>

+        <string name="TooltipFlagScript">

+                Script

+        </string>

+        <string name="TooltipFlagPhysics">

+                Física

+        </string>

+        <string name="TooltipFlagTouch">

+                Toque

+        </string>

+        <string name="TooltipFlagL$">

+                L$

+        </string>

+        <string name="TooltipFlagDropInventory">

+                Largar Estoque

+        </string>

+        <string name="TooltipFlagPhantom">

+                Imaterial

+        </string>

+        <string name="TooltipFlagTemporary">

+                Temporário

+        </string>

+        <string name="TooltipFlagRightClickMenu">

+                (Clique com o botão direito para acessar o menu)

+        </string>

+        <string name="TooltipFreeToCopy">

+                Cópia Permitida

+        </string>

+        <string name="TooltipForSaleL$">

+                À venda: L$[AMOUNT]

+        </string>

+        <string name="TooltipForSaleMsg">

+                À venda: [MESSAGE]

+        </string>

+        <string name="TooltipFlagGroupBuild">

+                Construído por Grupo

+        </string>

+        <string name="TooltipFlagNoBuild">

+                Não é Permitido Construir

+        </string>

+        <string name="TooltipFlagNoEdit">

+                Construído por Grupo

+        </string>

+        <string name="TooltipFlagNotSafe">

+                Não é Seguro

+        </string>

+        <string name="TooltipFlagNoFly">

+                Não é Permitido Voar

+        </string>

+        <string name="TooltipFlagGroupScripts">

+                Scripts de Grupo

+        </string>

+        <string name="TooltipFlagNoScripts">

+                Não são Permitidos Scripts

+        </string>

+        <string name="TooltipLand">

+                Terreno:

+        </string>

+        <string name="TooltipMustSingleDrop">

+                Apenas um item único pode ser arrastado para este local

+        </string>

+        <string name="RetrievingData">

+                Buscando...

+        </string>

+        <string name="ReleaseNotes">

+                Notas de Distribuição

+        </string>

+        <string name="LoadingData">

+                Carregando...

+        </string>

+        <string name="AvatarNameNobody">

+                (ninguém)

+        </string>

+        <string name="AvatarNameWaiting">

+                (aguardando)

+        </string>

+        <string name="AvatarNameHippos">

+                (hippos)

+        </string>

+        <string name="GroupNameNone">

+                (nenhum)

+        </string>

+        <string name="AssetErrorNone">

+                Nenhum erro

+        </string>

+        <string name="AssetErrorRequestFailed">

+                Valor pedido falhou

+        </string>

+        <string name="AssetErrorNonexistentFile">

+                Valor pedido: arquivo inexistente

+        </string>

+        <string name="AssetErrorNotInDatabase">

+                Valor pedido: valor não encontrado na base de dados.

+        </string>

+        <string name="AssetErrorEOF">

+                Fim do arquivo

+        </string>

+        <string name="AssetErrorCannotOpenFile">

+                Não é possível abrir arquivo

+        </string>

+        <string name="AssetErrorFileNotFound">

+                Arquivo não encontrado

+        </string>

+        <string name="AssetErrorTCPTimeout">

+                Tempo de transferência de arquivo expirado

+        </string>

+        <string name="AssetErrorCircuitGone">

+                Circuito caiu (Circuit gone)

+        </string>

+        <string name="AssetErrorUnknownStatus">

+                Status desconhecido

+        </string>

+        <string name="AvatarEditingApparance">

+                (Editando Aparência)

+        </string>

+        <string name="AvatarAway">

+                Distante

+        </string>

+        <string name="AvatarBusy">

+                Ocupado

+        </string>

+        <string name="AvatarMuted">

+                Emudecido

+        </string>

+        <string name="anim_express_afraid">

+                Temeroso

+        </string>

+        <string name="anim_express_anger">

+                Bravo

+        </string>

+        <string name="anim_away">

+                Distante

+        </string>

+        <string name="anim_backflip">

+                Virar para trás

+        </string>

+        <string name="anim_express_laugh">

+                Rir segurando a barriga

+        </string>

+        <string name="anim_express_toothsmile">

+                Sorriso largo

+        </string>

+        <string name="anim_blowkiss">

+                Mandar beijo

+        </string>

+        <string name="anim_express_bored">

+                Entediado

+        </string>

+        <string name="anim_bow">

+                Saudar curvando

+        </string>

+        <string name="anim_clap">

+                Aplaudir

+        </string>

+        <string name="anim_courtbow">

+                Saudação formal

+        </string>

+        <string name="anim_express_cry">

+                Chorar

+        </string>

+        <string name="anim_dance1">

+                Dança 1

+        </string>

+        <string name="anim_dance2">

+                Dança 2

+        </string>

+        <string name="anim_dance3">

+                Dança 3

+        </string>

+        <string name="anim_dance4">

+                Dança 4

+        </string>

+        <string name="anim_dance5">

+                Dança 5

+        </string>

+        <string name="anim_dance6">

+                Dança 6

+        </string>

+        <string name="anim_dance7">

+                Dança 7

+        </string>

+        <string name="anim_dance8">

+                Dança 8

+        </string>

+        <string name="anim_express_disdain">

+                Desdém

+        </string>

+        <string name="anim_drink">

+                Beber

+        </string>

+        <string name="anim_express_embarrased">

+                Envergonhado

+        </string>

+        <string name="anim_angry_fingerwag">

+                Negar com o dedo.

+        </string>

+        <string name="anim_fist_pump">

+                Vibrar provocando

+        </string>

+        <string name="anim_yoga_float">

+                Levitar Yoga

+        </string>

+        <string name="anim_express_frown">

+                Careta

+        </string>

+        <string name="anim_impatient">

+                Impaciente

+        </string>

+        <string name="anim_jumpforjoy">

+                Pular de Alegria

+        </string>

+        <string name="anim_kissmybutt">

+                Beije meu Bumbum

+        </string>

+        <string name="anim_express_kiss">

+                Beijar

+        </string>

+        <string name="anim_laugh_short">

+                rir

+        </string>

+        <string name="anim_musclebeach">

+                Exibir músculos

+        </string>

+        <string name="anim_no_unhappy">

+                Não (descontente)

+        </string>

+        <string name="anim_no_head">

+                Não

+        </string>

+        <string name="anim_nyanya">

+                Nya-nya-nya

+        </string>

+        <string name="anim_punch_onetwo">

+                Um-Dois soco

+        </string>

+        <string name="anim_express_open_mouth">

+                Abrir a boca

+        </string>

+        <string name="anim_peace">

+                Paz

+        </string>

+        <string name="anim_point_you">

+                Apontar para o outro

+        </string>

+        <string name="anim_point_me">

+                Apontar para si

+        </string>

+        <string name="anim_punch_l">

+                Socar Esquerda

+        </string>

+        <string name="anim_punch_r">

+                Socar Direita

+        </string>

+        <string name="anim_rps_countdown">

+                RPS contar

+        </string>

+        <string name="anim_rps_paper">

+                RPS papel

+        </string>

+        <string name="anim_rps_rock">

+                RPS pedra

+        </string>

+        <string name="anim_rps_scissors">

+                RPS tesoura

+        </string>

+        <string name="anim_express_repulsed">

+                Repulsa

+        </string>

+        <string name="anim_kick_roundhouse_r">

+                Chute giratório

+        </string>

+        <string name="anim_express_sad">

+                Triste

+        </string>

+        <string name="anim_salute">

+                Saúde

+        </string>

+        <string name="anim_shout">

+                Gritar

+        </string>

+        <string name="anim_express_shrug">

+                Encolher ombros

+        </string>

+        <string name="anim_express_smile">

+                Sorrir

+        </string>

+        <string name="anim_smoke_idle">

+                Fumar à toa

+        </string>

+        <string name="anim_smoke_inhale">

+                Inalar Fumaça

+        </string>

+        <string name="anim_smoke_throw_down">

+                Expelir Fumaça

+        </string>

+        <string name="anim_express_surprise">

+                Surpresa

+        </string>

+        <string name="anim_sword_strike_r">

+                Golpe de Espada

+        </string>

+        <string name="anim_angry_tantrum">

+                Enraivecer

+        </string>

+        <string name="anim_express_tongue_out">

+                Mostrar a língua

+        </string>

+        <string name="anim_hello">

+                Onda

+        </string>

+        <string name="anim_whisper">

+                Sussurrar

+        </string>

+        <string name="anim_whistle">

+                Assobiar

+        </string>

+        <string name="anim_express_wink">

+                Piscar

+        </string>

+        <string name="anim_wink_hollywood">

+                Piscar (Hollywood)

+        </string>

+        <string name="anim_express_worry">

+                Preocupar-se

+        </string>

+        <string name="anim_yes_happy">

+                Sim (Feliz)

+        </string>

+        <string name="anim_yes_head">

+                Sim

+        </string>

+        <string name="texture_loading">

+                Carregando...

+        </string>

+        <string name="worldmap_offline">

+                Desconectado

+        </string>

+        <string name="whisper">

+                sussurra:

+        </string>

+        <string name="shout">

+                grita:

+        </string>

+</strings>

diff --git a/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml b/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 2ead8d6..44ff1c3 100644
--- a/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -1,56 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
         <message_set name="errors">
                 <message name="invalid_tport">
-                        Foi encontrado um problema na sua solicitação de teleport. Você
-                  provavelmente precisará entrar no Second Life novamente 
-                  antes de teleportar-se. Se esse problema persistir, por favor 
-                  verifique o FAQ do suporte técnico em www.secondlife.com/support.
+                        Problema encontrado ao processar seu pedido de Teleporte. Você pode tentar reiniciar  antes de tentar teleportar. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em: 
+www.secondlife.com/support
                 </message>
                 <message name="invalid_region_handoff">
-                        Foi encontrado um problema ao processar sua transição entre as 
-                  regiões. Você provavelmente precisará entrar no Second Life 
-                  novamente antes de conseguir passar entre regiões. 
-                  Se esse problema persistir, por favor verifique o FAQ do suporte
-                  técnico em www.secondlife.com/support.
+                        Problema encontrado ao processar a passage de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber essa mensagem, por favor cheque a FAQ do Suporte Técnico em: 
+www.secondlife.com/support
                 </message>
                 <message name="blocked_tport">
-                        Desculpe, teleport temporariamente bloqueado. Tente novamente em
-                  alguns instantes. Se você ainda não puder teleportar-se, por favor,
-                  entre novamente no Second Life para resolver seu problema.
+                        Desculpe, Teleportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teleporte, por favor tente deslogar e relogar para resolver o problema.
                 </message>
                 <message name="nolandmark_tport">
                         Desculpe, mas o sistema não conseguiu localizar a landmark de destino.
                 </message>
                 <message name="timeout_tport">
-                        Desculpe, mas o sistema está incapaz de completar sua conexão para o 
-                        teleport. Tente novamente em alguns instantes.
+                        Desculpe, não foi possível para o sistema executar o teleporte, Tente novamente dentro de alguns instantes.
                 </message>
                 <message name="noaccess_tport">
                         Desculpe, você não tem permissão para acessar esse destino.
                 </message>
                 <message name="missing_attach_tport">
-                        Seus anexos não foram carregados ainda. Tente esperar por alguns
-                        segundos ou entre no Second Life novamente antes de tentar
-                        teleportar-se.
+                        Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleportar novamente.
                 </message>
                 <message name="too_many_uploads_tport">
-                        A fila de recursos nesta região está sobrecarregada portanto sua solicitação 
-                        de teleport não pode ser atendida em tempo hábil. Por favor tente novamente
-                        em alguns minutos ou vá para uma área menos carregada.
+                        A fluxo nesta região é atualmente tão alto e entupido que seu pedido de teleporte não será possível teleportar com êxito em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada.
                 </message>
                 <message name="expired_tport">
-                        Desculpe, mas o sistema não foi capaz de completar sua solicitação
-                        de teleport. Por favor, tente novamente em alguns minutos.
+                        Desculpe, mas o sistema não conseguiu concluir o seu pedido de teleporte em tempo hábil. Por favor, tente novamente em alguns minutos.
                 </message>
                 <message name="expired_region_handoff">
-                        Desculpe, mas o sistema não foi capaz de completar transição entre 
-                        as regiões. Por favor, tente novamente em alguns minutos.
+                        Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos.
                 </message>
                 <message name="no_host">
-                        Não foi possível encontrar o destino para o teleport. O destino
-                        pode estar temporariamente indisponível ou não existir mais.
-                        Por favor, tente novamente em alguns minutos.
+                        Não foi possível encontrar o destino do teleporte. O destino pode estar temporariamente indisponível ou não existir mais. Por favor, tente novamente em poucos minutos.
+                </message>
+                <message name="no_inventory_host">
+                        O sistema de inventário está indisponível no momento.
                 </message>
         </message_set>
         <message_set name="progress">
diff --git a/linden/indra/newview/skins/default/xui/zh/alerts.xml b/linden/indra/newview/skins/default/xui/zh/alerts.xml
index 49cf3b2..666f0ab 100644
--- a/linden/indra/newview/skins/default/xui/zh/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/zh/alerts.xml
@@ -1,27 +1,36 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
+        <global name="skipnexttime">
+                下次���让我看这个了
+        </global>
+        <global name="alwayschoose">
+                总是选择该选项
+        </global>
         <alert name="MissingAlert">
                 <message name="message">
-                        [ALERT_NAME]从alerts.xml中�失!
+                        alerts.xml 中找�到 [ALERT_NAME]!
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="FloaterNotFound">
                 <message name="message">
-                        处�错误: 无法找到以下调节:
+                        浮动框错误: 无法找到以下控件:
  
 [CONTROLS]
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
-        <alert name="MOTD" title="通知天数">
+        <alert name="TutorialNotFound">
                 <message name="message">
-                        [MOTD]
+                        现在还没有�用的教程。
                 </message>
+                <option name="OK">
+                        确定
+                </option>
         </alert>
         <alert name="GenericAlert">
                 <message name="message">
@@ -46,41 +55,28 @@
         </alert>
         <alert name="ConnectTimeout">
                 <message name="message">
-                        无法连接到[SECOND_LIFE].
+                        无法连接到 [SECOND_LIFE].
 系统�能出现故障。
-请几分钟��试, 或点击帮助
+
+请�候�试, 或点击帮助
 获得建议和到达系统状�的网页链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
                 </option>
         </alert>
-        <alert name="RemoveWearableSave">
-                <message name="message">
-                        �存目�对衣物/身体部�的更改?
-                </message>
-                <option name="Save">
-                        存储
-                </option>
-                <option name="Don&apos;tSave">
-                        �止储存
-                </option>
-                <option name="Cancel">
-                        �消
-                </option>
-        </alert>
-        <alert name="SetWearableSave">
+        <alert name="WearableSave">
                 <message name="message">
-                        �存目�对衣物/身体部�的更改?
+                        �存对当�衣物/身体部�的更改？
                 </message>
                 <option name="Save">
-                        存储
+                        �存
                 </option>
                 <option name="Don&apos;tSave">
-                        �止储存
+                        ��存
                 </option>
                 <option name="Cancel">
                         �消
@@ -93,12 +89,12 @@
         </alert>
         <alert name="CompileQueueSaveBytecode">
                 <message name="message">
-                        上传汇编脚本时出错，出于以下原因: [REASON]。请�候�试。
+                        上传已编译脚本代�时出错，出于以下原因: [REASON]。请�候�试。
                 </message>
         </alert>
         <alert name="WriteAnimationFail">
                 <message name="message">
-                        无法写入动画数�
+                        无法写入动画数�。请�候�试。
                 </message>
         </alert>
         <alert name="UploadAuctionSnapshotFail">
@@ -108,62 +104,65 @@
         </alert>
         <alert name="UnableToViewContentsMoreThanOne">
                 <message name="message">
-                        一次�能�览一个以上的物�.
-请�选择一个东东�试.
+                        一次�能�览一个以上物�的内容。
+请�选择一个物体��试。
                 </message>
         </alert>
         <alert name="MustSupplyVoteProposal">
                 <message name="message">
-                        你必须为选举给出��人。.
+                        你必须为投票给出�议。
 键入一�社团目标的简短�述。
                 </message>
         </alert>
         <alert name="InsufficientFunds">
                 <message name="message">
-                        资金充足。
+                        资金�足。
                 </message>
         </alert>
         <alert name="CharacterSnapshotSaved">
                 <message name="message">
-                        你的形象快照已��存。
- 
+                        你的角色的快照已��存。
 查看形象请访问网络工作室的陈列馆。
                 </message>
         </alert>
         <alert name="SaveClothingBodyChanges">
                 <message name="message">
-                        �存所有对衣物/身体部�的更改?
+                        �存所有对衣物/身体部�的更改？
                 </message>
                 <option name="SaveAll">
-                        储存全部
+                        全部�存
                 </option>
                 <option name="Don&apos;tSave">
-                        �止储存
+                        ��存
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="AlterModifyRights">
+        <alert name="GrantModifyRights">
                 <message name="message">
-                        你是��[ACTION]更改�利[DERECTION] [FIRST_NAME] [LAST_NAME]?
+                        授予�外一�居民修改的�利，�味��许他们修改�删除或拿走
+任何你在世界里�能拥有的物�。请在执行这项许�的时候格外�心。               
+你真的希望授予[FIRST_NAME] [LAST_NAME]修改�利�？
                 </message>
                 <option name="Yes">
-                        是
+                        是的，我愿�
                 </option>
                 <option name="No">
-                        �
+                        �，我想�考虑一下
                 </option>
         </alert>
-        <alert name="GrantModifyRights">
+        <alert name="GrantModifyRightsMultiple">
                 <message name="message">
-                        授予�外一�居民修改的�利，则�味��许他们修改任何你�第二人生世界里�能拥有的物�。请在执行这项许�的时候格外�心。               你真的希望授予[FIRST_NAME] [LAST_NAME]修改�利�？
+                        授予�外一�居民修改的�利，�味��许他们修改�删除或拿走
+任何你在世界里�能拥有的物�。请在执行这项许�的时候格外�心。               
+你真的希望授予所选择的居民修改�利�？
                 </message>
                 <option name="Yes">
                         是的，我愿�
                 </option>
                 <option name="No">
-                        �是，我想�考虑一下
+                        �，我想�考虑一下
                 </option>
         </alert>
         <alert name="RevokeModifyRights">
@@ -174,12 +173,23 @@
                         是的，我愿�
                 </option>
                 <option name="No">
-                        �是，我想�考虑一下
+                        �，我想�考虑一下
+                </option>
+        </alert>
+        <alert name="RevokeModifyRightsMultiple">
+                <message name="message">
+                        你真的希望撤回所选居民的修改�利�？
+                </message>
+                <option name="Yes">
+                        是的，我愿�
+                </option>
+                <option name="No">
+                        �，我想�考虑一下
                 </option>
         </alert>
         <alert name="RemoveFriend">
                 <message name="message">
-                        你是��将[FIRST_NAME] [LAST_NAME]移出你的朋�圈?
+                        你是��将[FIRST_NAME] [LAST_NAME]从你的朋�列表中去除？
                 </message>
                 <option name="Remove">
                         移除
@@ -199,7 +209,7 @@
 [MESSAGE]
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="PanelGroupApply">
@@ -211,7 +221,7 @@
                         应用更改
                 </option>
                 <option name="IgnoreChanges">
-                        忽视更改
+                        忽略更改
                 </option>
                 <option name="Cancel">
                         �消
@@ -221,13 +231,13 @@
                 <message name="message">
                         创建一个新社团需花费 L$[COST].
  
-�想��一个新社团超过三天,你的社团总人数必须达到三人获三人以上。
+�想��一个新社团超过三天，你的社团总人数必须达到三人或三人以上。
 
  
 是�创建新社团?
                 </message>
                 <option name="Create">
-                        创造
+                        创建
                 </option>
                 <option name="Cancel">
                         �消
@@ -235,18 +245,18 @@
         </alert>
         <alert name="CreateGroupCannotAfford">
                 <message name="message">
-                        建立社团将花费 L$[花费].
-你没有足够的钱�建立此社团。
+                        建立社团将花费 L$[COST].
+你没有足够的 L$ �建立此社团。
                 </message>
         </alert>
         <alert name="GroupNameTooShort">
                 <message name="message">
-                        社团�必须包�至少4个字�。
+                        社团�必须至少4个字�长。
                 </message>
         </alert>
         <alert name="GroupNameUsesReservedWord">
                 <message name="message">
-                        社团�已被预订。 请�外
+                        社团�中带有�能使用的�。 请�外
 选择一个�字。
                 </message>
         </alert>
@@ -255,18 +265,25 @@
                         你必须为��给社团的通知拟定一个主题.
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="MustSupplyGroupCharter">
                 <message name="message">
                         请为社团制定一个规章。
+简短地�述社团的目标。
                 </message>
         </alert>
         <alert name="AddGroupOwnerWarning">
                 <message name="message">
-                        你将添加社团会员至角色[ROLE_NAME]中。会员�能从该角色中被移除。会员必须自己从角色中辞�。你真的愿�继续�？
+                        你将添加社团会员至角色 [ROLE_NAME] 中。
+会员�能从该角色中被移除。
+会员必须自己从角色中辞�。
+你真的愿�继续�？
                 </message>
+                <ignore name="ignore">
+                        当添加社团会员到团长角色时
+                </ignore>
                 <option name="Yes">
                         是
                 </option>
@@ -276,12 +293,15 @@
         </alert>
         <alert name="AssignDangerousActionWarning">
                 <message name="message">
-                        你将添加能力&apos;[ACTION_NAME]&apos;至角色&apos;[ROLE_NAME]&apos;中。
+                        你将为角色 ‘[ROLE_NAME]’ 添加 ‘[ACTION_NAME]’ 的能力。
  
  *警告*
- 任何角色中的会员拥有这项能力�，都�以分�给他们自己，或者任何其他的会员��角色，这些角色的�利�能比他们目�所拥有的大得多，并很�能�拔他们自己到最�近主人�利的�置上。请在分�这项能力之�确定自己这么�将带�的�果。
+任何具有该角色的会员拥有这项能力�，都�以给他们自己——以�
+任何其他的会员��角色——分��利比他们目�所拥有的�利大得多
+的角色，并�能�拔他们自己到相近于团长�利的�置上。
+请在分�这项能力之�确定自己这么�将带�的�果。
  
-你是�愿�添加这个能力至&apos;[ROLE_NAME]&apos;?
+你是�愿�添加这个能力至 ‘[ROLE_NAME]’?
                 </message>
                 <option name="Yes">
                         是
@@ -295,7 +315,7 @@
                         你将添加能力&apos;[ACTION_NAME]&apos;至角色 &apos;[ROLE_NAME]&apos;中。
  
  *警告*
- 任何角色中的会员拥有这项能力�，都�以分�给他们自己，或者其他会员所有的能力，甚至�以�拔他们自己到最�近主人的�利的�置上。
+任何具有该角色的会员拥有这项能力�，都�以给他们自己——或者其他会员——分�所有的能力，甚至�以�拔他们自己到相近于团长�利      的�置上。
  
 你是�愿�添加这项能力至 &apos;[ROLE_NAME]&apos;?
                 </message>
@@ -313,82 +333,107 @@
         </alert>
         <alert name="ClickPublishHelpLand">
                 <message name="message">
-                        选择 &quot;在网络上�布&quot;选项将�许我们�布土地的�称，�述，快照和地点至[SECOND_LIFE]网站。如果你�布的内容，根�社区标准规定，涉�到�人内容，你有责任对此作出声明。
+                        选择 &quot;在�索中�布&quot;
+这个选项将会:
+- 在�索结果中显示该地�
+- 显示该地�的公开物体
+- 在网页�索中显示这个地�
+                </message>
+        </alert>
+        <alert name="ClickPublishHelpLandDisabled">
+                <message name="message">
+                        你�能让这个地�显示在�索中，因为它所在的地区�止这样�。
                 </message>
         </alert>
         <alert name="ClickPublishHelpPostcard">
                 <message name="message">
-                        选择 &quot;在网络上�布&quot;选项将�许我们�布摄影师在[SECOND_LIFE]的�字，工作，地点，信�和快照至[SECOND_LIFE]网站。如果你�布的任何快照内容，根�社区标准规定，涉�到�人内容，你有责任对此作出声明。
+                        选择 &quot;在网络上�布&quot;选项将�许我们�布摄影师在[SECOND_LIFE]的�字�主题�地点�信�和快照至[SECOND_LIFE]网站。如果你�布的任何快照内容，根�社区标准规定，涉�到�人内容，你有责任对此作出声明。
                 </message>
         </alert>
         <alert name="ClickPublishHelpAvatar">
                 <message name="message">
-                        选择 &quot;在网络上�布&quot;选项将�许我们�布你的�字，图�，和‘关于自己’的文本至[SECOND_LIFE]网站。
+                        选择 &quot;在�索中显示&quot; 将会:
+                        - 在�索结果中显示我的档案
+                        - 在公开社团的页�中显示到我的档案的链接
                 </message>
         </alert>
+        <alert name="ClickPartnerHelpAvatar">
+                <message name="message">
+                        你�以通过[SECOND_LIFE] 网站邀请�一�居民�为你的�档，或者解除现存的关系。
+
+到[SECOND_LIFE]网站查询关于�档的信��？
+                </message>
+                <option name="GotoPage">
+                        打开网页
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
         <alert name="ClickWebProfileHelpAvatar">
                 <message name="message">
-                        If this resident has a web profile URL set then you can:
- * Click Load to load the page with the embedded web browser.
- * Click Open to view externally in your default web browser.
+                        如果该居民设置了网络档案URL的�你�以:
+ * 选择“加载“�用内部�览器打开这个档案页�。
+ * 选择 加载 &gt; “在外部�览器中打开� �在外部�览。
+ * 如果您�览到了其他的地方，点击加载 &gt; “返回原�页�� �回到居民的 Web 档案。
  
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+在你的档案中你�以输入任何URL作为你的网络档案然�按确认�设置。
+其他居民在观看你的档案的时候�以访问你所指定的URL。
                 </message>
         </alert>
         <alert name="ClickWebProfileNoWebHelpAvatar">
                 <message name="message">
-                        If this resident has a web profile URL set then you can:
- * Click Open to view externally in your default web browser.
+                        如果该居民设置了网络档案URL的�你�以:
+ * 用你的默认�览器打开这个档案页�。
  
-When viewing your profile you can enter any URL as your Web Profile.
-Residents can visit the URL you specify when they view your profile.
+在你的档案中你�以输入任何URL作为你的网络档案。
+其他居民在观看你的档案的时候�以访问你所指定的URL。
                 </message>
         </alert>
         <alert name="ReputationMinGreaterThanMax">
                 <message name="message">
                         声望最�值比最大值大。
-�低最�值或�高最大值。
+请�低最�值或�高最大值。
                 </message>
         </alert>
         <alert name="MoneyMinGreaterThanMax">
                 <message name="message">
                         钱的最��度比最大�度大。
-�以�低最�值或者�高最大值。
+请�低最�值或者�高最大值。
                 </message>
         </alert>
         <alert name="OfficerTitleTooLong">
                 <message name="message">
-                        官员头衔最多�以包�20个�。
-请选择一个较短头衔。
+                        官员头衔最多�以包�20个字。
+请选择一个较短的头衔。
                 </message>
         </alert>
         <alert name="MemberTitleTooLong">
                 <message name="message">
-                        �员头衔最多�以包�20个�。
+                        �员头衔最多�以包�20个字。
 请选择一个较短的头衔。
                 </message>
         </alert>
         <alert name="RunningLocally">
                 <message name="message">
-                        本地�行...
-没有找到你的数�.
+                        在本地�行...
+将�会给你任何的数�。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="EjectNoMemberSelected">
                 <message name="message">
-                        没有选定�驱��员。
+                        没有选定�驱�的�员。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="ConfirmEject">
                 <message name="message">
-                        这将会把[MEMBER]驱�出社团
+                        这将会把 [MEMBER] 驱�出社团。
 你确定�继续�?
                 </message>
                 <option name="Eject">
@@ -413,16 +458,16 @@ Residents can visit the URL you specify when they view your profile.
         <alert name="JoinGroupCannotAfford">
                 <message name="message">
                         加入该社团需花费 L$[COST].
-加入该社团�，你并�是一定�留有结余。
+您拥有的 L$ �够。
                 </message>
         </alert>
         <alert name="LandBuyPass">
                 <message name="message">
-                        花费L$[COST]你就�以进入这�土地(&apos;[PARCEL_NAME]&apos;)
+                        花费 L$[COST] 你就�以进入这�土地(&apos;[PARCEL_NAME]&apos;)
 [TIME]�时。是�购买通行�?
                 </message>
                 <option name="OK">
-                        OK
+                        è´­ä¹°
                 </option>
                 <option name="Cancel">
                         �消
@@ -431,25 +476,37 @@ Residents can visit the URL you specify when they view your profile.
         <alert name="CannotStartAuctionAlreadyForSale">
                 <message name="message">
                         你�能对已�设置为代售的土地进行
-��. 如果你执�开始��，必须��该土地
-的销售.
+��。如果你执�开始��，必须中止该土地
+的销售。
                 </message>
         </alert>
         <alert name="SalePriceRestriction">
                 <message name="message">
-                        �管出售给何人，出售价格必须 &gt; L$0。
+                        如果出售给任何人，出售价格必须 &gt; L$0。
 如果售价为L$0，请选定一个用户�售出。
                 </message>
         </alert>
         <alert name="ConfirmLandSaleChange">
                 <message name="message">
-                        所选的[LAND_SIZE]平方米土地正被设置为代售。
-你的售价应当为 L$[SALE_PRICE]并将被审定为售给[NAME]。
- 
-你愿�继续改��?
+                        所选的 [LAND_SIZE]平方米土地正被设置为代售。
+你的售价将是为 L$[SALE_PRICE]并将被授�售给[NAME]。
                 </message>
                 <option name="Continue">
-                        继续
+                        确定
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="ConfirmLandSaleToAnyoneChange">
+                <message name="message">
+                        请注�: 点击 &apos;售出给任何人&apos; 将使你的土地对整个第二人生社区开放，包括当��在这个地区中的人。
+
+所选的 [LAND_SIZE]平方米土地正被设置为代售。
+你的售价将是为 L$[SALE_PRICE]并将被授�售给[NAME]。
+                </message>
+                <option name="Continue">
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -457,15 +514,15 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="ReturnObjectsDeededToGroup">
                 <message name="message">
-                        你是�确定愿�归还在这�土地上由社团[NAME]分享的东东至它们原先主人的库存?
-已�转让给别的社团的，�移动的东东将被归还至它们原先的主人处。
+                        你是�确定返还在这�土地上由社团 &apos;[NAME]&apos;
+分享的物体至它们原先主人的库存?
  
-*警告* 这项�作将删除已转让至别的社团的��移动的东东。
+*警告* 这项�作将删除该社团所分享的��转让的物体�
  
-东东: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -473,14 +530,13 @@ Residents can visit the URL you specify when they view your profile.
         </alert>
         <alert name="ReturnObjectsOwnedByUser">
                 <message name="message">
-                        Are you sure you want to return all objects owned by the
-resident &apos;[NAME]&apos; on this parcel of land
-back to their inventory?
+                        你是�确定返还居民 &apos;[NAME]&apos;
+在这地�上拥有的所有物体到他的库存？
  
-Objects: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -488,12 +544,13 @@ Objects: [N]
         </alert>
         <alert name="ReturnObjectsOwnedBySelf">
                 <message name="message">
-                        你是�确定愿�归还你在这�土地上拥有的所有东东至你的库存？
+                        你是�确定愿�返还你在这�土地上
+拥有的所有物体至你的库存？
  
-东东: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -501,15 +558,16 @@ Objects: [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedBySelf">
                 <message name="message">
-                        你是�确定愿�归还在这�土地上所有�属于你自己的东东至它们主人的库存?
-已�转让给别的社团的，�移动的东东将被归还至它们原先的主人处。
+                        你是�确定返还在这�土地上所有�属于你自己的物体至
+它们主人的库存?已�转让给别的社团的，�转让的物体将
+被归还至它们原先的主人处。
  
-*警告* 这项�作将删除已转让至别的社团的��移动的东东。
+*警告* 这项�作将删除该社团所分享的��转让的物体�
  
-东东: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -517,18 +575,17 @@ Objects: [N]
         </alert>
         <alert name="ReturnObjectsNotOwnedByUser">
                 <message name="message">
-                        Are you sure you want to return all objects NOT owned
-by [NAME] on this parcel of land back to their owner&apos;s inventory?
-Transferable objects deeded to a group will be
-returned to their previous owners.
+                        你是�确定返还在这�土地上所有*�*属于居民 [NAME]  的物体至
+它们主人的库存? 已�转让给别的社团的，�转让的物体将
+被归还至它们原先的主人处。
  
-*WARNING* This will delete the non-transferable objects
-deeded to the group!
+*警告* 这项�作将删除该社团所分享的��转让的物体�
+
  
-Objects: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -536,11 +593,10 @@ Objects: [N]
         </alert>
         <alert name="ReturnAllTopObjects">
                 <message name="message">
-                        Are you sure you want to return all objects
-in this region back to their owner&apos;s inventory?
+                        你确定�返还所有该区域中的物体至他们原先主人的库存中�？
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -548,7 +604,7 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="DisableAllTopObjects">
                 <message name="message">
-                        Are you sure you want to disable all objects in this region?
+                        你确定��止该区域中的所有物体�？
                 </message>
                 <option name="Disable">
                         �止
@@ -559,12 +615,14 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="ReturnObjectsNotOwnedByGroup">
                 <message name="message">
-                        是�归还这�土地上�由社团[NAME]分享的东东至它们的主人处？
+                        是�归还这�土地上�由
+社团 [NAME] 分享的物体
+至它们的主人处？
 
-对象: [N]
+物体: [N]个
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
@@ -572,9 +630,9 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="UnableToDisableOutsideScripts">
                 <message name="message">
-                        无法废除外部脚本。
-这整�区域都是正常状�(�安全).
-脚本必须被�许�行，枪�能够工作。
+                        无法�用外部脚本。
+整�区域都是已�用伤害(�安全)。
+脚本必须被�许�行，�能使用武器。
                 </message>
         </alert>
         <alert name="MustBeInParcel">
@@ -585,7 +643,7 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="PromptRecipientEmail">
                 <message name="message">
-                        请键入接�者的电�邮件地�。
+                        请键入收件人的电�邮件地�。
                 </message>
         </alert>
         <alert name="PromptSelfEmail">
@@ -593,41 +651,30 @@ in this region back to their owner&apos;s inventory?
                         请键入你的电�邮件地�。
                 </message>
         </alert>
-        <alert name="ErrorProcessingSnapshot">
+        <alert name="PromptMissingSubjMsg">
                 <message name="message">
-                        处�快照数�错误
+                        以默认标题或内容用电�邮件��快照�？
                 </message>
-        </alert>
-        <alert name="ConfirmNotecardSave">
-                <message name="message">
-                        �有�存这张�示�之�，此项物���以�制或查看。是��存�示�？
-                </message>
-                <option name="Save">
-                        是的，请�存
+                <option name="OK">
+                        确定
                 </option>
                 <option name="Cancel">
-                        �消�存
+                        �消
                 </option>
         </alert>
-        <alert name="RemoveMultipleFromFriends">
+        <alert name="ErrorProcessingSnapshot">
                 <message name="message">
-                        你希望从好�列表中移除若干好��？
+                        处�快照数�错误
                 </message>
-                <option name="Remove">
-                        是的，我�移除
-                </option>
-                <option name="Cancel">
-                        �消
-                </option>
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
-                        编�快照错误!
+                        编�快照时�生错误
                 </message>
         </alert>
         <alert name="ErrorUploadingPostcard">
                 <message name="message">
-                        上传明信片时出错，出于以下原因: [REASON]。
+                        ��快照时出现问题，出于以下原因: [REASON]。
                 </message>
         </alert>
         <alert name="ErrorUploadingReportScreenshot">
@@ -637,99 +684,78 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="MustAgreeToLogIn">
                 <message name="message">
-                        你必须���务�议�能继续登陆至[SECOND_LIFE]。
+                        你必须���务�议�能继续登陆至 [SECOND_LIFE]。
                 </message>
         </alert>
         <alert name="CouldNotPutOnOutfit">
                 <message name="message">
-                        无法装载�置。
-�置文件夹�包�衣物，
+                        无法装载装�。
+装�文件夹中没有衣物�身体部��或附件。
                 </message>
         </alert>
         <alert name="CannotWearTrash">
                 <message name="message">
-                        无法使用垃圾�内的衣物或身体部�。
+                        无法使用垃圾箱内的衣物或身体部�。
                 </message>
         </alert>
         <alert name="CannotWearInfoNotComplete">
                 <message name="message">
-                        无法使用该物�，因为其完整信�显示其暂��用。请�候�试。
+                        无法穿上该物�，因为它还没有加载完。请�候�试。
                 </message>
         </alert>
-        <alert name="MustHaveAccountToLogInNoLinks">
+        <alert name="MustHaveAccountToLogIn">
                 <message name="message">
-                        你必须先创建一个新�户�能登陆到[SECOND_LIFE].
+                        哎呀�有什么地方没填上。
+您必须输入您的化身的�和姓。
+
+您需�一个�户�能进入[SECOND_LIFE]。您希望现在创建一个�？
                 </message>
                 <option name="OK">
-                        OK
+                        创建新�户
                 </option>
                 <option name="Cancel">
-                        �消
+                        �试一次�…
                 </option>
         </alert>
-        <alert name="MustHaveAccountToLogIn">
+        <alert name="AddClassified">
                 <message name="message">
-                        你必须先创建一个新�户�能登陆到[SECOND_LIFE].
+                        分类广告会在查找�录的 &apos;分类广告&apos; �目里�留一周时间。
+
  
-现在到www.secondlife.com注册新�户?
+填写你的广告，然�点击 &apos;�布...&apos;，�会添加广告至广告�录中。
+当点击�布时，你将被�求支付�布广告费用。 大�支付�味�你的广告会在��较�的地方出现，并且当用关键�查找时，你的广告也出现在查询结果较高的�置上。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
+                <ignore name="ignore">
+                        添加新分类广告时
+                </ignore>
         </alert>
-        <alert name="GrantedModifyRights">
-                <message name="message">
-                        你已�被授予特�，你�以任�修改[FIRST_NAME] [LAST_NAME]的东东。
-                </message>
-        </alert>
-        <alert name="RevokedModifyRights">
-                <message name="message">
-                        你的特�已�被撤回，你��以�任�修改[FIRST_NAME] [LAST_NAME]的东东。
-                </message>
-        </alert>
-        <alert name="InvalidTerrainBitDepth">
-                <message name="message">
-                        无法设定区域的质地: 
- 
-目标质地 [TEXTURE_NUM] 的色彩格�[TEXTURE_BIT_DEPTH]无效.
- 
-请把目�的目标质地[TEXTURE_NUM]更替为24比特 512x512分辨率，或者更�的显示图片，然�点击 &quot;设置&quot;.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainSize">
-                <message name="message">
-                        无法设置区域的质地: 
- 
-目标质地[TEXTURE_NUM]的尺寸 [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]过大. 
- 
-请把目�的目标质地[TEXTURE_NUM]替��24比特 512x512分辨率或者更�的显示图片，然�点击 &quot;设置&quot;.
-                </message>
-        </alert>
-        <alert name="AddClassified">
+        <alert name="DeleteClassified">
                 <message name="message">
-                        分类广告会在查找�录的&apos;Classified&apos;�目里�留一周时间。
-
- 
-填写你的广告,然�点击&apos;�布...&apos;，既添加广告至广告�录中。
-当点击�布时，你将被�求支付�布广告费用. 大�支付�味�你的广告会在��较�的地方出现，并且当用关键�查找时，你的广告也出现在查询结果较高的�置上。
+                        删除分类广告 &apos;[�称]&apos;?
+将�会退还已付的费用。
                 </message>
-                <option name="OK">
-                        OK
+                <option name="Delete">
+                        删除
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="DeleteClassified">
+        <alert name="ClassifiedSave">
                 <message name="message">
-                        Delete分类 &apos;[�称]&apos;?
-付款��会退费。
+                        �存对分类广告 [NAME] 的修改?
                 </message>
-                <option name="Delete">
-                        删除
+                <option name="Save">
+                        �存
+                </option>
+                <option name="Don&apos;tSave">
+                        ���存
                 </option>
                 <option name="Cancel">
                         �消
@@ -737,7 +763,7 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="DeleteAvatarPick">
                 <message name="message">
-                        删除挑选 [挑选]?
+                        删除收� [PICK]?
                 </message>
                 <option name="Delete">
                         删除
@@ -749,10 +775,10 @@ in this region back to their owner&apos;s inventory?
         <alert name="DisplayChangeRestart">
                 <message name="message">
                         有一些你执行的显示设置的改�
-会�求[SECOND_LIFE]立�关闭，
-这会导致进程中的所有工作丢失。
+需� [SECOND_LIFE] 立�关闭，
+这会导致进行中的所有工作丢失。
  
-应用改�并退出
+应用更改并退出？
                 </message>
                 <option name="ApplyandQuit">
                         应用并退出
@@ -763,10 +789,10 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="PromptGoToEventsPage">
                 <message name="message">
-                        是�跳至[SECOND_LIFE]事件网页?
+                        是�转到 [SECOND_LIFE] 事件网页?
                 </message>
                 <option name="GotoPage">
-                        回主页
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
@@ -779,25 +805,36 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="SelectItemToView">
                 <message name="message">
-                        请选择一个物�兰�查看。
+                        请选择需�查看的�案。
                 </message>
         </alert>
         <alert name="SelectProposalToView">
                 <message name="message">
-                        选择查看一个�案.
+                        请选择需�查看的�案。
                 </message>
         </alert>
         <alert name="SelectHistoryItemToView">
                 <message name="message">
-                        请选择一个历�物��查看。
+                        请选择一个历�项目�查看。
                 </message>
         </alert>
         <alert name="ResetShowNextTimeDialogs">
                 <message name="message">
-                        Reset all &apos;Show next time&apos; dialogs?
+                        您希望�新�用这些之�希望 ‘��显示’ 的对�框�？
                 </message>
                 <option name="OK">
-                        OK
+                        确定
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="SkipShowNextTimeDialogs">
+                <message name="message">
+                        您希望�用所有�以被略过的对�框�？
+                </message>
+                <option name="OK">
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -805,16 +842,32 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="CacheWillClear">
                 <message name="message">
-                        ��[SECOND_LIFE]�将清除缓存。
+                        缓存将在�新�动 [SECOND_LIFE] �清除。
+                </message>
+        </alert>
+        <alert name="CacheWillBeMoved">
+                <message name="message">
+                        缓存将在�新�动 [SECOND_LIFE] �移动。
+注�: 这样将会清除缓存。
+                </message>
+        </alert>
+        <alert name="ChangeConnectionPort">
+                <message name="message">
+                        端�设定将在�新�动 [SECOND_LIFE] �生效。
+                </message>
+        </alert>
+        <alert name="ChangeSkin">
+                <message name="message">
+                        新皮肤将在 [SECOND_LIFE] �新�动�应用。
                 </message>
         </alert>
         <alert name="GoToAuctionPage">
                 <message name="message">
-                        是�跳至[SECOND_LIFE]网页查看有声信�
+                        是�跳至[SECOND_LIFE]网页查看��信�
 或者�与投标?
                 </message>
                 <option name="GotoPage">
-                        回主页
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
@@ -825,10 +878,10 @@ in this region back to their owner&apos;s inventory?
                         �存更改?
                 </message>
                 <option name="Save">
-                        存储
+                        �存
                 </option>
                 <option name="Don&apos;tSave">
-                        �止储存
+                        ���存
                 </option>
                 <option name="Cancel">
                         �消
@@ -848,31 +901,31 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="GestureSaveFailedObjectNotFound">
                 <message name="message">
-                        无法�存动作，因为找�到目标或相关目标。
-目标�能在范围之外或已被删除。
+                        无法�存动作，因为找�到物体或相关物体的内容。
+物体�能在范围之外或已被删除。
                 </message>
         </alert>
         <alert name="GestureSaveFailedReason">
                 <message name="message">
-                        �存动作时出错，出于以下原因: [REASON].请�候�试�新�存动作。
+                        �存动作时出错，出于以下原因: [REASON]。请�候�试�新�存动作。
                 </message>
         </alert>
         <alert name="SaveNotecardFailObjectNotFound">
                 <message name="message">
-                        无法�存�片，因为无法找到目标或相关目标库存。
-目标�能在范围之外或被删除。
+                        无法�存记事�，因为找�到物体或相关物体的内容。
+物体�能在范围之外或已被删除。
                 </message>
         </alert>
         <alert name="SaveNotecardFailReason">
                 <message name="message">
-                        �存注释�时出错，出于以下原因: [REASON]。请�候�试�新�存注释�。
+                        �存记事�时出错，出于以下原因: [REASON]。请�候�试�新�存记事�。
                 </message>
         </alert>
         <alert name="ScriptCannotUndo">
                 <message name="message">
                         无法撤销对你的脚本版本的所有更改.
 你是�愿�载入�务器上次�存的版本?
-(�示: 此次�作无法撤销.)
+(***警告***: 此次�作无法撤销.)
                 </message>
                 <option name="Yes">
                         是
@@ -888,19 +941,19 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="SaveScriptFailObjectNotFound">
                 <message name="message">
-                        无法�留脚本，因为没有找到原本东东。
-东东�能在范围之外或被删除。
+                        无法�存脚本，因为找�到其所在的物体。
+该物体�能在范围之外或已被删除。
                 </message>
         </alert>
         <alert name="SaveBytecodeFailReason">
                 <message name="message">
-                        �存汇编脚本时出错，出于以下原因: [REASON].请�候�试�新�存脚本。
+                        �存汇编脚本时出错，出于以下原因: [REASON]。请�候�试�新�存脚本。
                 </message>
         </alert>
         <alert name="CouldNotStartStopScript">
                 <message name="message">
-                        无法开始或�脚本，因为没有找到原本东东。
-东东�能在范围之外或被删除。
+                        无法开始或�止脚本，因为找�到其所在的物体。
+该物体�能在范围之外或已被删除。
                 </message>
         </alert>
         <alert name="CannotDownloadFile">
@@ -910,23 +963,23 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="CannotWriteEncode">
                 <message name="message">
-                        无法解密文件 [[FILE]]
+                        无法编�文件 [[FILE]]
                 </message>
         </alert>
         <alert name="CannotWriteFile">
                 <message name="message">
-                        无法写入文件[[FILE]]
+                        无法写入文件 [[FILE]]
                 </message>
         </alert>
         <alert name="CannotLoadWearable">
                 <message name="message">
-                        对�起，�能载入衣�。
+                        对�起，载入衣�失败。
                 </message>
         </alert>
         <alert name="ConfirmDeleteComplicated">
                 <message name="message">
-                        至少有一件所选东东被�定，���制,或属于其他人。
-你确定�删除所有物��?
+                        您选择的物�中至少有一件被�定，���制，或者属于其他人。
+您确定�删除所有物��?
                 </message>
                 <option name="Yes">
                         是
@@ -937,22 +990,83 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="DisplaySettingsSafe">
                 <message name="message">
-                        基于您的特殊安全�求，显示设置
-已�被设�安全水平模�。
+                        显示设置已调整为安全水平，因为您指定了 -safe 选项。
                 </message>
         </alert>
+        <alert name="UnsupportedGLRequirements">
+                <message name="message">
+                        您似乎没有满足第二人生的系统需求的硬件。第二人生需�支�多��质 (multitexture)
+的 OpenGL 显示�。如果您满足这个�件的�，也许您需�确认已�
+安装了您的显示�的最新驱动程��以��作系统的 Service Pack 和补�。
+
+如果您还是�到问题，请访问: http://www.secondlife.com/support
+                </message>
+        </alert>
+        <alert name="UnsupportedHardware">
+                <message name="message">
+                        警告: 您的系统没有满足第二人生的最低系统需求。如果您继续使用第二人生，您�能会得到糟糕的性能体验。�幸的是，我们无法为�支�的系统�备�供技术支�。
+
+MINSPECS
+您希望访问 [_URL] 得到更多信��？
+                </message>
+                <ignore name="ignore">
+                        检测到�支�的硬件时
+                </ignore>
+                <option name="Yes">
+                        是
+                </option>
+                <option name="No">
+                        �
+                </option>
+        </alert>
+        <alert name="UnsupportedGPU">
+                <message name="message">
+                        - 您的显示�没有达到最低需求。
+                </message>
+        </alert>
+        <alert name="UnsupportedCPU">
+                <message name="message">
+                        - 您的 CPU(中央处�器)速度没有达到最低需求。
+                </message>
+        </alert>
+        <alert name="UnsupportedRAM">
+                <message name="message">
+                        - 您的系统内存没有达到最低需求。
+                </message>
+        </alert>
+        <alert name="UnknownGPU">
+                <message name="message">
+                        您的系统中安装了一个我们所�知�的显�。
+这�常�生于我们还没有�得�测试的新硬件上。
+第二人生将很�能正常�行，但您也许�
+调节您的图形设定到更�适的水平上。
+(编辑 &gt; 首选项 &gt; 图�).
+                </message>
+                <ignore name="ignore">
+                        检测到未知的显示�时
+                </ignore>
+        </alert>
         <alert name="DisplaySettingsRecommended">
                 <message name="message">
-                        显示设置已�被设置在推�的水平上，推�水平是基于您计算机的系统�置得出的。
+                        基于您计算机的系统�置，显示设置已�被设置在推�的水平上。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
+        <alert name="DisplaySettingsNoShaders">
+                <message name="message">
+                        [SECOND_LIFE] 在�始化图形驱动程�时崩溃了。
+图形质�将被设为“低�以��常�的驱动程�错误。
+这将�用�些图形特性。
+我们建议更新您的显示�驱动程�。
+图形质��以在首选项 → 图�中�高。
+                </message>
+        </alert>
         <alert name="CannotRequestDomain">
                 <message name="message">
-                        无法连接到�务器.
-无法请求连接域�: [HOST]
+                        无法连接到�务器。
+无法请求域�: [HOST]
                 </message>
         </alert>
         <alert name="CannotFindDomain">
@@ -961,11 +1075,11 @@ in this region back to their owner&apos;s inventory?
 这�能是网络连接故障或�务器出错
 所引�的结果。
  
-请几分钟��试, 或点击帮助
-获得建议和到达系统状�的网页链接。
+请���试, 或点击帮助
+获得建议和到系统状�网页的链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
@@ -973,74 +1087,82 @@ in this region back to their owner&apos;s inventory?
         </alert>
         <alert name="PromptSelectServer">
                 <message name="message">
-                        请选择一个�务器.
+                        请选择一个�务器。
 无法连接至�务器[SERVER]
                 </message>
         </alert>
         <alert name="CannotConnectDNSError">
                 <message name="message">
                         无法连接到[SECOND_LIFE].
-DNS�务器无法解读。
+域��务器无法解�主机�称。
+
 请确定�以连接主页 www.secondlife.com。
-如果�以，但一直收到错误信�，
-请到技术部门并报告此项错误。
+如果�以，但一直收到该错误信�，
+请到 www.secondlife.com/support 报告此项错误。
                 </message>
         </alert>
         <alert name="CannotConnectSecurityError">
                 <message name="message">
                         无法与登陆�务器建立安全连接。
 通常这�味�计算机时钟的设置�正确。
-请到控制��选项察看时间设置，并确定时间
-和日期设定正确。
- 
-如果一直收到这个错误信�，请登陆
-SecondLife.com网站，与技术支�部门�系，
-并�他们报告问题。
+
+请确定时间和日期设定正确。 
+如果�然收到这个错误信�，请到 
+www.secondlife.com/support 
+报告此项错误。
                 </message>
         </alert>
         <alert name="CannotConnectVerificationError">
                 <message name="message">
-                        无法连接到[SECOND_LIFE].
+                        无法连接到 [SECOND_LIFE]。
 登陆�务器无法识别自身。
+
+如果一直收到这个错误信�，请到 
+www.secondlife.com/support 
+报告此项错误。
                 </message>
         </alert>
         <alert name="CannotConnectUnknownErrorWindows">
                 <message name="message">
                         无法连接至[SECOND_LIFE].
-尽管我们尽了最大努力, 一些��知的错误导致了这次连接失败.
-请�试登陆SecondLife.com网站的技术支�部门，并报告问题，如果�能，请附上你的SecondLife.log文件，文件路径为: C:\Documents and Settings\(name)\Application Data\SecondLife\logs
+尽管我们尽了最大努力, 一些��知的错误导致了
+这次连接失败。请�试登陆SecondLife.com网站的
+技术支�部门，并报告问题，如果�能，请附上你的
+SecondLife.log文件，文件路径为: 
+C:\Documents and Settings\(用户�)\Application Data\SecondLife\logs
 �常感谢.
                 </message>
         </alert>
         <alert name="CannotConnectUnknownErrorDarwin">
                 <message name="message">
-                        无法连接到[SECOND_LIFE].
-尽管我们�了最大努力, �有一些��预知的错误�生。
-请登陆the SecondLife.com 网站，与技术支�部门
-�系并报告问题。如果有�能，请附上你的
-�于: C:Documents and Settings(name)Application DataSecondLifelogs的
-SecondLife.log文件。谢谢。
+                        无法连接到 [SECOND_LIFE]。
+尽管我们尽了最大努力, 一些��知的错误导致了
+这次连接失败。请�试登陆SecondLife.com网站的
+技术支�部门，并报告问题，如果�能，请附上你的
+SecondLife.log文件，文件路径为: 
+~/Library/Application Support/SecondLife/logs 
+谢谢。
                 </message>
         </alert>
         <alert name="CannotResolveLoginToken">
                 <message name="message">
-                        处�你的注册�明时出错。
-请�试�新注册一�。
+                        处�你的登陆令牌时出错。
+请�试�新登陆一�。
+
 如果�续收到这个错误，
-请登陆SecondLife.com 网站上的
-支�中心。
+请登陆 www.secondlife.com/support .
                 </message>
         </alert>
         <alert name="CannotConnectNoMessage">
                 <message name="message">
-                        未知问题出现.
-（从�务器收到空白错误信�.）
+                        连接时�生未知的问题。
+（从�务器收到空白错误信�。）
  
-请几分钟��试,或者点击帮助
-获得建议和到达系统状�的网页链接。
+请���试, 或点击帮助
+获得建议和到系统状�网页的链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
@@ -1048,13 +1170,13 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="CannotConnectNoReplyFromLogin">
                 <message name="message">
-                        无法连接。 登陆数�库没有回�。
+                        无法连接。 模拟器没有登陆回应。
  
 请几分钟��试, 或点击帮助
-获得建议和到达系统状�的网页链接。
+获得建议和到系统状�网页的链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
@@ -1062,17 +1184,17 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="CannotConnectLoginTimeout">
                 <message name="message">
-                        等待你在世界中注册�置的时间已过。请�新�试。
+                        等待你在世界中注册�置超时。请�新�试。
                 </message>
         </alert>
         <alert name="FirstRunDialog">
                 <message name="message">
                         [SECOND_LIFE] 安装已完�。
  
-这是你第一次使用[SECOND_LIFE], 登陆�你
+如果这是你第一次使用[SECOND_LIFE], 登陆�你
 需�创建一个新�户。
  
-返回www.secondlife.com创建账户?
+返回 www.secondlife.com 创建账户?
                 </message>
                 <option name="NewAccount...">
                         新�户...
@@ -1083,41 +1205,27 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="ClothingStillDownloading">
                 <message name="message">
-                        你的装��在下载中。
-你现在�以按正常的使用这个世界，
-其他用户也�以看�你。
+                        你的化身�在下载中。
+你现在�以正常地使用 [SECOND_LIFE]，
+其他用户也�以正常地看�你。
                 </message>
         </alert>
         <alert name="CannotResolveDomain">
                 <message name="message">
-                        无法连接到�务器.
+                        无法连接到�务器。
 无法找到域�: [DOMAIN]
+
 请检查你的网络连接。
                 </message>
         </alert>
-        <alert name="CannotConnectLoginPacket">
-                <message name="message">
-                        无法连接。登陆�务器未收到任何登陆
-信�.
- 
-请几分钟��试, 或点击帮助
-获得建议和到达系统状�的网页链接。
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-                <option name="Help">
-                        帮助
-                </option>
-        </alert>
         <alert name="WelcomeToSecondLife">
                 <message name="message">
                         欢迎�到[SECOND_LIFE]! 
  
-使用箭头键�行走.
+使用方�键�行走。
  
-请选择男性或女性角色. 
-���更改选择.
+请选择男性或女性角色。
+���更改选择。
                 </message>
                 <option name="Male">
                         男性
@@ -1130,9 +1238,9 @@ SecondLife.log文件。谢谢。
                 <message name="message">
                         欢迎�到[SECOND_LIFE]! 
  
-使用箭头键�行走.
+使用方�键�行走。
  
-请选择男性或女性角色.
+请选择男性或女性角色。
                 </message>
                 <option name="Male">
                         男性
@@ -1141,40 +1249,16 @@ SecondLife.log文件。谢谢。
                         女性
                 </option>
         </alert>
-        <alert name="WebLaunchSupport">
-                <message name="message">
-                        �系[SECOND_LIFE]支�中心.
-                </message>
-                <option name="Gotopage">
-                        翻页
-                </option>
-                <option name="Cancel">
-                        �消
-                </option>
-        </alert>
-        <alert name="ConfirmQuit">
-                <message name="message">
-                        确定退出?
-                </message>
-                <option name="Yes">
-                        是
-                </option>
-                <option name="No">
-                        �
-                </option>
-        </alert>
         <alert name="RegionNoTerraforming">
                 <message name="message">
-                        地区[REGION]��许改�地形。
-你将需�在世界的别处购买土地
-�改�它的地形。
+                        [REGION] 地区��许改�地形。
                 </message>
         </alert>
         <alert name="CannotCopyWarning">
                 <message name="message">
-                        你没有拿到�制此项物�的许�。
+                        你没有�制此项物�的许�。
 如果�出它，你将彻底失去
-此项物�.你是�真的�
+此项物�。你是�真的�
 �供这项物�?
                 </message>
                 <option name="Yes">
@@ -1186,7 +1270,7 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="CannotGiveItem">
                 <message name="message">
-                        无法�供库存的目录内容。
+                        无法给与库存物�。
                 </message>
         </alert>
         <alert name="TransactionCancelled">
@@ -1196,20 +1280,20 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="TooManyItems">
                 <message name="message">
-                        一次库存转移无法包括这么多物�。
+                        一次库存转移中�能给与多于 42 件物�。
                 </message>
         </alert>
         <alert name="NoItems">
                 <message name="message">
-                        你�能�供任何物�。
+                        你没有�利传�所选的物�。
                 </message>
         </alert>
         <alert name="CannotCopyCountItems">
                 <message name="message">
-                        你没有�制所选�目 [COUNT]次的许�。
-这些�目将从你的库存中被
-除去。
-你真的�给出这些�目�
+                        你没有�制所选物�中的 [COUNT]件的许�。
+这些�目将从你的库存中被除去。
+
+你真的�给出这些物��？
                 </message>
                 <option name="Yes">
                         是
@@ -1220,20 +1304,36 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="CannotGiveCategory">
                 <message name="message">
-                        无法�供库存的目录分类内容.
+                        你没有�利传�所选的文件夹。
                 </message>
         </alert>
         <alert name="FreezeAvatar">
                 <message name="message">
-                        冻结此化身?
-他或她将暂时无法移动,交谈
+                        冻结此化身？
+他或她将暂时无法移动�交谈
+或与世界互动。
+                </message>
+                <option name="Freeze">
+                        �定
+                </option>
+                <option name="Unfreeze">
+                        解�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="FreezeAvatarFullname">
+                <message name="message">
+                        冻结 [AVATAR_NAME]?
+他或她将暂时无法移动�交谈
 或与世界互动。
                 </message>
                 <option name="Freeze">
                         �定
                 </option>
                 <option name="Unfreeze">
-                        解�定
+                        解�
                 </option>
                 <option name="Cancel">
                         �消
@@ -1241,13 +1341,27 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="EjectAvatar">
                 <message name="message">
-                        将这个化身�出你的地盘?
+                        将这个化身�出你的土地?
+                </message>
+                <option name="Eject">
+                        驱除
+                </option>
+                <option name="EjectandBan">
+                        驱除并��
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="EjectAvatarFullname">
+                <message name="message">
+                        将 [AVATAR_NAME] �出你的土地?
                 </message>
                 <option name="Eject">
                         驱除
                 </option>
                 <option name="EjectandBan">
-                        驱除并�止
+                        驱除并��
                 </option>
                 <option name="Cancel">
                         �消
@@ -1255,29 +1369,28 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="InvalidUUID">
                 <message name="message">
-                        Not a valid uuid
+                        �是有效的 UUID
                 </message>
         </alert>
         <alert name="AcquireErrorTooManyObjects">
                 <message name="message">
-                        获�错误: 选择的东东太多。
+                        获�错误: 选择的物体太多。
                 </message>
         </alert>
         <alert name="AcquireErrorObjectSpan">
                 <message name="message">
-                        获�错误: 东东跨区。
-请将所有待获得东东移至
+                        获�错误: 物体处在��一个区域内。
+请将所有待获得物体移至
 �一区域。
                 </message>
         </alert>
         <alert name="TakeLockedOrNotOwnedBy">
                 <message name="message">
-                        最少有一件东东被�定或�属于你。
-如果有�件东东本�属于你而你�拿走了它, 
-东东使用下一个主人许��时，有�能会
-�止你在未�修改或�制它的
-能力。
-然而,你还是�以执行目�的选择。
+                        最少有一件物体被�定或�属于你。
+如果有�件物体本�属于你而你�拿走了它, 
+下个拥有者�利将对该物体适用并�能�制
+你�制或修改它的�利。
+
 你确定�拿走物��里的东西�?
                 </message>
                 <option name="Yes">
@@ -1291,11 +1404,10 @@ SecondLife.log文件。谢谢。
                 <message name="message">
                         [EXTRA]
  
- 
-登陆[URL]获得更多购买现钞的机会?
+登陆 [URL] 查询购买货�的资料？
                 </message>
                 <option name="GotoPage">
-                        回主页
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
@@ -1303,61 +1415,61 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="UnableToLinkObjects">
                 <message name="message">
-                        无法连接数�为[COUNT]的东东.
-你�能连接最多数�为[MAX]的东东.
-请�试选择数�较少的东东.
+                        无法链接 [COUNT] 个物体。
+您最多�以链接 [MAX]个物体。
                 </message>
         </alert>
         <alert name="CannotLinkIncompleteSet">
                 <message name="message">
-                        你�能对完整东东进行连接,
-并且一次必须选定多个东东.
+                        你�能对完整的物体进行链接，
+并且一次必须选定多个物体。
                 </message>
         </alert>
         <alert name="CannotLinkModify">
                 <message name="message">
-                        无法到达链接，因为你没有更改所有东东的许�设置。
-请确定没有东东被�定，并且所有东东都
-归你所有。
+                        无法进行链接，因为你并�在全部所选物体上
+都有更改�利。
+
+请确定没有物体被�定，并且所有物体都归你所有。
                 </message>
         </alert>
         <alert name="CannotLinkDifferentOwners">
                 <message name="message">
-                        无法到达链接，因为所有东东�属于�一个人。
-请确定所选定东东全部归你所有。
+                        无法进行链接，因为并�是所有物体都属于�一个人。
+请确定所有物体都归你所有。
                 </message>
         </alert>
         <alert name="NoFileExtension">
                 <message name="message">
                         此文件没有文件拓展�: &apos;[FILE]&apos;
+                        
 请确�文件有其正确的拓展�。
                 </message>
         </alert>
         <alert name="InvalidFileExtension">
                 <message name="message">
-                        文件拓展�[EXTENSION]��用。
-期望使用[VALIDS]
+                        无效的文件拓展� [EXTENSION]
+期待的 [VALIDS]
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="CannotUploadSoundFile">
                 <message name="message">
-                        由于读�文件:[FILE]，所以�能
-打开上传的声音文件。
+                        �能打开上传的声音文件 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotRIFF">
                 <message name="message">
-                        文件无法以 RIFF WAVE file: 
-[FILE]形�打开
+                        文件��是 RIFF WAVE 格�: 
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileNotPCM">
                 <message name="message">
-                        文件无法以 PCM WAVE 有声文件: 
-[FILE]形�打开
+                        文件��是 PCM WAVE 格�:
+[FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidChannelCount">
@@ -1368,48 +1480,50 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="SoundFileInvalidSampleRate">
                 <message name="message">
-                        文件中的速率�是支�样本速率(应该为44.1k): 
+                        文件的频率�是支�采样频率 (必须为 44.1k): 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidWordSize">
                 <message name="message">
-                        文件中的文字尺寸�是支�文字尺寸 (应改为8 or 16比特): 
+                        文件��是支�的字长 (应该为 8 或 16 �): 
 [FILE]
                 </message>
         </alert>
         <alert name="SoundFileInvalidHeader">
                 <message name="message">
-                        在WAV标题文件：[文件]中无法找到 
- &apos;data&apos; 模�
+                        在 WAV 文件头中无法找到 &apos;data&apos; 模�:
+[文件]
                 </message>
         </alert>
         <alert name="SoundFileInvalidTooLong">
                 <message name="message">
-                        声音文件过长(最长10秒): 
+                        声音文件过长 (最长 10 秒): 
 [FILE]
                 </message>
         </alert>
         <alert name="ProblemWithFile">
                 <message name="message">
-                        出错文件[FILE]:
+                        文件 [FILE] 有问题:
  
 [ERROR]
                 </message>
         </alert>
         <alert name="CannotOpenTemporarySoundFile">
                 <message name="message">
-                        由于写入文件: [FILE]则�能打开暂时压缩声音文件。
+                        无法写入压缩的声音临时文件:
+                [FILE]
                 </message>
         </alert>
         <alert name="UnknownVorbisEncodeFailure">
                 <message name="message">
-                        未知代�错误的文件: [FILE]
+                        对文件进行 Vorbis 编�时�生错误：
+                        [FILE]
                 </message>
         </alert>
         <alert name="CorruptResourceFile">
                 <message name="message">
-                        误用的资�文件: [FILE]
+                        崩�的的资�文件: [FILE]
                 </message>
         </alert>
         <alert name="UnknownResourceFileVersion">
@@ -1419,155 +1533,171 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="UnableToCreateOutputFile">
                 <message name="message">
-                        无法创造输出文件：: [FILE]
+                        无法创建输出文件: [FILE]
                 </message>
         </alert>
         <alert name="DoNotSupportBulkAnimationUpload">
                 <message name="message">
-                        我们现在�支�大�上传动画文件.
+                        我们现在�支�大宗上传动画文件。
                 </message>
         </alert>
         <alert name="CannotAccessOutputFile">
                 <message name="message">
-                        无法到达输出文件: [FILE]
+                        无法访问输出文件: [FILE]
                 </message>
         </alert>
         <alert name="InsufficientFundsToUploadFile">
                 <message name="message">
-                        有足够的资金以完�[FILE]的上传:花费为 L$[COST], 结余为L$[结余]
+                        上传需�的 L$ �够: 花费为 L$[COST], 您的结余为 L$[BALANCE]
                 </message>
         </alert>
         <alert name="InsufficientFundsToFinishUpload">
                 <message name="message">
-                        没有足够的资金以完�[FILE]的上传:花费为 L$[COST], 结余为L$[结余]
+                        没有足够的 L$ 以完�[FILE]的上传: 花费为 L$[COST], 您的结余为 L$[BALANCE]
                 </message>
         </alert>
         <alert name="CannotUploadReason">
                 <message name="message">
-                        无法上传文件[FILE]，导致原因为: [REASON]
+                        无法上传文件[FILE]，原因为: [REASON]
 请���试。
                 </message>
         </alert>
         <alert name="CannotCreateLandmarkNotOwner">
                 <message name="message">
-                        你�能在此设定路标，因为
-地主��许这样�。
-请移动一段�离�加以设定。
+                        你�能在此设定地标，因为
+土地所有人��许这样�。
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoScripts">
                 <message name="message">
-                        无法实现编辑。
-选择有�用脚本的东东。
+                        无法�新编译。
+                        
+请选择有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotRecompileSelectObjectsNoPermission">
                 <message name="message">
-                        无法实现编辑。
-选择被你�许修改脚本的
-东东。
+                        无法�新编译。
+                        
+请选择你能够修改的有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoScripts">
                 <message name="message">
-                        无法实现�置。
-选择有�用脚本的东东。
+                        无法�置脚本。
+                        
+请选择有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotResetSelectObjectsNoPermission">
                 <message name="message">
-                        无法实现�置。
-选择被你�许修改脚本的
-东东。
+                        无法�置脚本。
+                        
+请选择你能够修改的有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoScripts">
                 <message name="message">
                         无法设置任何脚本为�行。
-选择具有�用脚本的东东。
+                        
+请选择有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotSetRunningSelectObjectsNoPermission">
                 <message name="message">
                         无法设置任何脚本为�行。
-选择被你�许�以修改脚本的
-东东。
+                        
+请选择你能够修改的有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoScripts">
                 <message name="message">
                         无法设置任何脚本为��行。
-选择具有�用脚本的东东。
+
+请选择有脚本的物体。
                 </message>
         </alert>
         <alert name="CannotSetRunningNotSelectObjectsNoPermission">
                 <message name="message">
                         无法设置任何脚本为��行。
-选择被你�许�以修改脚本的
-东东。
+                        
+请选择你能够修改的有脚本的物体。
                 </message>
         </alert>
         <alert name="NoFrontmostFloater">
                 <message name="message">
-                        No frontmost floater to save
+                        没有��存的�置浮动框
+                </message>
+        </alert>
+        <alert name="SeachFilteredOnShortWords">
+                <message name="message">
+                        您的查询已被更改，其中过短的�被去除。
+
+最��索了: [FINALQUERY]
+                </message>
+        </alert>
+        <alert name="SeachFilteredOnShortWordsEmpty">
+                <message name="message">
+                        您的�索用字太短
+所以最�并没有执行查找。
                 </message>
         </alert>
         <alert name="ColladaExportFailedUnknownServerError">
                 <message name="message">
-                        克拉达输出失败:未知�务器错误。
+                        Collada 文件输出失败: 未知�务器错误。
                 </message>
         </alert>
         <alert name="ColladaExportFailedInvalidPermissions">
                 <message name="message">
-                        克拉达输出失败: 许��无效或东东�定!
+                        Collada 文件输出失败: 无效��或物体已�定�
                 </message>
         </alert>
         <alert name="ColladaExportFailedUnknownError">
                 <message name="message">
-                        克拉达输出失败:未知错误。
+                        Collada 文件输出失败: 未知错误。
                 </message>
         </alert>
         <alert name="ObjectImportFailedTransfer">
                 <message name="message">
-                        输入东东失败。无法传递文件。
+                        导入物体失败。无法传�文件。
                 </message>
         </alert>
         <alert name="ObjectImportFailedBadFormat">
                 <message name="message">
-                        输入东东失败。文件�是SL接�的文件形�。
+                        导入物体失败。文件�是�接�的 SLObject 格�。
                 </message>
         </alert>
         <alert name="ObjectImportFailedUnknownError">
                 <message name="message">
-                        东东输入失败。未知错误。
+                        导入物体失败。未知错误。
                 </message>
         </alert>
         <alert name="CouldNotTeleportReason">
                 <message name="message">
-                        �能闪电传�。
+                        没能瞬间移动。
 [REASON]
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerNothingSelected">
                 <message name="message">
-                        法设定土地拥有者：
-未选择任何对象。
+                        无法设定土地拥有者：
+未选择任何地�。
                 </message>
         </alert>
         <alert name="CannotSetLandOwnerMultipleRegions">
                 <message name="message">
-                        无法强制土地所属，因为因为选项跨越数个
-区域。请选择一个�积较�的区域并�试。
+                        无法强制土地所有�，因为选项跨越数个
+区域。请选择较�的区域并�试。
                 </message>
         </alert>
         <alert name="ForceOwnerAuctionWarning">
                 <message name="message">
                         这���土地正在��。如果投标已�开始，
-强制拥有将会使���产，并且很有�能
-使其他居民�快。是�强制拥有?
+强制所有�将会使���标，并且很有�能
+使其他居民�快。是�强制所有�?
                 </message>
                 <option name="Force">
-                        强迫
+                        强制
                 </option>
                 <option name="Cancel">
                         �消
@@ -1587,7 +1717,7 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="CannotReleaseLandNothingSelected">
                 <message name="message">
-                        无法放弃土地:
+                        无法放弃土地: 
 未选中任何对象。
                 </message>
         </alert>
@@ -1609,16 +1739,22 @@ SecondLife.log文件。谢谢。
 无法找到该土地所在区域。
                 </message>
         </alert>
+        <alert name="CannotCloseFloaterBuyLand">
+                <message name="message">
+                        在第二人生完�对这次交易的估价�，
+你�能关闭“购买土地�窗�。
+                </message>
+        </alert>
         <alert name="CannotDeedLandNothingSelected">
                 <message name="message">
                         无法转让土地:
-未选中任何对象.
+没有选择地�。
                 </message>
         </alert>
         <alert name="CannotDeedLandNoGroup">
                 <message name="message">
                         无法转让土地:
-没有社团.
+没有选择社团。
                 </message>
         </alert>
         <alert name="CannotDeedLandNoRegion">
@@ -1628,18 +1764,6 @@ SecondLife.log文件。谢谢。
 请使用帮助 -&gt; 报告�洞�报告此项错误。
                 </message>
         </alert>
-        <alert name="CannotSetLandOwnerNothingSelected">
-                <message name="message">
-                        法设定土地拥有者：
-未选择任何对象。
-                </message>
-        </alert>
-        <alert name="CannotBuyLandMultipleRegions">
-                <message name="message">
-                        无法购买土地，因为选项跨越的区域太多。
-请选择一个�一点的�积，并�试。
-                </message>
-        </alert>
         <alert name="CannotBuyLandMultipleSelected">
                 <message name="message">
                         无法购买土地:
@@ -1647,60 +1771,27 @@ SecondLife.log文件。谢谢。
 请选择一�较�的�积。
                 </message>
         </alert>
-        <alert name="CannotDeedLandMultipleSelected">
-                <message name="message">
-                        无法转让土地:
-选中的����土地数�太多。
-请选择一�较�的�积。
-                </message>
-        </alert>
         <alert name="RegionNotFound">
                 <message name="message">
                         没有找到此地区
                 </message>
         </alert>
-        <alert name="ParcelCanPlayMusic">
-                <message name="message">
-                        这个地方�以播放�动音�。 
- 
-音��求 768 kbps 或者更快的
-网络连接速度。
- 
-如果网络�用，是�播放音�?
-                </message>
-                <option name="PlayMusic">
-                        播放音�
-                </option>
-                <option name="Disable">
-                        �止
-                </option>
-        </alert>
         <alert name="ParcelCanPlayMedia">
                 <message name="message">
-                        T这个地方�以播放�动视频。 
- 
-�动视频�求768 kbps或者
-更快的网络连接速度。
- 
-如果网络�用，是�播放�动视频?
+                        这个地方�以播放�媒体。 
+�媒体需�较快的网络连接。
  
-(你�以�候在�数选择 &gt;音频 &amp;视频
-下改�选项。)
+如果网络�用，是�播放�媒体?
+(你�以��在 首选项 &gt; 音频和视频 中
+更改这个选项。)
                 </message>
-                <option name="PlayMedia">
-                        播放多媒体
+                <option name="PlayMusic">
+                        播放媒体
                 </option>
                 <option name="Disable">
                         �止
                 </option>
         </alert>
-        <alert name="CannotBuyLandWaitingForServer">
-                <message name="message">
-                        无法购买土地:
-等到�务器报告花费。
-请�候�试。
-                </message>
-        </alert>
         <alert name="CannotDeedLandWaitingForServer">
                 <message name="message">
                         无法转让土地:
@@ -1708,109 +1799,67 @@ SecondLife.log文件。谢谢。
 请�候�试。
                 </message>
         </alert>
-        <alert name="CannotBuyLandNoPublic">
-                <message name="message">
-                        无法购买土地:
-选择中�包�任何公共土地。
-                </message>
-        </alert>
-        <alert name="CannotBuyLandLandOwned">
-                <message name="message">
-                        无法购买土地:
-所选的土地属于�外一个用户。
-请�新选择一个较�的�积。
-                </message>
-        </alert>
-        <alert name="CannotButLandRegionNotFound">
-                <message name="message">
-                        无法购买土地:
-无法找到该土地所在区域。
-请使用帮助 -&gt; 报告�洞��我们报告这项错误。
-                </message>
-        </alert>
-        <alert name="CannotBuyLandNoTransfer">
-                <message name="message">
-                        无法购买土地:
-区域[REGION]��许转移土地。
-                </message>
-        </alert>
         <alert name="CannotDeedLandNoTransfer">
                 <message name="message">
                         无法转让土地:
-区域[REGION]��许转移土地。
-                </message>
-        </alert>
-        <alert name="CannotBuyLandForGroupNotOfficer">
-                <message name="message">
-                        无法为这个社团购买土地:
-你在目�的社团里�是社团官员
-激活�一个社团请使用编辑 -&gt; 社团...
-                </message>
-        </alert>
-        <alert name="CannotBuyLandInsufficientFunds">
-                <message name="message">
-                        购买�积为[�积]平方米的土地需�L$[价格].
-你�有 L$[资产表]。
-                </message>
-        </alert>
-        <alert name="CannotReleaseLandNothingSelected">
-                <message name="message">
-                        无法放弃土地:
-未选中任何对象。
+区域 [REGION] ��许转移土地。
                 </message>
         </alert>
         <alert name="CannotReleaseLandWatingForServer">
                 <message name="message">
                         无法放弃土地:
-等待�务器报告花费。
+正等待�务器更新地�信�。
+                        
 几秒钟�请��试一次。
                 </message>
         </alert>
         <alert name="CannotReleaseLandSelected">
                 <message name="message">
                         无法放弃土地:
-选中的��土地数�太多。
-请选择一�较�的�积。
+你并�拥有所有选中的地�。
+
+请选择�个地�。
                 </message>
         </alert>
         <alert name="CannotReleaseLandDontOwn">
                 <message name="message">
                         无法放弃土地:
-你没有让出这�土地的许��.
-你拥有的土地在游�世界中是绿色.
+你没有让出这�土地的许�。
+你拥有的土地在世界中是绿色。
                 </message>
         </alert>
         <alert name="CannotReleaseLandRegionNotFound">
                 <message name="message">
                         无法放弃土地:
 无法找到此土地所属的区域。
+
 请使用帮助 -&gt; 报告�洞�报告这个错误。
                 </message>
         </alert>
         <alert name="CannotReleaseLandNoTransfer">
                 <message name="message">
                         无法放弃土地:
-区域[REGION]内��许转移土地。
+区域 [REGION] 内��许转移土地。
                 </message>
         </alert>
         <alert name="CannotReleaseLandPartialSelection">
                 <message name="message">
                         无法放弃土地:
-你必须选中全部��土地�能使用此功能。
-�试�击�选中全部��土地,或者 
-分割你的��土地。
+你必须选中整个地��能使用此功能。
+�试�击�选中全部地�,或者 
+先分割你的地�。
                 </message>
         </alert>
         <alert name="ReleaseLandWarning">
                 <message name="message">
-                        你将放弃�积为[AREA]平方米的土地。
+                        你将放弃�积为 [AREA] 平方米的土地。
 放弃该土地会将他从你拥有的土地中
-移走, �会兑��任何现金.
+移走, �会兑��任何 L$。
  
 是�放弃土地?
                 </message>
                 <option name="Release">
-                        �动
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -1825,15 +1874,15 @@ SecondLife.log文件。谢谢。
         <alert name="CannotDivideLandPartialSelection">
                 <message name="message">
                         无法划分土地:
-你选择了一整���土地。
-请使用点击，拖带的方法选用一��积较�
-的土地。
+                        
+你选择了整�地�。
+请选择该地�的一部分。
                 </message>
         </alert>
         <alert name="LandDivideWarning">
                 <message name="message">
-                        分割次此土地会造���土地一分为二，
-且����土地会�留原�置。�作�功�，
+                        分割此土地会将地�一分为二，
+且��地�会�留原�置。�作�功�，
 一些设置会被�置为默认值。
  
 是�分割土地?
@@ -1855,8 +1904,8 @@ SecondLife.log文件。谢谢。
         <alert name="CannotJoinLandNoRegion">
                 <message name="message">
                         无法连接土地:
-无法找到该土地所属的区域.
-请使用帮助 -&gt; 报告程��洞,让我们知�问题所在.
+无法找到该土地所属的区域。
+请使用帮助 -&gt; 报告程��洞，让我们知�问题所在。
                 </message>
         </alert>
         <alert name="CannotJoinLandNothingSelected">
@@ -1868,39 +1917,49 @@ SecondLife.log文件。谢谢。
         <alert name="CannotJoinLandEntireParcelSelected">
                 <message name="message">
                         无法�并土地:
-你已�选中一�完整的��土地。
-请�试点击并拖动，选择一��积较大
-的区域。
+您�选择了�个地�。
+
+请选择跨两个地�的区域。
                 </message>
         </alert>
         <alert name="CannotJoinLandSelection">
                 <message name="message">
                         无法�并土地:
-你必须选择一�以上的��土地.
-请�试点击并拖动，选择一��积较大
-的区域。
+您必须选择一个以上的地�。
+
+请选择跨两个地�的区域。
                 </message>
         </alert>
         <alert name="JoinLandWarning">
                 <message name="message">
-                        连接土地需�在与所选矩形相交的所有
-��土地外创建新的更大的��土地。
+                        �并土地将从与所选矩形相交的所有
+地�创建新的地�。
  
-你必须�置新��土地的�称和买�
-特�。 
+你必须�置这一新地�的�称和选项。
  
-是�连接土地?
+是��并土地?
                 </message>
                 <option name="Join">
-                        加入
+                        �并
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
+        <alert name="ConfirmNotecardSave">
+                <message name="message">
+                        �有�存这张记事�之�，此项物���以�制或查看。是��存记事�？
+                </message>
+                <option name="Save">
+                        是的，请�存
+                </option>
+                <option name="Cancel">
+                        �消�存
+                </option>
+        </alert>
         <alert name="ConfirmLandmarkCopy">
                 <message name="message">
-                        �制此物�至你的库存?
+                        �制此地标至你的库存？
                 </message>
                 <option name="Copy">
                         �制
@@ -1911,7 +1970,7 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="ConfirmItemCopy">
                 <message name="message">
-                        �制此物�至你的库存?
+                        �制此物�至你的库存？
                 </message>
                 <option name="Copy">
                         �制
@@ -1922,41 +1981,42 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="ResolutionSwitchFail">
                 <message name="message">
-                        无法用[RESY]置�[RESX]
+                        切�分辨率到 [RESX] × [RESY] 失败
                 </message>
         </alert>
         <alert name="ErrorUndefinedGrasses">
                 <message name="message">
-                        错误: 为定义��: [�类]
+                        错误: 未定义��: [SPECIES]
                 </message>
         </alert>
         <alert name="ErrorUndefinedTrees">
                 <message name="message">
-                        错误:为定义树木: [�类]
+                        错误: 未定义树木: [SPECIES]
                 </message>
         </alert>
         <alert name="CannotSaveWearableOutOfSpace">
                 <message name="message">
-                        无法储存&apos;[NAME]&apos;至衣物文档.你�能需�
-释放部分电脑存储空间��新储存
-至衣物文档.
+                        无法储存 &apos;[NAME]&apos; 到装�文件。你�能需�
+释放部分电脑存储空间��新储存。
                 </message>
         </alert>
         <alert name="CannotSaveToAssetStore">
                 <message name="message">
-                        无法储存[NAME]至终属资产存储.
-这通常是暂时性功能障�。请用户化��次�存。
+                        无法储存 [NAME] 至中央资料�务器。
+这通常�是临时的问题。请自定义��次�存。
+
 如果问题�然存在，请点击
 帮助/报告�洞并�供
-客户网络设置的具体信�。
+您的网络设置的具体信�。
                 </message>
         </alert>
         <alert name="AppEarlyExit">
                 <message name="message">
                         [MESSAGE]
  
-我们无法修�该错误。请
-请�载并�新安装，并�次�试。如果错误�存在，
+我们无法修�该错误。
+
+请�载并�新安装，然��次�试。如果错误�存在，
 请登陆www.secondlife.com/support 
 寻求技术支�。
                 </message>
@@ -1966,16 +2026,15 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="YouHaveBeenLoggedOut">
                 <message name="message">
-                        你已�退出登陆[SECOND_LIFE]:
+                        你已�退出[SECOND_LIFE]:
  
 [MESSAGE]
  
-点击继续�以查看历��时通记录和�天记录。
-你将�能使用其他任何功能进行其它�作。
-点击退出，马上退出SECOND_LIFE]。
+您��以查看历��时通记录和�天记录。
+�则点击退出将立�关闭 [SECOND_LIFE]。
                 </message>
                 <option name="Continue">
-                        继续
+                        查看�天记录
                 </option>
                 <option name="Quit">
                         退出
@@ -1984,18 +2043,37 @@ SecondLife.log文件。谢谢。
         <alert name="OnlyOfficerCanBuyLand">
                 <message name="message">
                         无法为社团购买土地:
-你没有为你的活动社团购买土地的许��.
-请激活�一社团，使用编辑 -&gt; 社团...
+你没有为你的活动社团购买土地的许�。
                 </message>
         </alert>
         <alert name="AddFriend" title="添加朋�">
                 <message name="message">
-                        好�们�以在地图上互相追踪，并�以在线接�更新信�. 
+                        好��以互相�许对方
+在地图上找到自己，
+以�接�上线通知。
  
-是����谊�给[NAME]?
+是��议 [NAME] �为好�？
                 </message>
                 <option name="Offer">
-                        接收
+                        �议
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="AddFriendWithMessage" title="添加朋�">
+                <message name="message">
+                        好��以互相�许对方
+在地图上找到自己，
+以�接�上线通知。
+ 
+是��议 [NAME] �为好�？
+                </message>
+                <editline name="editline">
+                        我们�朋�好�?
+                </editline>
+                <option name="Offer">
+                        �议
                 </option>
                 <option name="Cancel">
                         �消
@@ -2003,7 +2081,7 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="RemoveFromFriends">
                 <message name="message">
-                        你是��将[FIRST_NAME] [LAST_NAME] 移出你的朋�圈?
+                        你是��将[FIRST_NAME] [LAST_NAME] 从好�列表中去除？
                 </message>
                 <option name="Remove">
                         移除
@@ -2012,17 +2090,26 @@ SecondLife.log文件。谢谢。
                         �消
                 </option>
         </alert>
-        <alert name="GodDeleteAllScriptedPublicObjectsByUser">
+        <alert name="RemoveMultipleFromFriends">
                 <message name="message">
-                        你是�确定愿�删除以下用户
-
- 
+                        你希望从好�列表中移除若干好��？
+                </message>
+                <option name="Remove">
+                        是的，移除
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="GodDeleteAllScriptedPublicObectsByUser">
+                <message name="message">
+                        你是�确定删除用户
 ** [AVATAR_NAME] **
  
-在其他土地上所拥有的所有副本东东？
+在所有他人所有的土地上带有脚本的所有物体？
                 </message>
                 <option name="DELETE!!">
-                        删除!!
+                        全部删掉!!
                 </option>
                 <option name="Cancel">
                         �消
@@ -2030,15 +2117,12 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="GodDeleteAllScriptedObjectsByUser">
                 <message name="message">
-                        你是�确定愿�删除以下用户
-
- 
+                        你是�确定删除用户
 ** [AVATAR_NAME] **
- 
-在所有土地上所拥有的所有东东(无论是�有副本)？
+在该模拟器中 &lt;所有土地&gt; 上带有脚本的所有物体？
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!DELETE ALL!!
+                        全部删掉!!
                 </option>
                 <option name="Cancel">
                         �消
@@ -2046,15 +2130,13 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="GodDeleteAllObjectsByUser">
                 <message name="message">
-                        你是�确定愿�删除以下用户
-
- 
+                        你是�确定删除用户
 ** [AVATAR_NAME] **
- 
-在所有土地上所拥有的所有东东(无论是�有副本)？
+在该模拟器中 &lt;所有土地&gt; 上的所有物体
+(无论是�带有脚本)？
                 </message>
                 <option name="!!DELETEALL!!">
-                        !!DELETE ALL!!
+                        全部删掉!!
                 </option>
                 <option name="Cancel">
                         �消
@@ -2062,36 +2144,36 @@ SecondLife.log文件。谢谢。
         </alert>
         <alert name="PublishGroupInfoToWeb">
                 <message name="message">
-                        选择 &quot;在网络上�布&quot;选项将�许我们�布社团的�称，徽章，规章制度，头衔和创始人至[SECOND_LIFE]网站。如果你�布的内容，根�社区标准规定，涉�到�人内容，你有责任对此作出声明。
+                        选择 &quot;在网络上�布&quot;选项将�许我们�布社团的�称，徽章，规章制度，头衔和创始人至 [SECOND_LIFE] 网站。如果你�布的内容，根�社区标准规定，涉�到�人内容，你有责任对此作出声明。
                 </message>
         </alert>
         <alert name="ErrorEncodingSnapshot">
                 <message name="message">
-                        编�快照错误!
+                        快照编�错误!
                 </message>
         </alert>
         <alert name="BlankClassifiedName">
                 <message name="message">
-                        你必须为你的分类设定一个�是空白的�字。
+                        你必须给分类广告设定一个�字。
                 </message>
         </alert>
         <alert name="MinClassifiedPrice">
                 <message name="message">
-                        Price to pay for listing must be at least L$[MIN_PRICE].
+                        广告刊登出价必须大于 L$[MIN_PRICE]。
  
-Please enter a higher price.
+请输入一个更高的价格。
                 </message>
         </alert>
         <alert name="CantLoadVertexShaders">
                 <message name="message">
-                        无法无法载入Vertex Shaders.
+                        无法载入顶点�色器。
                 </message>
         </alert>
         <alert name="ConfirmObjectDeleteLock">
                 <message name="message">
-                        至少一件东东被�定。
-然而，你�以删除当�选项。
-你确定将这些选项删除�?
+                        您选择的物�中至少有一件被�定。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2102,9 +2184,9 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteNoCopy">
                 <message name="message">
-                        至少一件东东���制。
-然而，你�以删除当�选项。
-你确定将这些选项删除�?
+                        您选择的物�中至少有一件���制。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2115,9 +2197,9 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteNoOwn">
                 <message name="message">
-                        你并没有任何一件东东。
-但是，你�以删除目�的选择内容。
-确定删除所有选项�?
+                        您选择的物�中至少有一件�是你的。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2128,10 +2210,10 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopy">
                 <message name="message">
-                        至少一件东东被�定。
-至少一件东东���制。
-然而，你�以删除目�选项。
-你确定�删除目�选项�?
+                        您选择的物�中至少有一件被�定，
+并且至少有一件���制。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2142,10 +2224,10 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoOwn">
                 <message name="message">
-                        至少有一件东东被�定。
-你并�是至少拥有一件东东。
-然而，你�以删除当�选项。
-你确定将这些选项删除�?
+                        您选择的物�中至少有一件被�定，
+并且至少有一件�是你的。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2156,10 +2238,10 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteNoCopyNoOwn">
                 <message name="message">
-                        至少一件东东���制。
-你并�至少拥有一件东东。
-然而，你�以删除当�选项。
-你确定将这些选项删除�?
+                        您选择的物�中至少有一件���制，
+并且至少有一件�是你的。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2170,11 +2252,11 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectDeleteLockNoCopyNoOwn">
                 <message name="message">
-                        至少一件东东被�定。
-至少一件东东���制。
-你并�至少拥有一件东东。
-然而，你�以删除当�选项。
-你确定将这些选项删除�?
+                        您选择的物�中至少有一件被�定，
+                        至少有一件���制，并且
+                        至少有一件�是你的。
+                        
+您确定�删除这些物体�?
                 </message>
                 <option name="Yes">
                         是
@@ -2185,9 +2267,9 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectTakeLock">
                 <message name="message">
-                        至少一件东东被�定。
-然而，你还是�以选择当�选项。
-你确定选择这些选项�?
+                        您选择的物�中至少有一件被�定。
+                        
+您确定�拿走这些物体�？
                 </message>
                 <option name="Yes">
                         是
@@ -2198,12 +2280,12 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectTakeNoOwn">
                 <message name="message">
-                        你�带的东东并�完全是你所拥有。
-如果继续，下一个拥有者许��的应用
-于东东将有�能�制你在未�
-修改或�制东东的能力。
-但是，你�以�带目�所选的东东。
-确定继续�带这些东东?
+                        您选择的物�中至少有一件�是你的。
+如果有�件物体本�属于你而你�拿走了它, 
+下个拥有者�利将对该物体适用并�能�制
+你�制或修改它的�利。
+
+您确定�拿走这些物体�？
                 </message>
                 <option name="Yes">
                         是
@@ -2214,13 +2296,13 @@ Please enter a higher price.
         </alert>
         <alert name="ConfirmObjectTakeLockNoOwn">
                 <message name="message">
-                        至少有一件东东被�定。
-你所拿走的东东并�完全属于你。
-如果继续，东东使用下一个主人许�时，有�能会
-�止你在未�修改或�制它的
-能力。
-然而,你还是�以执行目�的选择。
-你确定�拿走物��里的东西�?
+                        您选择的物�中至少有一件被�定，
+如果有�件物体本�属于你而你�拿走了它, 
+下个拥有者�利将对该物体适用并�能�制
+你�制或修改它的�利。
+但是你�旧�以拿走当�所选项。
+                
+您确定�拿走这些物体�？
                 </message>
                 <option name="Yes">
                         是
@@ -2237,15 +2319,15 @@ Please enter a higher price.
         </alert>
         <alert name="DeedLandToGroup">
                 <message name="message">
-                        转让这���土地�, 社团需�拥有并
-�留足够的土地使用信用�。
+                        转让这�地��, 社团需�拥有并
+�留足够的土地使用�度。
  
-土地的消费价格�会退还给地主。
-若所转让的��土地被售出，售出价
+土地的购买价格�会退还给所有人。
+若所转让的地�被售出，售出价
 将被平�分给所有组员。
  
-转让这��积为[�积]平方米的土地至社团
-&apos;[社团�称]&apos;?
+转让这��积为 [AREA]平方米的土地至社团
+&apos;[GROUP_NAME]&apos;?
                 </message>
                 <option name="Deed">
                         转让
@@ -2256,18 +2338,18 @@ Please enter a higher price.
         </alert>
         <alert name="DeedLandToGroupWithContribution">
                 <message name="message">
-                        转让这���土地�, 社团需�拥有并
-�留足够的土地使用信用�。
+                        转让这�地��, 社团需�拥有并
+�留足够的土地使用�度。
  
-转让将�时包括土地从个人
- &apos;[FIRST_NAME] [LAST_NAME]&apos;贡献到社团处。
+转让将�时包括
+ &apos;[FIRST_NAME] [LAST_NAME]&apos; 对社团的土地贡献。
  
-土地的消费价格�会退还给地主。
-若所转让的��土地被售出，售出价
+土地的购买价格�会退还给所有人。
+若所转让的地�被售出，售出价
 将被平�分给所有组员。
  
-转让这��积为[�积]平方米的土地至社团
-&apos;[社团�称]&apos;?
+转让这��积为 [AREA]平方米的土地至社团
+&apos;[GROUP_NAME]&apos;?
                 </message>
                 <option name="Deed">
                         转让
@@ -2278,19 +2360,18 @@ Please enter a higher price.
         </alert>
         <alert name="DisplaySetToSafe">
                 <message name="message">
-                        基于您的特殊安全�求，显示设置
-已�被设�安全水平模�。
+                        显示设置已调整为安全水平，因为您指定了 -safe 选项。
                 </message>
         </alert>
         <alert name="DisplaySetToRecommended">
                 <message name="message">
-                        显示设置已�被设置在推�的水平上，推�水平是基于您计算机的系统�置得出的。
+                        基于您计算机的系统�置，显示设置已�被设置在推�的水平上。
                 </message>
         </alert>
         <alert name="UnableToConnect">
                 <message name="message">
                         无法连接到�务器.
-无法请求连接域�: [HOST_NAME]
+无法请求域�: [HOST_NAME]
                 </message>
         </alert>
         <alert name="CanNotFindServer">
@@ -2300,10 +2381,10 @@ Please enter a higher price.
 所引�的结果。
  
 请几分钟��试, 或点击帮助
-获得建议和到达系统状�的网页链接。
+获得建议和到系统状�网页的链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
@@ -2320,10 +2401,10 @@ Please enter a higher price.
                         无法连接到[SECOND_LIFE]
 �能是系统故障。
 请几分钟��试,或者点击帮助
-获得建议和到达系统状�的网页链接。
+获得建议和到系统状�网页的链接。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
@@ -2334,11 +2415,21 @@ Please enter a higher price.
                         [ERROR_MESSAGE]
                 </message>
         </alert>
+        <alert name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        QuickTime 由于过期而被�用
+                </ignore>
+                <message name="message">
+                        由于您的系统上安装的QuickTime版本过期，视频播放已被�用。
+
+请访问 http://www.apple.com/quicktime/ 并下载更新。
+                </message>
+        </alert>
         <alert name="AvatarMoved">
                 <message name="message">
-                        Your [TYPE] location is not currently available.
+                        您 [TYPE] �置当���用。
 [HELP] 
-You have been moved into a nearby region.
+您已被移动至附近的区域。
                 </message>
         </alert>
         <alert name="ClothingLoading">
@@ -2347,15 +2438,18 @@ You have been moved into a nearby region.
 你现在�以按正常的使用这个世界，
 其他用户也�以看�你。
                 </message>
+                <ignore name="ignore">
+                        装�下载时间太长
+                </ignore>
         </alert>
         <alert name="FirstRun">
                 <message name="message">
                         [SECOND_LIFE] 安装已完�。
  
-这是你第一次使用[SECOND_LIFE], 登陆�你
+如果这是你第一次使用[SECOND_LIFE], 登陆�你
 需�创建一个新�户。
  
-返回www.secondlife.com创建账户?
+返回 www.secondlife.com 创建账户?
                 </message>
                 <option name="NewAccount...">
                         新�户...
@@ -2367,43 +2461,43 @@ You have been moved into a nearby region.
         <alert name="SetByHostFail">
                 <message name="message">
                         无法连接到�务器.
-无法找到域�: [HOST_NAME]
+无法解�域�: [HOST_NAME]
+
 请检查你的网络连接.
                 </message>
         </alert>
         <alert name="LoginPacketNeverReceived">
                 <message name="message">
-                        无法连接。登陆�务器未收到任何登陆
-信�.
+                        我们�到了一些连接上的麻烦。问题�能出在您的互�网连接，也�能出在第二人生的�务器。
  
-请几分钟��试, 或点击帮助
-获得建议和到达系统状�的网页链接。
+请几分钟��试, 或点击帮助连接我们的支�页�，或选择 “瞬间移动� ��试瞬间移动回家。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Help">
                         帮助
                 </option>
+                <option name="Teleport">
+                        瞬间移动
+                </option>
         </alert>
         <alert name="WelcomeNoClothes">
                 <message name="message">
                         你的角色将在数秒�出现。
-使用箭头键走动。
- 
-任何时候都�以按F1键获�帮助，或学习更多关于[SECOND_LIFE]的信�.
+                        
+使用方�键�行走。
+任何时候都�以按 F1 键，�获�帮助或学习更多关于 [SECOND_LIFE] 的信�.
                 </message>
         </alert>
         <alert name="WelcomeChooseSex">
                 <message name="message">
                         你的角色将在数秒�出现。
  
-使用方�箭头键控制走路。
- 
-任何时间都�以按F1键获�帮助，或者学习更多关于[SECOND_LIFE]. 
- 
-请选择一个男性或女性的角色。
-你�以之�改�你的选择。
+使用方�键�行走。
+任何时候都�以按 F1 键，�获�帮助或学习更多关于 [SECOND_LIFE] 的信�。
+请选择男性或女性角色。
+以�还是�以改�主�的。
                 </message>
                 <option name="Male">
                         男性
@@ -2414,41 +2508,27 @@ You have been moved into a nearby region.
         </alert>
         <alert name="NotEnoughCurrency">
                 <message name="message">
-                        [NAME] L$ [PRICE] You don&apos;t have enough currency to do that.
+                        [NAME] L$ [PRICE] 您没有足够的 L$ �这样�。
                 </message>
         </alert>
-        <alert name="GrantModRights">
+        <alert name="GrantedModifyRights">
                 <message name="message">
-                        你是���更改对[FIRST_NAME] [LAST_NAME]的�利?
+                        你已�被授予特�，你�以任�修改[FIRST_NAME] [LAST_NAME]的物体。
                 </message>
-                <option name="Yes">
-                        是
-                </option>
-                <option name="No">
-                        �
-                </option>
         </alert>
-        <alert name="RevokeModRights">
+        <alert name="RevokedModifyRights">
                 <message name="message">
-                        你是�撤回更改[FIRST_NAME][LAST_NAME]的�利?
+                        你的特�已�被撤回，你��以�任�修改[FIRST_NAME] [LAST_NAME]的物体。
                 </message>
-                <option name="Yes">
-                        是
-                </option>
-                <option name="No">
-                        �
-                </option>
         </alert>
         <alert name="FlushMapVisibilityCaches">
                 <message name="message">
-                        这样将��跳出地图快照缓存文件.
- 
-这样实际上�对调试有用. 
- 
-(在此过程中,等待5分钟, 知��个人的地图缓存在他们�新登陆�上传�功。
+                        这样将会清空该区域的地图缓存。
+这实际上�对调试有用。
+(在正�环境中，等待 5 分钟，然�所有人的地图将在他们�新登录�更新。)
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -2456,8 +2536,8 @@ You have been moved into a nearby region.
         </alert>
         <alert name="OnlyCopyContentsOfSingleItem">
                 <message name="message">
-                        无法�时�制一个以上的�目.
-请仅选择一项对象，并�新�试.
+                        无法�时�制一个以上物�的内容。
+请仅选择一项物体，并�新�试。
                 </message>
                 <option name="OK">
                         好的
@@ -2468,96 +2548,58 @@ You have been moved into a nearby region.
         </alert>
         <alert name="KickUsersFromRegion">
                 <message name="message">
-                        是�使此区域内所有用户闪电传�回家?
+                        是�将此区域内所有用户瞬间移动回家?
                 </message>
                 <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        �消
-                </option>
-        </alert>
-        <alert name="ReturnScriptedOnOthersLand">
-                <message name="message">
-                        你是�确定愿�归还主人为
-** [USER_NAME] **
-且�在在自己领地内的副本东东？
-                </message>
-                <option name="Return">
-                        返回
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="ReturnScriptedOnAllLand">
+        <alert name="EstateObjectReturn">
                 <message name="message">
-                        你是�确定�删除以下用户
-** [USER_NAME] **在区域内所有土地上的副本东东?
+                        您是��返还
+[USER_NAME]
+拥有的物体？
                 </message>
                 <option name="Return">
-                        返回
+                        返还
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="InvalidTerrainBitDepthSmall">
-                <message name="message">
-                        无法设置区域的�质: 
- 
-基本�质[TEXTURE_NUM]的�素[TEXTURE_BIT_DEPTH]无效. 
- 
-替�基础�质[TEXTURE_NUM]为128x128�素24�图片, 然��次点击&quot;设置&quot;.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainSizeSmall">
-                <message name="message">
-                        无法设置区域内的�质: 
- 
-基础�质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]无效. 
- 
-替�基础�质[TEXTURE_NUM]为128x128�素24�图片, 然��次点击&quot;设置&quot;.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainBitDepthLarge">
-                <message name="message">
-                        无法设置区域的�质: 
- 
-基本�质[TEXTURE_NUM]的�素[TEXTURE_BIT_DEPTH]无效. 
- 
-替�基础�质[TEXTURE_NUM]为512512x512�素或更�的24�图片, 然��次点击&quot;设置&quot;.
-                </message>
-        </alert>
-        <alert name="InvalidTerrainWidthLarge">
+        <alert name="InvalidTerrainBitDepth">
                 <message name="message">
-                        无法设置区域内的�质: 
- 
-基础�质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]太宽以至无效. 
+                        无法设定区域的�质: 
+地��质 [TEXTURE_NUM] 的色彩深度 [TEXTURE_BIT_DEPTH] 无效。
  
-替�基础�质[TEXTURE_NUM]为512x512�素或更�的24�图片, 然��次点击&quot;设置&quot;.
+请把目�的地��质 [TEXTURE_NUM] 替�为 24 � 
+512×512 分辨率或者更�的图片，然��次点击 ‘应用’.
                 </message>
         </alert>
-        <alert name="InvalidTerrainHeightLarge">
+        <alert name="InvalidTerrainSize">
                 <message name="message">
-                        无法设置区域内的�质: 
+                        无法设置区域的质地: 
  
-基础�质[TEXTURE_NUM]的尺寸[TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]太高以至无效. 
+地��质 [TEXTURE_NUM] 的尺寸 [TEXTURE_SIZE_X]×[TEXTURE_SIZE_Y] 过大。
  
-替�基础�质[TEXTURE_NUM]为512x512�素或更�的24�图片, 然��次点击&quot;设置&quot;.
+请把目�的地��质 [TEXTURE_NUM] 替�为 24 � 
+512×512 分辨率或者更�的图片，然��次点击 ‘应用’.
                 </message>
         </alert>
         <alert name="RawUploadStarted">
                 <message name="message">
-                        上载开始. 这个过程�能�续2分钟, 具体时间�决于你的网络连接速度.
+                        上载开始。这个过程�能�续2分钟, 具体时间�决于你的网络连接速度.
                 </message>
         </alert>
         <alert name="ConfirmBakeTerrain">
                 <message name="message">
-                        是你�真的愿�烧硬当�的地形, 使得它�为地形上�或下��值的中间值，并且默认&apos;��&apos;工具?
+                        是你�真的愿�烘烤当�的地形, 使得它�为地形上�或下��制的中间值，以�‘��’工具的默认值?
                 </message>
                 <option name="Bake">
-                        �硬
+                        烘烤
                 </option>
                 <option name="Cancel">
                         �消
@@ -2565,38 +2607,44 @@ You have been moved into a nearby region.
         </alert>
         <alert name="MaxAllowedAgentOnRegion">
                 <message name="message">
-                        你�能有[MAX_AGENTS]�许的居民。
+                        你最多�能列出 [MAX_AGENTS]��许的居民。
                 </message>
         </alert>
         <alert name="MaxAllowedGroupsOnRegion">
                 <message name="message">
-                        你�能有[MAX_GROUPS]�许的社团。
+                        你�能有[MAX_GROUPS]个�许的社团。
                 </message>
                 <option name="Bake">
-                        执行
+                        烘烤
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
+        <alert name="MaxAgentOnRegionBatch">
+                <message name="message">
+                        �试添加 [NUM_ADDED] �代表时失败:
+超出 [LIST_TYPE] [MAX_AGENTS]�的�制 [NUM_EXCESS]�。
+                </message>
+        </alert>
         <alert name="MaxBannedAgentsOnRegion">
                 <message name="message">
-                        你�能有[MAX_BANNED]�止的居民。
+                        你最多�能列出 [MAX_BANNED] ��止的居民。
                 </message>
         </alert>
         <alert name="MaxManagersOnRegion">
                 <message name="message">
-                        你�能有[MAX_MANAGER]�止的居民。
+                        您最多�能有 [MAX_MANAGER]�地产管�人。
                 </message>
         </alert>
         <alert name="OwnerCanNotBeDenied">
                 <message name="message">
-                        �能添加�动产主人至&apos;拒�进入&apos; ��.
+                        �能添加地产主人至 ‘拒�进入’ ��.
                 </message>
         </alert>
         <alert name="CanNotChangeAppearanceUntilLoaded">
                 <message name="message">
-                        衣�和身体载入之��能更改外形。
+                        衣�和身体载入之��能更改外表。
                 </message>
         </alert>
         <alert name="ClassifiedMustBeAlphanumeric">
@@ -2606,8 +2654,8 @@ You have been moved into a nearby region.
         </alert>
         <alert name="CantSetBuyObject">
                 <message name="message">
-                        无法购买东东, 因为此东东是���. 
-请把东东设置为待售状�并�试.
+                        �能设置购买物体, 因为此物体是���。
+请把物体设置为待售状�并�试。
                 </message>
         </alert>
         <alert name="FinishedRawDownload">
@@ -2618,10 +2666,10 @@ You have been moved into a nearby region.
         </alert>
         <alert name="DownloadWindowsMandatory">
                 <message name="message">
-                        [SECOND_LIFE]有新版本�用。
+                        [SECOND_LIFE] 有新版本�用。
 [MESSAGE]
  
-你必须下载此更新�能�行系统。
+你必须下载此更新�能使用 [SECOND_LIFE]。
                 </message>
                 <option name="Download">
                         下载
@@ -2632,10 +2680,10 @@ You have been moved into a nearby region.
         </alert>
         <alert name="DownloadWindows">
                 <message name="message">
-                        [SECOND_LIFE]有新版本�用。
+                        [SECOND_LIFE] 有新版本�用。
 [MESSAGE]
  
-这个更新�是必须的,但我们建议下载并安装此更新，以改善画�质�和稳定性.
+这个更新�是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
                 </message>
                 <option name="Download">
                         下载
@@ -2646,10 +2694,10 @@ You have been moved into a nearby region.
         </alert>
         <alert name="DownloadWindowsReleaseForDownload">
                 <message name="message">
-                        [SECOND_LIFE]有新版本�用。
+                        [SECOND_LIFE] 有新版本�用。
 [MESSAGE]
  
-这个更新�是必须的,但我们建议下载并安装此更新，以改善画�质�和稳定性.
+这个更新�是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
                 </message>
                 <option name="Download">
                         下载
@@ -2663,8 +2711,8 @@ You have been moved into a nearby region.
                         [SECOND_LIFE]有新版本�用。
 [MESSAGE]
  
-你必须下�次更新�能�行系统。
-是�下载更新至应用软件文件夹?
+你必须下载此更新�能使用 [SECOND_LIFE]。
+是�下载更新至应用程�文件夹?
                 </message>
                 <option name="Download">
                         下载
@@ -2678,9 +2726,9 @@ You have been moved into a nearby region.
                         [SECOND_LIFE]有新版本�用。
 [MESSAGE]
  
-这个更新�是必须的,但我们建议下载并安装此更新，以改善画�质�和稳定性.
+这个更新�是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
  
-是�立刻下载至应用程�文件夹？
+是�下载更新至应用程�文件夹?
                 </message>
                 <option name="Download">
                         下载
@@ -2694,9 +2742,9 @@ You have been moved into a nearby region.
                         [SECOND_LIFE]有新版本�用。
 [MESSAGE]
  
-这个更新�是必须的,但我们建议下载并安装此更新，以改善画�质�和稳定性.
+这个更新�是必须的，但我们建议下载并安装此更新，以改善性能和稳定性。
  
-是�立刻下载至应用程�文件夹？
+是�下载更新至应用程�文件夹?
                 </message>
                 <option name="Download">
                         下载
@@ -2707,8 +2755,8 @@ You have been moved into a nearby region.
         </alert>
         <alert name="DeedObjectToGroup">
                 <message name="message">
-                        转让此东东会导致社团:
-* 收到买出东东所得的钱。
+                        转让此物体会导致社团:
+* 收到付给该物体的L$。
                 </message>
                 <option name="Deed">
                         转让
@@ -2716,76 +2764,103 @@ You have been moved into a nearby region.
                 <option name="Cancel">
                         �消
                 </option>
+                <ignore name="ignore">
+                        转让物体到社团
+                </ignore>
         </alert>
-        <alert name="AddClassified">
+        <alert name="WebLaunchExternalTarget">
                 <message name="message">
-                        分类广告在‘查找一周内目录的’ 
-&apos;分类&apos;部分出现。
- 
-填入你的广告, 然�点击 &apos;�布...&apos; ，添加广告至
-目录。
- 
-点击�布时，你会被�求付款。
-付的多�以使你的广在出现在��的较高�置, 并且
-当人们按关键�检索时，你的广告也会出现在较高�置。
+                        打开你系统的�览器�查看该内容？
+                </message>
+                <ignore name="ignore">
+                        打开默认�览器查看网页
+                </ignore>
+                <option name="Open">
+                        打开
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WebLaunchJoinNow">
+                <message name="message">
+                        是�转至 www.secondlife.com 管��户?
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
+                <ignore name="ignore">
+                        打开�览器管�您的�户
+                </ignore>
         </alert>
-        <alert name="WebLaunchGraphicsDriver">
+        <alert name="WebLaunchBugReport101">
                 <message name="message">
-                        你在这�计算机上的[VENDOR_LABLE] [CARD_NAME]图�驱动已�过期。
- 
-这是控制你的图��的软件的一部分。旧的驱动�以导致3D图�程�，例如[SECOND_LIFE]�行缓慢或崩溃。
-我们强烈推��级 &quot;[DRIVER_NAME]&quot; 驱动, �费的驱动下载在 [VENDOR_LABLE].
- 
-你是�愿�登陆[SECOND_LIFE]驱动网页?
+                        访问 [SECOND_LIFE] Wiki 学习怎样正确地报告错误。
                 </message>
+                <ignore name="ignore">
+                        打开�览器查看错误报告基础 Wiki
+                </ignore>
                 <option name="Gotopage">
-                        回主页
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="WebLaunchGraphicsDriverIntelExtreme">
+        <alert name="WebLaunchSecurityIssues">
                 <message name="message">
-                        你计算机上的图片处�驱动程�已�过期。
- 
-这是一款控制图形�的软件。
-旧的驱动版本�能会使3D画�的程�，例如 [SECOND_LIFE]�行缓慢甚至崩溃。
- 
-我们强烈建议�级到最新版本的驱动, �以在因特网上找到�费下载的版本。
- 
-你愿�登陆[SECOND_LIFE]驱动程�网页�?
+                        访问 [SECOND_LIFE] Wiki 学习如何正确地报告安全事件。
                 </message>
+                <ignore name="ignore">
+                        打开�览器查看安全事件 Wiki
+                </ignore>
                 <option name="Gotopage">
-                        回主页
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="RunningInPCI">
+        <alert name="WebLaunchQAWiki">
                 <message name="message">
-                        GL 表明系统的图�驱动正在�行PCI模�，
-该模�会�慢绘图速度。如果你正在使用PCI视频�,
-则�以忽略这�消�。如果你正在使用 AGP视频�，你�以
-更新你的木�驱动，获得更好的图�性能和其他一些
-3D应用程�。如果你正在使用PCI快速图��，你就�以使
-AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
+                        访问 [SECOND_LIFE] 质��� Wiki.
                 </message>
+                <ignore name="ignore">
+                        打开�览器查看质��� Wiki
+                </ignore>
+                <option name="Gotopage">
+                        确定
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
         </alert>
-        <alert name="WebLaunchJoinNow">
+        <alert name="WebLaunchPublicIssue">
                 <message name="message">
-                        是�跳至 www.secondlife.com管���?
+                        访问 [SECOND_LIFE] 公开事件跟踪器，你�以在那里报告程�错误和其他事件。
                 </message>
-                <option name="OK">
-                        OK
+                <ignore name="ignore">
+                        打开�览器查看公开事件跟踪器
+                </ignore>
+                <option name="Gotopage">
+                        打开页�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WebLaunchPublicIssueHelp">
+                <message name="message">
+                        访问 [SECOND_LIFE] Wiki 了解如何使用公开事件跟踪器。
+                </message>
+                <ignore name="ignore">
+                        打开�览器查看公开事件跟踪器 Wiki
+                </ignore>
+                <option name="Gotopage">
+                        打开页�
                 </option>
                 <option name="Cancel">
                         �消
@@ -2793,10 +2868,27 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="WebLaunchForums">
                 <message name="message">
-                        在[SECOND_LIFE]基础知识中查找最新的�贴士和�技巧。
+                        在 [SECOND_LIFE] 知识库中查找最新的�示和技巧。
                 </message>
+                <ignore name="ignore">
+                        打开�览器查看知识库
+                </ignore>
                 <option name="Gotopage">
-                        回主页
+                        打开页�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WebLaunchSupport">
+                <message name="message">
+                        �系 [SECOND_LIFE] 支�中心。
+                </message>
+                <ignore name="ignore">
+                        打开�览器�系支�中心
+                </ignore>
+                <option name="Gotopage">
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
@@ -2804,10 +2896,13 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="WebLaunchSupportWiki">
                 <message name="message">
-                        进入林登官方�客, 获�最新的新闻和咨讯.
+                        进入林登官方�客，获�最新的新闻和信�。
                 </message>
+                <ignore name="ignore">
+                        打开�览器查看官方�客
+                </ignore>
                 <option name="Gotopage">
-                        回主页
+                        打开页�
                 </option>
                 <option name="Cancel">
                         �消
@@ -2815,10 +2910,13 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="WebLaunchLSLGuide">
                 <message name="message">
-                        是�跳至林登脚本语言�导以获得脚本编辑帮助?
+                        是�转至林登脚本语言�导查阅脚本编辑帮助？
                 </message>
+                <ignore name="ignore">
+                        打开�览器查阅脚本编辑帮助
+                </ignore>
                 <option name="Gotopage">
-                        回主页
+                        打开页�
                 </option>
                 <option name="Cancel">
                         �消
@@ -2826,10 +2924,10 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="WebLaunchLSLWiki">
                 <message name="message">
-                        是�跳至林登脚本语言维基�典以获得编辑脚本帮助?
+                        是�跳至LSL语言首页以获得脚本编辑帮助?
                 </message>
                 <option name="Gotopage">
-                        回主页
+                        打开页�
                 </option>
                 <option name="Cancel">
                         �消
@@ -2837,15 +2935,42 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="ReturnToOwner">
                 <message name="message">
-                        你确定�将所选东东归还至
-它们的主人?�转移的已转让
-东东会被归还至他们原先的主人处。
-(所有归还的东东会被归还至他们上一次被�存的文件夹内。)
+                        你确定�将所选物体归还至
+它们的主人？�转移的已转让给社团的
+物体会被归还至他们原先的主人处。
  
-*警告* ��转移的已转让东东会被删除!
+*警告* ��转让的转让给社团的物体会被删除!
                 </message>
                 <option name="Return">
-                        返回
+                        返还
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="ViewReleaseNotes">
+                <message name="message">
+                        是�查看第二人生�布通告？
+                </message>
+                <ignore name="ignore">
+                        查看�布通告
+                </ignore>
+                <option name="Gotopage">
+                        打开页�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WebLaunchReleaseNotes">
+                <message name="message">
+                        是�查看 [SECOND_LIFE]  �布通告？
+                </message>
+                <ignore name="ignore">
+                        打开�览器查看�布通告时
+                </ignore>
+                <option name="Gotopage">
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -2853,8 +2978,8 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="GroupLeaveConfirmOfficer">
                 <message name="message">
-                        你目�是社团[GROUP]的官员.
-是�离开社团?
+                        你目�是社团[GROUP]的官员。
+是�离开社团？
                 </message>
                 <option name="Leave">
                         离开
@@ -2865,8 +2990,8 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="GroupLeaveConfirmMember">
                 <message name="message">
-                        你目�是社团[GROUP]的�员.
-是�离开社团?
+                        你目�是社团[GROUP]的�员。
+是�离开社团？
                 </message>
                 <option name="Leave">
                         离开
@@ -2877,66 +3002,57 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
         </alert>
         <alert name="ConfirmKick">
                 <message name="message">
-                        你真的�踢走所有用户�?
-                </message>
-        </alert>
-        <alert name="MuteLinden">
-                <message name="message">
-                        对�起,你�能�蔽林登家的人。
+                        你*真的*�将所有用户踢下线�？
                 </message>
-                <option name="OK">
-                        OK
+                <option name="Kick">
+                        踢下所有用户
+                </option>
+                <option name="Cancel">
+                        �消
                 </option>
         </alert>
-        <alert name="MuteByName" title="通过�称�蔽东东">
+        <alert name="MuteLinden">
                 <message name="message">
-                        通过�字�蔽声音�会影�对象�天和�时消�, �会影效果声音。 
-你必须准确键入对象的�字.
+                        对�起，你�能�蔽林登家的人。
                 </message>
-                <editline name="editline">
-                        东东�称
-                </editline>
                 <option name="OK">
-                        OK
-                </option>
-                <option name="Cancel">
-                        �消
+                        确定
                 </option>
         </alert>
-        <alert name="MuteByNameFailed" title="通过�称�蔽东东失败">
+        <alert name="MuteByNameFailed" title="按�称�蔽物体失败">
                 <message name="message">
-                        你已��蔽了这个�字.
+                        你已��蔽了这个�字。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="RemoveItemWarn">
                 <message name="message">
-                        尽管被准许, 删除库存�能会造�东东的
-��。你确定�删除库存中的物��?
+                        尽管�许, 删除内容�能会造�物体的
+��。你确定�删除该物��？
                 </message>
                 <option name="Yes">
-                        是
+                        删除
                 </option>
                 <option name="No">
-                        �
+                        �消
                 </option>
         </alert>
         <alert name="CantRateOwnedByGroup">
                 <message name="message">
-                        无法鉴定东东主人,东东由社团拥有。
+                        无法为物体主人评分，物体由社团拥有。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="CantOfferCallingCard">
                 <message name="message">
-                        目�无法�供�集�。请�候�试。
+                        目�无法�供�片。请�候�试。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="CantOfferFriendship">
@@ -2944,54 +3060,57 @@ AGP绘图加速器起作用。Options panel in Preferences in [SECOND_LIFE].
                         目�无法建立朋�关系。请�候�试。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="CantSetHome">
                 <message name="message">
-                        无法在此建�宅。
-你的�宅必须建在由你或你所在社团拥有的土地上。
+                        无法把家设在这里。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="BusyModeSet">
                 <message name="message">
-                        忙碌模�调节。
-���天场景和�时消�。�时通
-会�到你的忙碌模�回�。拒�所有的
-闪电传�邀请和库存邀请。
+                        已设置为忙碌模�。
+将���天和�时消�。�时通会收到
+你的忙碌模�回�。所有瞬间移动邀请
+都会被拒�。所有给与的物�都会放入
+你的垃圾箱。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
+                <ignore name="ignore">
+                        设置忙碌状�
+                </ignore>
         </alert>
         <alert name="NoPVPDetected">
                 <message name="message">
-                        没有�现用户与用户之间(PvP)弊端。
+                        没有�现用户与用户之间(PvP)的冲�。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="NotecardAttachPermFail">
                 <message name="message">
-                        �有具有无�制&apos;下一个主人&apos;许��的
-��以被附在注释�上。
+                        �有具有无�制 ‘下个拥有者’
+�利的物���以被附在注释�上。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="JoinedTooManyGroupsMember">
                 <message name="message">
-                        You are a member of too many groups to join
-another one. Please leave at least one group
-before joining this one, or decline the offer.
-To leave a group select the &apos;My Groups..&apos; option
-from the &apos;Edit&apos; menu.
-[NAME] has invited you to join a group as a member.
+                        你已�加入了太多的社团，无法�加入
+新的社团。加入此社团之�，请至少离开
+一个旧社团, 或者拒�新社团邀请。
+离开社团请选择&apos;编辑&apos;��下的
+&apos;我的社团..&apos;选项。
+[NAME]邀请你�为该社团�员。
 [INVITE]
                 </message>
                 <option name="Join">
@@ -3008,7 +3127,7 @@ from the &apos;Edit&apos; menu.
 一个旧社团, 或者拒�新社团邀请。
 离开社团请选择&apos;编辑&apos;��下的
 &apos;我的社团..&apos;选项。
-[NAME]邀请你�为该社团�员。
+[NAME]邀请你�为该社团官员。
 [INVITE]
                 </message>
                 <option name="Join">
@@ -3020,13 +3139,13 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="KickUser">
                 <message name="message">
-                        以哪�消�踢走此人?
+                        ��下列消�并踢走此人？
                 </message>
                 <editline name="editline">
                         管�员已�迫使您下线。
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3034,13 +3153,13 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="KickAllUsers">
                 <message name="message">
-                        以哪�消�踢走目�在此的�个人?
+                        ��下列消�并踢走目�连接到网格的�个人?
                 </message>
                 <editline name="editline">
                         管�员已�迫使您下线。
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3048,13 +3167,13 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="FreezeUser">
                 <message name="message">
-                        用哪一�通知冻结化身?
+                        用哪一�消�通知冻结的化身?
                 </message>
                 <editline name="editline">
-                        你已�被冻结。你�能移动或�天。管�员会通过�时信��系你。
+                        您已�被冻结。您�能移动或�天。管�员会通过�时信��系您。
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3062,13 +3181,13 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="UnFreezeUser">
                 <message name="message">
-                        ��何�信���该用户?
+                        用哪一�消�通知解冻的化身?
                 </message>
                 <editline name="editline">
-                        你已�被解冻
+                        您已�被解冻。
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3076,10 +3195,10 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="ExpungeUser">
                 <message name="message">
-                        输入用户的代�身份
+                        输入用户的 agent id
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3087,13 +3206,13 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="OfferTeleport">
                 <message name="message">
-                        用以下消��供到你所在地的闪电传�?
+                        ��下列消�并邀请瞬间移动？
                 </message>
                 <editline name="editline">
-                        我�加入 [REGION]
+                        和我一起到 [REGION] ���
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
@@ -3101,38 +3220,52 @@ from the &apos;Edit&apos; menu.
         </alert>
         <alert name="OfferTeleportFromGod">
                 <message name="message">
-                        是�神明�唤用户去你的�置?
+                        是�神明�唤用户�你的�置？
                 </message>
                 <editline name="editline">
-                        我�加入 [REGION]
+                        和我一起到 [REGION] ���
                 </editline>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="MessageEstate" title="通知在这��动产上的�个人">
+        <alert name="TeleportFromLandmark">
+                <message name="message">
+                        你确定�瞬间移动�？
+                </message>
+                <ignore name="ignore">
+                        使用库存中的地标瞬间移动
+                </ignore>
+                <option name="Teleport">
+                        瞬间移动
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="MessageEstate" title="通知在这�地产上的�个人">
                 <message name="message">
                         输入一�简短的通知，该声明将
-会分�给目�在你领地内的所有居民。
+会��给目�在你地产内的所有居民。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="ChangeLindenEstate" title="更改林登拥有的�动产">
+        <alert name="ChangeLindenEstate" title="更改林登地产">
                 <message name="message">
-                        你将�更改林登所有的�人财产(大陆, 
-格�,方�, 等等.). 
+                        你将�更改林登所有的地产(大陆�
+少年网格�方�岛，等等)。 
  
-这个动作�度�险，因为它�能会影�到 
- 这�大陆上, 它将改�
-上�的区域，并会使空间�务器报警。
+ 这个动作�度�险，因为它�能会在基础的层次上
+影�到用户体验。在大陆上, 它将改�
+上�的区域，并会使空间�务器噎�。
  
 是�继续?
                 </message>
@@ -3143,19 +3276,17 @@ from the &apos;Edit&apos; menu.
                         �消
                 </option>
         </alert>
-        <alert name="ChangeLindenAccess" title="更改进入林登拥有的�动产的通�">
+        <alert name="ChangeLindenAccess" title="更改林登地产准入列表">
                 <message name="message">
-                        �将改�林登�人财产
-(大陆,格�, 方�,等等.)的准入��. 
+                        你将�更改林登所有的地产的准入列表(大陆�
+少年网格�方�岛，等等)。 
  
-该�作�常�险， 应该仅在防止黑客把东东和 
-金钱转移进或出地区的时候�能够被
-执行。 
+该�作�常�险， 应该仅在利用把物体/金钱
+转移进或出�个网格的对付活儿 (hack) 时候
+�应该被执行。 它将改�上�的区域，并会
+使空间�务器噎�。
  
-这�能会更改上�地区，并使得 
-空间�务器报警。 
- 
-Proceed?
+是�继续？
                 </message>
                 <option name="ChangeEstate">
                         更改�动产
@@ -3164,127 +3295,127 @@ Proceed?
                         �消
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentAdd" title="选择�动产">
+        <alert name="EstateAllowedAgentAdd" title="选择地产">
                 <message name="message">
-                        仅将此独立领地还是将[所有独立领地]列入�许��?
+                        仅列入此地产还是[ALL_ESTATES]的�许��?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateAllowedAgentRemove" title="选择�动产">
+        <alert name="EstateAllowedAgentRemove" title="选择地产">
                 <message name="message">
-                        从�许��中移除仅这�领地还是[ALL_ESTATES]?
+                        仅移出此地产还是[ALL_ESTATES]的�许��?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupAdd" title="选择�动产">
+        <alert name="EstateAllowedGroupAdd" title="选择地产">
                 <message name="message">
-                        仅将此独立领地还是将[所有独立领地]列入社团�许��?
+                        仅列入此地产还是[ALL_ESTATES]的社团�许��?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateAllowedGroupRemove" title="选择�动产">
+        <alert name="EstateAllowedGroupRemove" title="选择地产">
                 <message name="message">
-                        从社团�许��中移除仅这�领地还是[ALL_ESTATES]?
+                        仅移出此地产还是[ALL_ESTATES]的社团�许��?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateBannedAgentAdd" title="选择�动产">
+        <alert name="EstateBannedAgentAdd" title="选择地产">
                 <message name="message">
-                        拒�访问仅此领地或[所有_领地]?
+                        拒�访问仅此领地还是[ALL_ESTATES]?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateBannedAgentRemove" title="选择�动产">
+        <alert name="EstateBannedAgentRemove" title="选择地产">
                 <message name="message">
-                        �止拒�进入仅这一个领地还是[ALL_ESTATES]?
+                        �止拒�该居民进入仅这一个地产还是[ALL_ESTATES]?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateManagerAdd" title="选择�动产">
+        <alert name="EstateManagerAdd" title="选择地产">
                 <message name="message">
-                        仅为这一个独立领地还是为所有独立领地添加独立领地��?
+                        仅为这一个地产还是为[ALL_ESTATES]添加地产��?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateManagerRemove" title="选择�动产">
+        <alert name="EstateManagerRemove" title="选择地产">
                 <message name="message">
-                        仅开除此处领地的领地��还是开除你所有领地的领地��。
+                        仅将领地��从这个开除从[ALL_ESTATES]开除？
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="EstateCovenantChange" title="选择�动产">
+        <alert name="EstateCovenantChange" title="选择地产">
                 <message name="message">
-                        �改�此处�动产的��消�还是改�[ALL_ESTATES]的��消�?
+                        �改�此处地产的契约消�还是改�[ALL_ESTATES]的契约消�?
                 </message>
                 <option name="ThisEstate">
-                        该领地
+                        该地产
                 </option>
                 <option name="AllEstates">
-                        所有�动产
+                        所有地产
                 </option>
                 <option name="Cancel">
                         �消
@@ -3292,7 +3423,7 @@ Proceed?
         </alert>
         <alert name="EstateKickUser" title="确定踢出">
                 <message name="message">
-                        将[EVIL_USER]踢出此处领地?
+                        将 [EVIL_USER] 踢出此处地产?
                 </message>
                 <option name="Kick">
                         踢人
@@ -3303,7 +3434,7 @@ Proceed?
         </alert>
         <alert name="EstateChangeCovenant">
                 <message name="message">
-                        你是�确定改��动产��?
+                        你是�确定改�地产契约?
                 </message>
                 <option name="Change">
                         更改
@@ -3314,41 +3445,51 @@ Proceed?
         </alert>
         <alert name="ProblemImportingEstateCovenant">
                 <message name="message">
-                        Problem importing estate covenant.
+                        导入地产契约时出错。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
+        <alert name="ProblemAddingEstateManager">
+                <message name="message">
+                        添加地产管�人时�到问题。  一个或多个地产的管�人列表�能已满。
+                </message>
+        </alert>
+        <alert name="ProblemAddingEstateGeneric">
+                <message name="message">
+                        添加到地产列表时�到问题。 一个或多个地产的列表�能已满。
+                </message>
+        </alert>
         <alert name="UnableToLoadNotecard">
                 <message name="message">
-                        这次�试无法载入注释�所属的资产.
+                        现在暂时无法载入记事�相关的资产。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="NotAllowedToViewNotecard">
                 <message name="message">
-                        缺�许��，�能查看�求查看的和资产ID相关的注释�
+                        缺���，�能查看与�求的资产 ID 相关的记事�
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="MissingNotecardAssetID">
                 <message name="message">
-                        资产ID的注释信�已�从数�库中�失 .
+                        记事�的资产 ID 已�从数�库中�失。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="PublishClassified">
                 <message name="message">
                         请�记: 分类广告费用�会退还。
  
-是�消费L$[AMOUNT]�布广告?
+是�以L$[AMOUNT]�布广告?
                 </message>
                 <option name="Publish">
                         �布
@@ -3357,9 +3498,37 @@ Proceed?
                         �消
                 </option>
         </alert>
+        <alert name="SetClassifiedMature">
+                <message name="message">
+                        分类广告包��人内容�？
+                </message>
+                <option name="Mature">
+                        包�
+                </option>
+                <option name="Not Mature">
+                        �包�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="SetGroupMature">
+                <message name="message">
+                        社团包��人内容�？
+                </message>
+                <option name="Mature">
+                        包�
+                </option>
+                <option name="Not Mature">
+                        �包�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
         <alert name="ConfirmRestart" title="确定�新�动">
                 <message name="message">
-                        你真的�在2分钟��新进入区域�?
+                        你真的�在2分钟��新�动区域�?
                 </message>
                 <option name="Restart">
                         ��
@@ -3374,33 +3543,31 @@ Proceed?
 会分�给目�在此区域内的所有居民。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="HelpRegionBlockTerraform" title="�定外形">
+        <alert name="HelpRegionBlockTerraform" title="�定地形">
                 <message name="message">
-                        如果此项被选择并执行, 无论��元土地的&apos;编辑地形&apos; 如何设置，土地所有者�能无法编辑他们自己的土地。
+                        如果选择此项, 无论�地�的&apos;编辑地形&apos; 如何设置，土地所有者都无法编辑他们自己的土地。
  
 默认: 关
                 </message>
         </alert>
         <alert name="HelpRegionBlockFly" title="�定飞翔">
                 <message name="message">
-                        如果此框被选中,无论���土地设置如何，
-人们都�能在此区域内飞翔。
+                        如果选择此项,无论�个地�设置如何，
+人们都�能在此区域内飞行。
  
 默认:关
                 </message>
         </alert>
-        <alert name="HelpRegionAllowDamage" title="�许�害">
+        <alert name="HelpRegionAllowDamage" title="�许伤害">
                 <message name="message">
-                        忽略个别��土地的设置，选定框使�康系统
-应用于所有��土地。如果有�留框
-没被查看, 个别��土地的地主��以
-他们土地上的�康系统。
+                        选定框将使�康系统应用于所有地�。如果�选中这项， 个别地�
+的�有人��以打开他们土地上的�康系统。
  
 默认:关
                 </message>
@@ -3408,76 +3575,85 @@ Proceed?
         <alert name="HelpRegionAgentLimit" title="代��制">
                 <message name="message">
                         设置此片区域内的化身数�最大值。
-注�，区域内的化身数�越多，表现的性能
+注�，区域内的化身数�越多，性能
 �能就越差。
  
-Default: 30
+默认:40
                 </message>
         </alert>
-        <alert name="HelpRegionObjectBonus" title="奖励东东">
+        <alert name="HelpRegionObjectBonus" title="�外物体因数">
                 <message name="message">
-                        奖励的东东是原始东东的�制�，它�许�批地打包 。
-包裹的数�范围是1到10。 �512m2设定‘1’个包裹
-�许打包117 个东东。 �512m2设定‘2’个包裹�许打包
-234个东东, 也就是�者的两�,剩下的以此类推。 无论包裹数的
-设定值为多少，�一个区域�许的奖励东东的数�最大为
-15，000个。 一旦奖励东东的数�被设定, 就�能�少，除�
-你�以确定�少东东�会导致包裹内东东的
-删除或归还。
+                        �外物体因数是对�个地�内所�许的元件数�的�数。
+�许的范围是1 到 10。‘1’ 代表�个 512 平方米的地��许 117
+个物体。‘2’ 代表�个 512 平方米的地��许 234 个物体，也就是
+2 �，以此类推。无论�外物体是多少，�个区域所�许的物体�是
+15,000。一旦�外物体被设置，请注��少该设置将�能导致物体
+被返还或删除。
  
 默认: 1.0
                 </message>
         </alert>
         <alert name="HelpRegionMaturity" title="�人内容">
                 <message name="message">
-                        设置区域内的�人内容, �作�照�上角
-的�幕以�地图上弹出的�贴士。�人内容
-也会影��索结果 - 居民们�以选择��索
-�人区域内的内容。
+                        设置区域是�包��人内容，这会显示在
+�幕上方以�地图的�示中。该设定也会影��索
+结果 — 居民们�以选择��索�人区域内的内容。
  
-地图上弹出的�贴士5分钟内�会改�, 因为 
-系统�是定时性的上传地图信�。 
+改�这一设定�能�过一会儿�会�映到地图上。
  
 默认:��人级别
                 </message>
         </alert>
         <alert name="HelpRegionRestrictPushObject" title="�制推动">
                 <message name="message">
-                        设定所有区域为�制推动区。代�商�能推动自己，或者由土地主人所设的脚本代�推动，或者由社团所属土地的脚本代�推动，这里�设土地有社团转让设置。
+                        设定所有区域为�制推动区。居民�能推动自己，或者由土地主人的脚本代�推动。
 
-推动功能和llPushObject() LSL功能有关.
+(推动功能和llPushObject() LSL函数有关。)
  
 默认: 关
                 </message>
         </alert>
-        <alert name="HelpParcelChanges" title="土地连接/划分">
+        <alert name="HelpParcelChanges" title="土地�并/划分">
                 <message name="message">
-                        设置�无论土地是�归�动产主人所有，都�以被连接或�划分。 
-如果该选项未被执行:
- * �有�动产主人和��人有�利连接或�划分土地. 
- * 他们�能连接或�划分属于这个主人的土地,或属于具有�适�利的社团的土地。 
+                        该设置决定�属于地产所有人的地�是��被�并或划分。
+如果该选项未被选择:
+ * �有�动产主人和��人有�利连接或�划分土地。
+ * 他们�能连接或�划分属于这个主人的土地, 或属于具有�适�利的社团的土地。 
     
-如果选项已被执行:
+如果选项被选择:
  * 所有土地的主人都�以连接或�划分他们所拥有的土地. 
  * 对于社团所拥有的土地, 拥有�适�利的社团�以连接或�划分土地。
     
  
-默认: 执行
+默认: 选择
+                </message>
+        </alert>
+        <alert name="HelpRegionSearch" title="Do Not Show In Search">
+                <message name="message">
+                        打开该选项将阻止地�拥有者在�索中列出他们的地�。
+默认：关
+                </message>
+        </alert>
+        <alert name="HelpParcelSearch" title="Do Not Show In Search">
+                <message name="message">
+                        这个选项将会:
+- 在�索结果中显示该地�
+- 显示该地�的公开物体
                 </message>
         </alert>
         <alert name="RegionMaturityChange" title="更改区域的�人指数设定">
                 <message name="message">
                         此区域内的�人内容等级已�更新。
  
-但是,世界地图更新时间需�大约5分钟，
-因为系统�能定期更新地图
-信�。
+但是，世界地图更新时间需�大约5分钟，
+因为系统�能定期更新地图信�。
                 </message>
         </alert>
         <alert name="HelpRegionLandResell" title="土地�新出售">
                 <message name="message">
                         �动产主人和��人有�利出售任何�动产主人的土地。 
-如果选项没有被执行,买主�能�新出售该区域内的土地。如果选项被执行，买主则�以�新出售该区域内土地。 
+如果选项没有被执行, 买主�能�出售该区域内的土地。如果选项被执行，
+买主则�以�出售该区域内土地。 
  
  
 默认: ��许
@@ -3485,196 +3661,181 @@ Default: 30
         </alert>
         <alert name="HelpEstateCovenantID" title="契约��的资产ID">
                 <message name="message">
-                        设置这个属于这项�动产的�动产契约�议的注释�资产ID。
-默认: 00000000-0000-0000-0000-000000000000或没有
+                        设置该地产的地产契约记事�资产 ID。
+默认: 00000000-0000-0000-0000-000000000000 或没有
                 </message>
         </alert>
         <alert name="HelpRegionDisableScripts" title="无效脚本">
                 <message name="message">
-                        如果模拟表现平庸,�能是脚本问题。打开
-统计� (Ctrl-Shift-1)。 找到模拟器物�FPS。
-如果低于45，打开�于系统�底部的
-‘时间’�。 如果脚本时间设定为�秒读25祯甚至更高, 则点击 
-‘获�首�脚本&apos;按钮。你会得到�能导致�良模拟表现的 
-脚本的�称��置。
+                        如果模拟性能平庸，�能是脚本问题。
+打开统计� (Ctrl-Shift-1)。 找到模拟器物�FPS。如果低于 
+45，打开�于系统�底部的‘时间’ �。 如果脚本时间为 25 毫秒
+甚至更高, 则点击 ‘获�首�脚本’ 按钮。你会得到�能导致�良
+模拟表现的脚本的�称��置。
  
-检查‘无效脚本&apos;盒�然�点击 ‘应用&apos; 
-按钮，这�以暂时使该区域内所有脚本失效。 你�能 
-如是�以达到标出的‘首�脚本’的�置。
- 一旦你到达那里, 就�以分� 
-是�是这些脚本导致了问题。 你也许想
-�系脚本的主人或删除或归还东东。 
-�检查 &apos;无效脚本&apos; 盒�并点击 &apos;应用&apos;，�以�次 
-激活该区域内脚本。
+打开 ‘�用脚本’ 选项然�点击 ‘应用’按钮，�以暂时使该区域内
+所有脚本失效。 你�能需�这样�以到达标出的 ‘首�脚本’ 的
+�置。一旦你到达那里, 就�以分� 是�是这些脚本导致了问题。 你也许想�系脚本的主人或删除或归还物体。关闭 ‘�用脚本’ 选项
+并点击 ‘应用’，�以�次激活该区域内脚本。
  
 默认: 关
                 </message>
         </alert>
-        <alert name="HelpRegionDisableCollisions" title="无效冲�">
+        <alert name="HelpRegionDisableCollisions" title="无效碰撞">
                 <message name="message">
-                        如果模拟效果�好, 物�东东也�能是原因。 
-打开统计�(Ctrl-Shift-1)。找到第一人称物� 
-视角模拟器。 如果它�于45，打开�于系统�底部的 
-系统�。 如果模拟物�时间读�速度为 
-20 祯�秒或更快, 点击&apos;获得首�Colliders&apos; 按钮。 
-你就�以获得导致模拟表现�好的东东的�称和 
-物�地�。
+                        如果模拟性能平庸，�能是物�物体问题。
+打开统计�(Ctrl-Shift-1)。找到模拟器物�FPS。如果它�于45，
+打开�于统计�底部的时间一�。 如果 ‘模拟物�时间’ 在
+20 毫秒或以上，点击 &apos;获得首�碰撞者&apos; 按钮。
+你将得到�能导致模拟表现�好的物体的�称和�置。
  
-检查 &apos;无效冲�&apos; 盒� 并按下 &apos;应用&apos; 
-按钮，这样�以暂时消除东东与东东之间的冲�。�找到 
-标注出的‘首�冲��’的�置，你�能必须照上述方法 
-��。 一旦你到达该�置, 你应该调查 
-该东东是�一直在与其他东东产生冲�? 你�能想 
-�系东东的主人，或者删除或归还此东东。 
-�检查 &apos;无效冲�&apos;盒�然�&apos;应用&apos; 以�新激活 
-该区域内的冲�。
+打开 ‘�用碰撞’ 选项然�点击 ‘应用’按钮，这样�以暂时关闭
+物体对物体的碰撞。 你�能需�这样�以到达标出的 ‘首�碰撞者’ 
+的�置。一旦你到达该�置，你应该调查该物体是�在与其他物体
+一直碰撞。你也许想�系脚本的主人或删除或归还物体。 
+关闭 ‘�用碰撞’ 选项并点击 ‘应用’，�以�次激活该区域内脚本。
  
 默认: 关
                 </message>
         </alert>
         <alert name="HelpRegionDisablePhysics" title="无效物�">
                 <message name="message">
-                        无效物�和无效冲�类似, 除了所有 
-物�模拟都是无效的。这�味��仅所有东东将�会�止 
-相互冲�, 且化身们也将无法移动。 
+                        无效物�和无效碰撞类似, 除了所有物�模拟
+都是无效的。这�味��仅所有物体将会
+�止相互碰撞，且化身们也将无法移动。 
  
-仅当无效冲�没有�地区�馈回足够的
-表现，以致无法调查物�问题或者 
-&apos;首�冲��&apos;时，�能使用无效物�。
+仅当无效碰撞没有�地区�馈回足够的表现，
+以致无法调查物�问题或者
+ ‘首�碰撞�’ 时，�能使用无效物�。
  
-完��请确认��物�, �则化身们 
-还将无法移动。
+完��请确认��物�, �则化身们还将无法移动。
  
 默认:关
                 </message>
         </alert>
         <alert name="HelpRegionTopColliders" title="首�冲击�">
                 <message name="message">
-                        列出正在��大�潜在的物物冲�的
-东东的��。这些东东�能会�慢 
-模拟性能。如果模拟物�的时间超过20秒， 
- 选择查看 &gt; 统计�和模拟器 &gt; 时间 &gt; 模拟时间 (物�)  
-�查看。
+                        列出正在��大�潜在的物物碰撞的
+物体的��。这些物体�能会�慢
+模拟性能。选择查看 &gt; 统计�
+然�模拟器 &gt; 时间 &gt; 模拟时间 (物�)
+��考是�有至少 20 毫秒花在物�上了。
                 </message>
         </alert>
         <alert name="HelpRegionTopScripts" title="首�脚本">
                 <message name="message">
-                        显示花费很多时间�行林登脚本语言的东东
-的��。  这些东东�能会�慢模拟性能。 
-如果脚本花费时间超过25秒，选择查看 &gt;  
-统计�和模拟器 &gt; 时间 &gt;脚本时间
-�查看。
+                        显示花费很多时间�行林登脚本语言的物体
+的��。  这些物体�能会�慢模拟性能。 
+选择查看 &gt; 统计�
+然�模拟器 &gt; 时间 &gt; 模拟时间 (物�)
+��考是�有至少 25 毫秒花在脚本上了。
                 </message>
         </alert>
-        <alert name="HelpRegionRestart" title="�新进入地区">
+        <alert name="HelpRegionRestart" title="�新�动地区">
                 <message name="message">
-                        两分钟的警告之�，将会�新�动这片区域�行 
-的�务器处�过程。区域内的所有居民将会 
-断线。区域内的数�将会�留,并且应会在 
-90秒钟以内��正常。 
+                        两分钟的警告之�，将会�新�动这片区域的�务器进程。
+区域内的所有居民将会断线。区域内的数�将会�留，
+并且应会在 90 秒钟以内��正常。 
  
-�新�动�会带�太多的性能问题，
-并且应该�有在收到指示时�用到。
+�新�动�会解决太多的性能问题，
+所以应该�有在收到指示时�用到。
                 </message>
         </alert>
         <alert name="HelpRegionWaterHeight" title="æ°´æ·±">
                 <message name="message">
-                        这时水域的深度。 如果设置值是 
-除去20外的任何值，并且你拥有的是临近世界 
-边缘的水域，或者 &apos;无用&apos; 
-水,那么所看�的就是一个沟渠。 
+                        这是水�出现的深度。如果该值�是 20，
+并且你拥有临近世界边缘的水域或者 
+‘空洞’ 水，那么将会�以看到水�断开。
  
 默认: 20
                 </message>
         </alert>
         <alert name="HelpRegionTerrainRaise" title="地形�高">
                 <message name="message">
-                        这个市��土地主人能够抬高他们的 
-地形，使得其高于 &apos;baked&apos; 地形的默认 
-高度。 
+                        这是地�拥有人�以将他们的
+土地�高至 ‘烘烤的’ 土地
+默认高度之上的最高值。
  
 默认: 4
                 </message>
         </alert>
         <alert name="HelpRegionTerrainLower" title="地形�低">
                 <message name="message">
-                        这个是��土地的主人能够使 
-他们的地形比 &apos;baked&apos; 地形高度低的默认 
-�离。
+                        这是地�拥有人�以将他们的
+土地�低至 ‘烘烤的’ 土地
+默认高度之下的最低值。
  
 默认: -4
                 </message>
         </alert>
         <alert name="HelpRegionUploadRaw" title="上传�缀为 RAW的地形">
                 <message name="message">
-                        点击这个按钮�以把�缀为.RAW的文件上传到你所在的地区。 
-文件必须包�正确的尺寸和通�数: 
-RGB, 256x256 and 13 通路.  创建地形文件最好的 
-方法就是下载已有的 RAW 文件。一个好的
-首�步骤是修�第一个通路 (陆地高度), 
-并将它上传。 
+                        点击这个按钮�以把�缀为 .RAW 的文件上传到你所在的地区。 
+文件必须包�正确的尺寸和通�数: RGB, 256×256 和 13 个通�。
+创建地形文件最好的方法就是下载已有的 RAW 文件。一个好的
+首�步骤是修�第一个通� (陆地高度)，并将它上传。 
  
-上传过程需时45秒。请注�，上传地形文件 
-时 *�能* 移动地上的东东, 
-�有地形本身还有�许的包裹�以移动。 
-这会导致东东沉入地下。 
+上传过程需时 45 秒。请注�，上传地形文件 *�会* 移动
+地上的物体, �会移动地形本身和地�相关的��。
+这�能导致物体沉入地下。 
  
-更多关于编辑高地区域的信�, 请登陆: 
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+更多编辑区域高度图的信�，请按 F1 键寻求帮助。
                 </message>
         </alert>
         <alert name="HelpRegionDownloadRaw" title="下载�缀为RAW的地形">
                 <message name="message">
-                        点击此按钮�以下载包�土地高度数�,��土地尺寸，
-代售��土地状况，和此区域内��土地许�� 
-等信�的文件。当用如�Photoshop这类程�打开文件时，
- 你必须指定文件的尺寸为：
- RGB, 256x256 ，13个通路。这�地形文件�能以
-这�方�打开，而�能用别的。 
- 
-获�更多关于区域内田地高度的信�, 请登陆: 
-http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
+                        点击此按钮�以下载包�土地高度数�，地�尺寸，
+地�出售情况，和此区域内��土地许��等信�
+的文件。当用如� Photoshop 这类程�打开文件时，
+你必须指定文件的尺寸为： RGB, 256×256 ，13 
+个通�。这�地形文件�能以这�方�打开，
+而�能用别的。  
+
+更多编辑区域高度图的信�，请按 F1 键寻求帮助。
                 </message>
         </alert>
-        <alert name="HelpRegionUseEstateSun" title="使用领地太阳">
+        <alert name="HelpRegionUseEstateSun" title="使用地产太阳">
                 <message name="message">
                         这个选定框�以使这片区域内太阳的�置 
-与领地内其他区域内太阳的�置相�。 
+与地产内其他区域内太阳的�置相�。 
  
 默认:开
                 </message>
         </alert>
         <alert name="HelpRegionFixedSun" title="太阳固定">
                 <message name="message">
-                        这个选择框设置太阳的�置固定在太阳
-滑动到此阶段时的�置，并且使得太阳无法移动。 
+                        这个选择框设置太阳的�置到滑�
+所指定的�置，并且�止太阳移动。 
 
 默认: 关
                 </message>
         </alert>
-        <alert name="HelpRegionBakeTerrain" title="硬地">
+        <alert name="HelpRegionBakeTerrain" title="烘烤地形">
                 <message name="message">
-                        这个按钮把当�地形�存为区域内心的默认模�。一旦烤干，土地将����存的形�，无论何时你或者他人使用编辑‘��’选贤/工具。烤干的地形�样是地形上�或下���的中点。
+                        这个按钮把当�地形�存为区域地形的默认值。
+                        一旦烤干，你或者他人使用编辑土地的 ‘��’选项时
+                        土地将����存的形�。
+                        烤干的地形也是地形上�或下���的中点。
                 </message>
         </alert>
         <alert name="HelpEstateEstateManager" title="�动产��">
                 <message name="message">
-                        领地��是你委派的负责区域控制 
-和领地调节的居民。 领地�� 
-有�改�控制�内任何调解项, 除了上传, 
-下载,和压缩地形。特别的, 他们有��许
-或�止居民进入你的领地。  
+                        地产��是你委派的负责区域控制 
+和地产调节的居民。 地产�� 
+有�改�控制�内任何调节项, 除了上传, 
+下载, 和压缩地形。特别的, 他们有��许
+或�止居民进入你的地产。  
  
-领地���能被领地主人雇佣或辞退 
+地产���能被地产主人雇佣或辞退 
 , �能互相之间委派。请选择你信任的
-居民作为你的领地��, 因为他们的
+居民作为你的地产��, 因为他们的
 行为最终将由你负责。
                 </message>
         </alert>
         <alert name="HelpEstateUseGlobalTime" title="使用国际时间">
                 <message name="message">
-                        这个选定框�以使你的领地的太阳�置 
-与林登所属的&apos;大陆&apos;领地的太阳�置 
+                        这个选定框�以使你的地产的太阳�置 
+与林登所有的 ‘大陆’ 地产的太阳�置 
 一致。
  
 默认: 开
@@ -3682,101 +3843,112 @@ http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
         </alert>
         <alert name="HelpEstateFixedSun" title="太阳固定">
                 <message name="message">
-                        这个选择框设置太阳的�置固定在太阳
-滑动到此阶段时的�置，并且使得太阳无法移动。
+                        这个选择框设置太阳的�置到滑�
+所指定的�置，并且�止太阳移动。
                 </message>
         </alert>
-        <alert name="HelpEstateMainlandVisible" title="从此处�以看�整个大陆">
+        <alert name="HelpEstateMainlandVisible" title="从此处�以看�大陆">
                 <message name="message">
-                        设置此处领地内的居民是�能从地图上 
-看�林登所拥有的 &apos;大陆&apos; 领地。 
+                        设置此处地产内的居民是�能从地图上 
+看�林登所拥有的 ‘大陆’ 地产。 
  
 默认:�以
                 </message>
         </alert>
         <alert name="HelpEstateExternallyVisible" title="从大陆�视">
                 <message name="message">
-                        设置在林登所拥有的&apos;大陆&apos;领地内的居民 
-是�能从地图上看到你的领地。 
+                        设置在在其他地产上的居民是��以
+                        进入该地产而�需�在访问列表上列出。
  
-默认:�以
+默认: �以
                 </message>
         </alert>
-        <alert name="HelpEstateAllowDirectTeleport" title="�许直接闪电传�">
+        <alert name="HelpEstateAllowDirectTeleport" title="�许直接瞬间移动">
                 <message name="message">
-                        通过验��，用户�被闪电传�至自己领地的
-任何一个点。 未通过验�时, 居民�能被闪电 
-传�至最近的集�点。 
+                        打开该选项�，用户�瞬间移动到你的领地的
+任何一个点。 关闭该选项时, 居民�能瞬间
+移动至最近的瞬间移动枢纽。 
  
 默认: 关
                 </message>
         </alert>
         <alert name="HelpEstateAllowResident" title="�许进入通�">
                 <message name="message">
-                        一旦任何居民被列于此,�往这�领地的通� 
-将对该��上的居民下���上的社团进行�制。 
- 
-(如果此领地�以从大陆上看�,通�就�能对 
-��上的居民或社团进行�制,且这些控制都是无效的。
-�有 &apos;拒�的通�&apos; ���用。
+                        对该地产的访问将仅�于以下列出的居民和社团。
+该设置仅在 “�许公众访问�关闭时有效。
                 </message>
         </alert>
         <alert name="HelpEstateAllowGroup" title="�许社团进入通�">
                 <message name="message">
-                        一旦任何社团被列于此,�往这�领地的通�
-将对��上的社团进行�制，and residents specifically 
-allowed above. 
- 
-(如果此领地�以从大陆上看�,通�就�能对 
-居民或社团��进行�制,且这些控制都是无效的。 
-�有 &apos;拒�的通�&apos; ���用。)
+                        对该地产的访问将仅�列出的社团和以上列出的居民。
+该设置仅在 “�许公众访问�关闭时有效。
                 </message>
         </alert>
-        <alert name="HelpEstateBanResident" title="拒�通过">
+        <alert name="HelpEstateBanResident" title="拒�访问">
                 <message name="message">
                         �管以上社团的设置为什么情况， 
-��上的居民被拒�到达您的领地。
- 
-添加一�居民上此��将把他从�许��
-中删除。
+��上的居民将被拒�到达您的地产。
+                </message>
+        </alert>
+        <alert name="HelpEstateAbuseEmailAddress" title="�良行为报告电�邮件地�">
+                <message name="message">
+                        将这一项设为有效的电�邮件地�会让
+该地产上的�良行为报告�到这个地�。
+留空该项会使得�良行为报告仅��给
+林登实验室。
+                </message>
+        </alert>
+        <alert name="HelpEstateVoiceChat" title="�许语音�天">
+                <message name="message">
+                        �许该地产中的地�拥有自己的语音�天频�，
+                        �以让居民与临近的其他人交谈。
+
+
+默认：关
+                </message>
+        </alert>
+        <alert name="VoiceVersionMismatch" title="语音�天版本�符�">
+                <message name="message">
+                        该版本的第二人生与该地区的语音�天�兼容。
+为了正常使用语音�天你需�更新第二人生。
                 </message>
         </alert>
         <alert name="HelpEstateCovenant" title="�动产契约��">
                 <message name="message">
-                        设置�动产的契约��使你�以连�动产一起出售土地。如果在�动产契约��中没有设置，你则�能出售土地，而�能�独出售�动产。如果在买主购买之�，你�想在土地上设置任何相关的给买主的��和规定，则这张你契约��的注释��能是空的。
+                        设置�动产的契约��使你�以出售地产中的土地。如果�动产契约��没有设置，你则�能出售土地。如果在买主购买之�，你�想在土地上设置任何相关的给买主的��和规定，你的契约��的注释��以是空的。
  
 一个�动产契约���以被用�制定规定和指导方针，表明文化信�或仅仅是你自己对未�买家的期望。它�以包�分区制度，建筑规范，支付方�选择以�任何你认为��，并希望新主人在购买之�看到，并��的�款。
  
 买主必须�守契约��上所标出的规定，在完�消费�，买主�在是���的方格里画钩。�动产契约��总是在任何设置为此的土地中关于土地对�框中��。
                 </message>
         </alert>
-        <alert name="BuyObjectOneOnly" title="�能购买东东">
+        <alert name="BuyObjectOneOnly" title="�能购买物体">
                 <message name="message">
-                        一次�以购买的东东�得多于一件。 
-请仅选择一件东东并�试一�。
+                        一次无法购买一个以上的物体。
+请仅选择一件物体并�试一�。
                 </message>
         </alert>
-        <alert name="BuyObjectOneOwner" title="�能购买东东">
+        <alert name="BuyObjectOneOwner" title="�能购买物体">
                 <message name="message">
-                        一次无法从��主人处购买东东。 
-请仅选择一件东东，�试一次。
+                        一次无法从��主人处购买物体。 
+请仅选择一件物体，�试一次。
                 </message>
         </alert>
         <alert name="BuyContentsOneOnly" title="�能购买内容">
                 <message name="message">
-                        一次�以购买的东东�得多于一件。 
-请仅选择一件东东并�试一�。
+                        一次无法购买一个以上的物体的内容。 
+请仅选择一件物体，并�试一�。
                 </message>
         </alert>
         <alert name="BuyContentsOneOwner" title="�能购买内容">
                 <message name="message">
-                        一次无法从��主人处购买东东。 
-请仅选择一件东东，�试一次。
+                        一次无法从��主人处购买物体。 
+请仅选择一件物体，�试一次。
                 </message>
         </alert>
         <alert name="PermYes">
                 <message name="message">
-                        是
+                        �
                 </message>
         </alert>
         <alert name="PermNo">
@@ -3786,12 +3958,12 @@ allowed above.
         </alert>
         <alert name="BuyOriginal">
                 <message name="message">
-                        是�消费L$[PRICE]购买�始东东?
-你将�为东东的主人。
+                        是�以 L$[PRICE] 购买原物体?
+你将�为物体的主人。
 你将�以：
-修饰: [MODIFYPERM]
+ 修改: [MODIFYPERM]
  �制: [COPYPERM]
- �新出售或馈赠他人: [RESELLPERM]
+ 转�或赠�: [RESELLPERM]
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3802,12 +3974,12 @@ allowed above.
         </alert>
         <alert name="BuyOriginalNoOwner">
                 <message name="message">
-                        是�消费L$[PRICE]购买�始东东?
-你将�为东东的主人。
+                        是�以 L$[PRICE] 购买原物体?
+你将�为物体的主人。
 你将�以：
-修饰: [MODIFYPERM]
+ 修改: [MODIFYPERM]
  �制: [COPYPERM]
- �新出售或馈赠他人: [RESELLPERM]
+ 转�或赠�: [RESELLPERM]
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3818,12 +3990,12 @@ allowed above.
         </alert>
         <alert name="BuyCopy">
                 <message name="message">
-                        是�消费L$[PRICE]从[OWNER]处购买一件拷�?
-这件东东将从你的库存中.
-你�以�的有:
+                        是�以 L$[PRICE] 从 [OWNER] 购买物体的副本?
+这件物体将被�制到你的库存。
+你将�以：
  修改: [MODIFYPERM]
  �制: [COPYPERM]
- �新出售或馈赠他人: [RESELLPERM]
+ 转�或赠�: [RESELLPERM]
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3834,11 +4006,12 @@ allowed above.
         </alert>
         <alert name="BuyCopyNoOwner">
                 <message name="message">
-                        是�消费L$[PRICE]购买东东拷�?
-这件东东将被�制至你的库存中.你将�以：
-修饰: [MODIFYPERM]
+                        是�以 L$[PRICE] 购买物体的副本?
+这件物体将被�制到你的库存。
+你将�以：
+ 修改: [MODIFYPERM]
  �制: [COPYPERM]
- �新出售或馈赠他人: [RESELLPERM]
+ 转�或赠�: [RESELLPERM]
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3849,8 +4022,8 @@ allowed above.
         </alert>
         <alert name="BuyContents">
                 <message name="message">
-                        是�消费L$[PRICE]从[OWNER]处购买内容?
-它们将被拷�到你的库存。
+                        是�以 L$[PRICE] 从 [OWNER] 购买内容?
+它们将被�制到你的库存。
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3861,8 +4034,8 @@ allowed above.
         </alert>
         <alert name="BuyContentsNoOwner">
                 <message name="message">
-                        是�消费L$[PRICE]购买内容?
-它们将被拷�到你的库存。
+                        是�以 L$[PRICE] 购买内容?
+它们将被�制到你的库存。
                 </message>
                 <option name="Buy">
                         è´­ä¹°
@@ -3873,11 +4046,10 @@ allowed above.
         </alert>
         <alert name="ConfirmPurchase">
                 <message name="message">
-                        此项处�将:
+                        此项交易将:
+ [ACTION]
  
-[ACTION]
- 
-你确定你愿�把交易进行下去�?
+你确定�继续购买�？
                 </message>
                 <option name="Confirm">
                         确认
@@ -3888,11 +4060,10 @@ allowed above.
         </alert>
         <alert name="ConfirmPurchasePassword">
                 <message name="message">
-                        此项处�将�:
- 
-[ACTION]
+                        此项交易将:
+ [ACTION]
  
-你确定愿�把交易进行下去�?
+你确定�继续购买�？
 请你�次键入密�并点击确定。
                 </message>
                 <option name="ConfirmPurchase">
@@ -3905,177 +4076,228 @@ allowed above.
         <alert name="SetPickLocation">
                 <message name="message">
                         注�:
-你�上传了�置，其他细节还将��原值.
+您已�更新了该收�的
+地�，但其他的细节�
+会�留其原�的值。
                 </message>
                 <option name="OK">
-                        OK
+                        确定
                 </option>
         </alert>
         <alert name="MoveInventoryFromObject">
                 <message name="message">
-                        你已�选择 &apos;���制&apos;的库存东东。
-这些东东将被移出库存，�能被�制。
+                        你已�选择 ‘���制’ 的物��目。
+这些物体将被移入库存，而�是被�制。
  
-确定移动库存东东�?
+确定移动物体�?
                 </message>
+                <ignore name="ignore">
+                        从物体内容中移动���制的�目
+                </ignore>
                 <option name="Move">
                         移动
                 </option>
                 <option name="Don&apos;tMove">
-                        �止移动
+                        ��移动
                 </option>
         </alert>
         <alert name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        你已�选择 &apos;���制&apos;的库存东东。
-这些东东将被移出库存，�能被�制。
- 
-因为此东东已�被记录,移动它至你的 
-目录�能会导致脚本故障。 
+                        你已�选择 ‘���制’ 的物��目。
+这些物体将被移入库存，而�是被�制。
  
-确定移动库存东东?
+由于此物体带有脚本，将这些�目移动到
+你的库存�能造�脚本故障。
+
+确定移动物体�?
                 </message>
                 <option name="Move">
                         移动
                 </option>
                 <option name="Don&apos;tMove">
-                        �止移动
+                        ��移动
                 </option>
         </alert>
         <alert name="ClickActionNotPayable">
                 <message name="message">
-                        警告：购买东东选项已设定,但它仅在 
-脚本被添加到金钱支付()情节时�能使用. 
-这是因为居民通常希望钱一旦支付,
-购买的东东就�以使用.
+                        警告：�物体付款的动作已�设定，但它仅在 
+添加了带有 money() 事件的脚本��能工作。
                 </message>
+                <ignore name="ignore">
+                        在物体上设置付款动作但没有 money() 事件时
+                </ignore>
         </alert>
         <alert name="OpenObjectCannotCopy">
                 <message name="message">
-                        在你�许�制的对象中没有找到项目。
+                        这个物体中没有你能够�制的项目。
                 </message>
         </alert>
-        <alert name="LoadAccountTransactions">
+        <alert name="WebLaunchAccountHistory">
                 <message name="message">
-                        是�跳至[URL] 
-查看处�细节?
+                        是��往第二人生网站查看你的�户记录？
                 </message>
-                <option name="OK">
-                        OK
+                <ignore name="ignore">
+                        打开�览器查看�户记录
+                </ignore>
+                <option name="Gotopage">
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
                 </option>
         </alert>
-        <alert name="HelpReportAbuse">
+        <alert name="ClickOpenF1Help">
                 <message name="message">
-                        Use this tool to report violations of the Terms of Service and Community Standards. See: 
-http://secondlife.com/corporate/tos.php 
-http://secondlife.com/corporate/cs.php 
- 
-All reported abuses of the Terms of Service and Community Standards 
-are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. 
-You can also view the incident resolution on the Police Blotter at: 
- 
-http://secondlife.com/community/blotter.php
+                        访问第二人生帮助网站�？
                 </message>
+                <ignore name="ignore">
+                        访问第二人生帮助网站时
+                </ignore>
+                <option name="Gotopage">
+                        打开页�
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="RetryFetchInventoryDescendents">
+                <message name="message">
+                        从�务器获�库存超时。�试一次�？
+                </message>
+                <ignore name="ignore">
+                        �试读�库存
+                </ignore>
+                <option name="Retry">
+                        �试
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="ConfirmQuit">
+                <message name="message">
+                        确定退出?
+                </message>
+                <ignore name="ignore">
+                        退出第二人生时
+                </ignore>
+                <option name="Quit">
+                        退出
+                </option>
+                <option name="Continue">
+                        继续
+                </option>
         </alert>
         <alert name="HelpReportAbuseEmailLL">
                 <message name="message">
-                        使用这个工具�以报告���务和社区标准�例的�作。详情请�： 
+                        使用这个工具�以报告���务�例和社区标准�例的�作。详情请�： 
 -
 http://secondlife.com/corporate/tos.php 
 http://secondlife.com/corporate/cs.php 
 -
-所有对���务和社区标准�例的报告都会被调查并解决。你会收到一�邮件�示你解决的进展情况。�时，你�以在线查看秩�本，�时获得事件的解决情况。在线秩�本的地�是:
+所有对���务和社区标准�例的报告都会被调查并解决。你会
+收到一�邮件�示你解决的进展情况。�时，你�以在线查看事
+件报告，�时获得事件的解决情况。在线秩�本的地�是:
 - 
-http://secondlife.com/community/blotter.php
+http://secondlife.com/support/incidentreport.php
                 </message>
         </alert>
         <alert name="HelpReportAbuseEmailEO">
                 <message name="message">
-                        ���示: 这个报告将�会到达林登实验室处，而会��给你目�所在区域的主人。
+                        ���示: 这个报告将�会到达林登实验室处，而会��给你
+目�所在区域的主人。
 -
-作为一项针对于居民和游客的�务，你所在这�区域的主人有责任接�所有�自这�区域的问题报告，并有责任解决它们。林登实验室将�会调查你从所在地点�交的问题报告。这�区域的主人将�守土地契约，解决一些基于此�区域的本地规则的报告。（查看土地土地契约，�以进入游�
+作为一项针对于居民和游客的�务，你所在这�区域的主人有责任
+接�所有�自这�区域的问题报告，并有责任解决它们。
+林登实验室将�会调查你从所在地点�交的问题报告。
+
+这�区域的主人将�守基于土地契约所概述的当地规则，解决报告。
+(你�以从世界��中选择 “关于土地� �查看契约。)
+
+该报告的解决结果仅对该区域有效；居民对第二人生其他地方的使用
+将�会�该报告结果的影�。�有林登实验室能够�制访问整个
+第二人生。
                 </message>
         </alert>
         <alert name="HelpReportBug">
                 <message name="message">
-                        Use this tool to report technical features that do not perform 
-as described or expected. All bug reports are investigated and 
-resolved. No email response will be sent, you may reply to the 
-auto-response email to add more details to your report. 
-If you are having a technical difficulty, please contact Support at: 
- 
+                        这个工具�用�报告与�述或预期工作�一致的技术功能。请尽能�供详细资料。
+你也�以回�自动确认电�邮件�为你的报告添加更多细节。
+
+所有的错误都会被追查并评估。�会有任何电�邮件回�。
+
+如果你�到了技术障�，请与支��得�系：
+
 http://secondlife.com/community/support.php
+
+注�：�完整的报告将�会被调查。
                 </message>
         </alert>
         <alert name="HelpReportAbuseSelectCategory">
                 <message name="message">
-                        请为次辱骂事件报告选择一项分类。
- 
-选择一个分类�以帮助我们归档和处�辱骂事件。
+                        请为此次�良行为报告选择一项分类。
+ 选择一个分类�以帮助我们归档和处��良行为报告。
                 </message>
         </alert>
         <alert name="HelpReportBugSelectCategory">
                 <message name="message">
-                        Please select a category for this bug.
- 
-Selecting a category helps us file and process bug reports.
+                        请为此次错误报告选择一项分类。
+ 选择一个分类�以帮助我们归档和处�错误报告。
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserNameEmpty">
                 <message name="message">
-                        请输入辱骂者的�字.
- 
-输入正确的�述�以帮助我们归档和处�辱骂事件。
+                        请输入辱骂者的�字。
+输入正确的�述�以帮助我们归档和处��良行为报告。
                 </message>
         </alert>
         <alert name="HelpReportAbuseAbuserLocationEmpty">
                 <message name="message">
-                        请输入辱骂事件�生的地�。
+                        请输入�良行为�生的地�。
  
-输入正确的�述�以帮助我们归档和处�辱骂事件。
+输入正确的�述�以帮助我们归档和处��良行为报告。
                 </message>
         </alert>
         <alert name="HelpReportAbuseSummaryEmpty">
                 <message name="message">
-                        请输入已�生的辱骂事件的概括。
+                        请输入�良行为的概况。
  
-输入对事件的正确�述�以帮助我们归档和处�辱骂事件。
+输入对事件的正确�述�以帮助我们归档和处��良行为报告。
                 </message>
         </alert>
         <alert name="HelpReportBugSummaryEmpty">
                 <message name="message">
-                        Please enter a summary of the bug.
+                        请输入错误概况。
  
-Entering an accurate summary helps us file and process bug reports.
+输入对事件的正确�述�以帮助我们归档和处�错误报告。
                 </message>
         </alert>
         <alert name="HelpReportAbuseDetailsEmpty">
                 <message name="message">
-                        请键入已�生的辱骂事件的详细�述.请尽�详细�述，包括你报告事件的�称和细节。
+                        请键入�良行为的详细�述。请尽�具体地�述，包括�字和报告事件细节。
 
  输入对事件的正确�述�以帮助我们归档和处�辱骂事件。
                 </message>
         </alert>
         <alert name="HelpReportBugDetailsEmpty">
                 <message name="message">
-                        Please enter a detailed description of the bug.
-Be as specific as you can, including steps to reproduce the bug
-if possible.
+                        请键入错误的详细�述。
+请尽�具体地�述，�能的�包括如何�现错误的步骤。
  
-Entering an accurate description helps us file and process bug reports.
+输入对事件的正确�述�以帮助我们归档和处�错误报告。
                 </message>
         </alert>
         <alert name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         亲爱的居民,
+如果您将�报告知识产�侵犯，请确认您通过正确的方�报告:
+
+(1) �良行为报告手续。您�以�交一份�良行为报告，如果您相信��居民正在利用第二人生许�系统的�洞，例如使用 CopyBot 或者类似的�制工具，�侵犯知识产�。�良行为调查�组负责对于��第二人生社区标准或�务�款的行为进行调查以�实行相应的惩罚措施。但是，�良行为调查�组�负责从世界中移除内容，并且�会对这类请求作出回应。
  
-关于版�侵害的报告�能通过下列网页上http://secondlife.com/corporate/dmca.php�述的方��交.
+(2) DMCA (数字�年版��定) 或者说内容移除手续。 �请求从第二人生中去除内容，您*必须*�交一份按我们 DMCA �例 http://secondlife.com/corporate/dmca.php 中所指出的，有效的侵�通知。
  
-关于版�侵害的报告，如果通过&apos;辱骂报告&apos;方��交，将被系统自动忽视。如果您的报告和版�侵害无关，请关闭此窗�，并完��交您的报告。
+如果您�希望继续�良行为的报告，请关闭此窗�，并完��交您的报告。
+您�能需�选择 ‘CopyBot 或利用�洞’ 这一特定分类。
 
 感谢您的�作,
  
@@ -4084,55 +4306,558 @@ Entering an accurate description helps us file and process bug reports.
         </alert>
         <alert name="FailedRequirementsCheck">
                 <message name="message">
-                        以下�求的内容是丢失于[FLOATER]:
+                        以下必须的部件丢失于 [FLOATER]:
 [COMPONENTS]
                 </message>
         </alert>
         <alert name="ReplaceAttachment" title="替�已�存在的附件">
                 <message name="message">
-                        这里已�有一件东东附在了你的身体上。                        你是��用所选东东替代它？
+                        已�有一个物体附在身体的这个部�上了。                  你是��用所选物体替代它？
                 </message>
-                <option ignore="自动��" name="Yes">
+                <ignore name="ignore">
+                        替�已有的附件时
+                </ignore>
+                <option ignore="自动替�" name="Yes">
                         是
                 </option>
-                <option ignore="永远���" name="No">
+                <option ignore="永远�替�" name="No">
                         �
                 </option>
         </alert>
-        <alert name="BusyModePay" title="�忙模�警告">
+        <alert name="BusyModePay" title="忙碌模�警告">
                 <message name="message">
                         你在忙碌模�中, 这�味�你将�能
-收到这次交易中以找零形�
-�供的任何物�。
+收到这次交易中对方�供的任何物�。
  
-你是�愿�在完�处��
-退出�忙模�?
+你是�愿�在完�交易�
+退出忙碌模�?
                 </message>
-                <option ignore="总使用忙碌模�" name="Yes">
+                <ignore name="ignore">
+                        忙碌模�中付款给他人或物体时
+                </ignore>
+                <option ignore="总离开忙碌模�" name="Yes">
                         是
                 </option>
-                <option ignore="从�使用忙碌模�" name="No">
+                <option ignore="从�离开忙碌模�" name="No">
                         �
                 </option>
         </alert>
         <alert name="ConfirmEmptyTrash">
                 <message name="message">
-                        你确定�永久性删除垃圾文件夹里的内容�？
+                        你确定�永久性删除垃圾箱里的内容�？
                 </message>
+                <ignore name="ignore">
+                        清空库存垃圾箱文件夹时
+                </ignore>
                 <option name="Yes">
-                        使得，我�删除
+                        是的，删除
                 </option>
                 <option name="No">
                         �是
                 </option>
         </alert>
+        <alert name="ConfirmClearBrowserCache">
+                <message name="message">
+                        确实�清除�览器缓存�？
+                </message>
+                <option name="Yes">
+                        清除
+                </option>
+                <option name="No">
+                        �消
+                </option>
+        </alert>
+        <alert name="ConfirmClearCookies">
+                <message name="message">
+                        确实�清除 Cookies �？
+                </message>
+                <option name="Yes">
+                        清除
+                </option>
+                <option name="No">
+                        �消
+                </option>
+        </alert>
+        <alert name="ConfirmClearMediaUrlList">
+                <message name="message">
+                        确实�清除�存的 URL 列表�？
+                </message>
+                <option name="Yes">
+                        清除
+                </option>
+                <option name="No">
+                        �消
+                </option>
+        </alert>
         <alert name="CopySLURL">
                 <message name="message">
                         以下链接已�被�制到你的剪贴�中:
    
     [SLURL] 
    
-  把它加入到网页里，�以让别人更容易的进入这个地点，或者直接拉入�览器的地��中，让自己进入这个地点。
+  把它加入到网页里，让别人更容易的访问这个地点，
+  或者直接粘贴到�览器的地��中自己�试一下。
+                </message>
+        </alert>
+        <alert name="ConfirmEmptyLostAndFound">
+                <message name="message">
+                        你确定�永久性删除失物招领文件夹里的内容�？
+                </message>
+                <ignore name="ignore">
+                        清空库存失物招领文件夹时
+                </ignore>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
+        <alert name="GraphicsPreferencesHelp">
+                <message name="message">
+                        该��控制窗�尺寸和分辨率，以�客户端图形质�。你�以选择四�图�等级：低�中�高和�高。你也�以选择自定义，�更改以下的设置：
+
+�色器：�用或�用���素�色器。
+
+�射细节：设置�以�射的物体类型。
+
+化身渲染：设置影�客户端渲染化身的选项。
+
+�绘�离: 影�离你的视角多远的物体将会被渲染在场景中。
+
+最大粒�数:设置你在�幕上�时��粒�的最大数目。
+
+�期处�质�：设置光辉渲染的分辨率。
+
+模型细节: 设置渲染�类物体时的细节，或者说使用三角形的数目。较高的值渲染时间较长，但会令物体显得更具细节。
+
+光照细节: 选择你想�渲染什么类型的�光。
+
+地�细节: 选择地��质细节�。
+                </message>
+        </alert>
+        <alert name="WLSavePresetAlert">
+                <message name="message">
+                        你希望覆盖�存的预设�？
+                </message>
+                <option name="Save">
+                        �存
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WLDeletePresetAlert">
+                <message name="message">
+                        你希望删除 [SKY] �?
+                </message>
+                <option name="Delete">
+                        删除
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="WLNoEditDefault">
+                <message name="message">
+                        你�能编辑或删除默认预设。
+                </message>
+        </alert>
+        <alert name="WLMissingSky">
+                <message name="message">
+                        该日期循环文件�考了一个�存在的天空文件: [SKY].
+                </message>
+        </alert>
+        <alert name="PPSaveEffectAlert">
+                <message name="message">
+                        �处�效果已存在。还是想�覆盖它�？
+                </message>
+                <option name="Save">
+                        是
+                </option>
+                <option name="Cancel">
+                        �
+                </option>
+        </alert>
+        <alert name="HelpEditSky">
+                <message name="message">
+                        编辑 WindLight 滑动�创建和�存天空设定。
+                </message>
+        </alert>
+        <alert name="HelpEditDayCycle">
+                <message name="message">
+                        选择一天之内出现哪些天空。
+                </message>
+        </alert>
+        <alert name="EnvSettingsHelpButton">
+                <message name="message">
+                        这些设置调节环境在您的电脑上看起�怎么样。您的显�需�支�大气染色器�能利用全部的设置。
+ 
+调节 &quot;时间&quot; 滑��在本地改�一日的时间。
+ 
+调节 &quot;云层覆盖&quot; 滑��控制云彩的多少。
+ 
+选择 &quot;水色&quot; 改�水的颜色。
+ 
+调节 &quot;水雾&quot; 控制水下的雾的浓淡。
+ 
+点击 &quot;使用地产时间&quot; 使时间返回到区域的时间并与之�步。
+ 
+点击 &quot;高级天空选项&quot; �打开较高级天空设置的编辑器。
+ 
+点击 &quot;高级水�选项&quot; �打开较高级水�设置的编辑器。
+                </message>
+        </alert>
+        <alert name="HelpDayCycle">
+                <message name="message">
+                        日夜周期编辑器给予你对第二人生日夜循环中天空的控制。这也是基础环境编辑器的时间滑�所使用的周期。
+
+日夜周期编辑器的基础是关键帧。它们是带有天空预设的节点 (在时间图上以�色的点表示)。当时间��，WindLight 的天空 也会通过过在这些关键帧之间�值而产生�化。
+
+在时间线之上的黄色箭头表示您当�所看到天空的时间。拖动它�以看到您的天空将如何�化。您�以按�边的添加键和删除键按钮�添加或删除关键帧。
+
+您�以通过在时间线上拖动关键帧�改�其时间�置，也�以直接在关键帧设置中直接设置它的值。在关键帧设置中，您�以将关键帧与其相应的 WindLight 预设�系起�。
+
+周期长度决定一天的时间长短。将这个值设得较低 (例如，2 分钟) �味�您整个 24 �时的时间线完��化的时间将�有实际的两分钟�一旦您对时间线和关键帧周期满�，使用播放和�止按钮�预览结果。切记 — 您也�以拖动黄色的时间指示箭头观看天空�化。使用使用地产时间按钮将使您的全天长度与时间和地产的日夜周期�步。
+
+当您对您的日夜周期满�时，您�以使用�存测试日和读�测试日按钮将其�存。请注�，我们现在��许一个日夜周期。
+                </message>
+        </alert>
+        <alert name="HelpBlueHorizon">
+                <message name="message">
+                        使用 红色/绿色/�色 (RGB) 滑��编辑天空的颜色。您�以用强度 (I) 滑���时移动红绿�滑�。
+                </message>
+        </alert>
+        <alert name="HelpHazeHorizon">
+                <message name="message">
+                        云雾地平是调节整个场景�光最有用的�数。它�以有效地模仿多��光设定，
+例如雪天白茫茫一片的场景以��光�足较阴暗的场景。
+                </message>
+        </alert>
+        <alert name="HelpBlueDensity">
+                <message name="message">
+                        �色浓度影�整个天空和雾的饱和度。如果您将强度 (I) 滑���移动，颜色将�得更亮�更鲜艳。如果您将其移动到最左边，颜色将�得暗淡，直到最��为黑白。如果您想�精细的调节天空的颜色平衡，您�以使用红色/绿色/�色 (RGB) 滑��独控制�个颜色的饱和度。
+                </message>
+        </alert>
+        <alert name="HelpHazeDensity">
+                <message name="message">
+                        云雾浓度控制大气中�蒙蒙雾霾的�。在模拟�有大�烟雾和人造污染物的场景时很有效。也适于模拟雾和霭。
+                </message>
+        </alert>
+        <alert name="HelpDensityMult">
+                <message name="message">
+                        浓度乘数�以用�影�整个的大气浓度。在较低的设定上，它�以表现出 “稀薄空气� 的感�，而较高的设定将会创造厚�而浓的效果。
+                </message>
+        </alert>
+        <alert name="HelpDistanceMult">
+                <message name="message">
+                        调节 WindLight 的�离效果。设置为零将等�于关闭 WindLight 对地�和物体的作用。大于 1 的值模拟比实际更深的�离，产生更浓的气象效果。
+                </message>
+        </alert>
+        <alert name="HelpMaxAltitude">
+                <message name="message">
+                        最大高度调节 WindLight 进行气象计算时所作的高度计算。  在�晚时分时，用它�调节日�的 ‘深度’ 很有作用。
+                </message>
+        </alert>
+        <alert name="HelpSunlightColor">
+                <message name="message">
+                        调节场景中的直射光�的亮度和颜色。
+                </message>
+        </alert>
+        <alert name="HelpSunAmbient">
+                <message name="message">
+                        调节场景中的环境光亮度和颜色。
+                </message>
+        </alert>
+        <alert name="HelpSunGlow">
+                <message name="message">
+                        尺寸滑�控制太阳的尺寸。
+�焦滑�调节太阳在天空中模糊的程度。
+                </message>
+        </alert>
+        <alert name="HelpSceneGamma">
+                <message name="message">
+                        调节�幕的明暗分布。
+                </message>
+        </alert>
+        <alert name="HelpStarBrightness">
+                <message name="message">
+                        调节天空中星星的亮度。
+                </message>
+        </alert>
+        <alert name="HelpTimeOfDay">
+                <message name="message">
+                        调节太阳在天空中的�置。
+类似高度。
+                </message>
+        </alert>
+        <alert name="HelpEastAngle">
+                <message name="message">
+                        调节太阳在天空中的�置。
+类似方�角。
+                </message>
+        </alert>
+        <alert name="HelpCloudColor">
+                <message name="message">
+                        编辑云的颜色。一般�说，
+建议还是白一点好，�过嘛，
+想�有点�趣当然也没问题。
+                </message>
+        </alert>
+        <alert name="HelpCloudDetail">
+                <message name="message">
+                        控制覆盖在在主云层图�之上的细节图。X 和 Y 控制它的�置。 D (密度) 控制云看起�是蓬�还是离散。
+                </message>
+        </alert>
+        <alert name="HelpCloudDensity">
+                <message name="message">
+                        �以用 X 和 Y 滑�控制云层的�置，D (密度) 控制云层的密度。
+                </message>
+        </alert>
+        <alert name="HelpCloudCoverage">
+                <message name="message">
+                        控制云覆盖天空的�。
+                </message>
+        </alert>
+        <alert name="HelpCloudScale">
+                <message name="message">
+                        控制云层在穹顶上的大�。
+                </message>
+        </alert>
+        <alert name="HelpCloudScrollX">
+                <message name="message">
+                        控制云层在 X 轴移动的速度。
+                </message>
+        </alert>
+        <alert name="HelpCloudScrollY">
+                <message name="message">
+                        控制云层在 Y 轴移动的速度。
+                </message>
+        </alert>
+        <alert name="HelpClassicClouds">
+                <message name="message">
+                        选�该框以在渲染 WindLight 的云层�时渲染第二人生的旧云层。
+                </message>
+        </alert>
+        <alert name="HelpWaterFogColor">
+                <message name="message">
+                        控制水雾颜色。
+                </message>
+        </alert>
+        <alert name="HelpWaterFogDensity">
+                <message name="message">
+                        控制水雾浓度�水下视野范围。
+                </message>
+        </alert>
+        <alert name="HelpUnderWaterFogMod">
+                <message name="message">
+                        修饰水雾浓度指数的效果，控制水下视野范围。
+                </message>
+        </alert>
+        <alert name="HelpWaterGlow">
+                <message name="message">
+                        控制水��光的范围。
+                </message>
+        </alert>
+        <alert name="HelpWaterNormalScale">
+                <message name="message">
+                        控制组�水�的三个�波的缩放。
+                </message>
+        </alert>
+        <alert name="HelpWaterFresnelScale">
+                <message name="message">
+                        控制��角度�射的光�多少。
+                </message>
+        </alert>
+        <alert name="HelpWaterFresnelOffset">
+                <message name="message">
+                        控制�光强度。
+                </message>
+        </alert>
+        <alert name="HelpWaterScaleAbove">
+                <message name="message">
+                        控制水�上放折射光�的大�。
+                </message>
+        </alert>
+        <alert name="HelpWaterScaleBelow">
+                <message name="message">
+                        控制水�下方折射光�的大�。
+                </message>
+        </alert>
+        <alert name="HelpWaterBlurMultiplier">
+                <message name="message">
+                        控制水波和折射混�的方�。
+                </message>
+        </alert>
+        <alert name="HelpWaterNormalMap">
+                <message name="message">
+                        改�决定水��射/折射的法�贴图。
+                </message>
+        </alert>
+        <alert name="HelpWaterWave1">
+                <message name="message">
+                        控制较大尺寸的法�贴图在 X 和 Y 方�上移动的速度。
+                </message>
+        </alert>
+        <alert name="HelpWaterWave2">
+                <message name="message">
+                        控制较�尺寸的法�贴图在 X 和 Y 方�上移动的速度。
+                </message>
+        </alert>
+        <alert name="NewSkyPreset">
+                <message name="message">
+                        给新的天空�一个�字。
+                </message>
+                <editline name="editline">
+                        新设定
+                </editline>
+                <option name="OK">
+                        确定
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="ExistsSkyPresetAlert">
+                <message name="message">
+                        预设已存在�
+                </message>
+        </alert>
+        <alert name="NewWaterPreset">
+                <message name="message">
+                        给新的水��一个�字。
+                </message>
+                <editline name="editline">
+                        新设定
+                </editline>
+                <option name="OK">
+                        确定
+                </option>
+                <option name="Cancel">
+                        �消
+                </option>
+        </alert>
+        <alert name="ExistsWaterPresetAlert">
+                <message name="message">
+                        预设已存在�
+                </message>
+        </alert>
+        <alert name="WaterNoEditDefault">
+                <message name="message">
+                        您�能更改或删除默认预设。
+                </message>
+        </alert>
+        <alert name="ChatterBoxSessionStartError">
+                <message name="message">
+                        无法与 [RECIPIENT] 开始会�。
+[REASON]
+                </message>
+                <option name="OK">
+                        确定
+                </option>
+        </alert>
+        <alert name="ChatterBoxSessionStartNotVerified">
+                <message name="message">
+                        �动与 [RECIPIENT] 的�天会�时出错。
+[REASON]
+                </message>
+                <option name="OK">
+                        确定
+                </option>
+        </alert>
+        <alert name="ChatterBoxSessionEventError">
+                <message name="message">
+                        [EVENT]
+[REASON]
+                </message>
+                <option name="OK">
+                        确定
+                </option>
+        </alert>
+        <alert name="ForceCloseChatterBoxSession">
+                <message name="message">
+                        您与 [NAME] 的�天会�必须关闭。
+[REASON]
+                </message>
+                <option name="OK">
+                        确定
+                </option>
+        </alert>
+        <alert name="Cannot_Purchase_an_Attachment">
+                <message name="message">
+                        物�作为附件时无法购买。
+                </message>
+        </alert>
+        <alert name="DebitPermissionDetails" title="About Requests for the Debit Permission">
+                <message name="message">
+                        授予该请求将给予脚本�续的从您的�户中��林登� (L$) 的许�。��消这项许�，物体的拥有者必须删除物体或�置物体中的脚本。
+                </message>
+                <option name="OK">
+                        确定
+                </option>
+        </alert>
+        <alert name="AutoWearNewClothing">
+                <message name="message">
+                        希望自动穿�您创建的衣物�？
+                </message>
+                <ignore name="ignore">
+                        自动穿�新衣物
+                </ignore>
+                <option name="Yes">
+                        是
+                </option>
+                <option name="No">
+                        �
+                </option>
+        </alert>
+        <alert name="BadURL">
+                <message name="message">
+                        第二人生�知�怎么处�这个链接:
+ [SLURL]
+大部分链接�是这样的:
+
+secondlife:///app/agent/ae1c96b8-9bca-4e5b-9418-80e5397a2b41/about
+
+请检查拼写�试一次。
+                </message>
+        </alert>
+        <alert name="NotAgeVerified">
+                <message name="message">
+                        您需�验�年龄�能进入这个地�。
+您希望访问第二人生网站验�您的年龄�？
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        警告没有验�年龄时
+                </ignore>
+                <option name="Yes">
+                        是
+                </option>
+                <option name="No">
+                        �
+                </option>
+        </alert>
+        <alert name="无法进入地�: 支付信��在案">
+                <message name="message">
+                        这个地�需�你登记支付信�然��能访问它。
+您�访问第二人生网站�登记�？
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        警告缺少支付信�
+                </ignore>
+                <option name="Yes">
+                        是
+                </option>
+                <option name="No">
+                        �
+                </option>
+        </alert>
+        <alert name="MissingString">
+                <message name="message">
+                        strings.xml 中找�到字符串 [STRING_NAME]
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index bee9def..621195d 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="关于第二人生">
         <text_editor name="credits_editor">
-                第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ and many others.
+                第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les 以�更多人。 
 
-感谢以下居民，他们的帮助��了这次第二人生的版本是有�以�最出色的: Aminom Marvin, ava ganache, Balthazar Fouroux, CrystalShard Foo, Davec Horsforth, Drew Dwi, Ellla McMahon, Gellan Glenelg, Harleen Gretzky, istephanija munro, Iustinian Tomsen, JC Glimmer, Joeseph Albanese, kelly young, Latif Khalifa, Lex Neva, McCabe Maxsted, Michi Lumin, moni duettmann, Moon Metty, motor loon, Opensource Obscure, Sky Hye, Soap Clawtooth, velveeta biedermann, zeebster colasanti
+感谢以下居民，他们的帮助��了这次第二人生的版本是有�以�最出色的: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
 
 
-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  GL Copyright (C) 1999-2004 Brian Paul.
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+  3Dconnexion SDK Copyright © 1992-2007 3Dconnexion
+  APR Copyright © 2000-2004 The Apache Software Foundation
+  cURL Copyright © 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  DBus/dbus-glib Copyright © 2002, 2003  CodeFactory AB / Copyright © 2003, 2004 Red Hat, Inc.
+  expat Copyright © 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  FreeType Copyright © 1996-2002, The FreeType Project (www.freetype.org).
+  GL Copyright © 1999-2004 Brian Paul.
+  Havok.com(TM) Copyright © 1999-2001, Telekinesys Research Limited.
+  jpeg2000 Copyright © 2001, David Taubman, The University of New South Wales (UNSW)
+  jpeglib Copyright © 1991-1998, Thomas G. Lane.
+  ogg/vorbis Copyright © 2001, Xiphophorus
+  OpenSSL Copyright © 1998-2002 The OpenSSL Project.
+  SDL Copyright © 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  SSLeay Copyright © 1995-1998 Eric Young (eay@cryptsoft.com)
+  xmlrpc-epi Copyright © 2000 Epinions, Inc.
+  zlib Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.
 
   All rights reserved.  查看licenses.txt获�细节.
 
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+  语音�天音频编�: Polycom® Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
-
-  We can only see a short distance ahead, but we can see plenty there that needs to be done. --Alan Turing
+�所能�之途虽近，而所�需�之事已多矣。—— 亚兰·图�
         </text_editor>
+        <string name="you_are_at">
+                您现在�于 [POSITION]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
index 63ac152..8f3d1da 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floaterland" title="关于土地">
         <tab_container name="landtab">
-                <panel label="General" name="land_general_panel">
+                <panel label="一般" name="land_general_panel">
                         <text type="string" length="1" name="Name:">
                                 �字:
                         </text>
@@ -16,20 +16,20 @@
                         </text>
                         <button label="档案..." label_selected="档案..." name="Profile..." />
                         <text type="string" length="1" name="Group:">
-                                Group:
+                                社团:
                         </text>
-                        <button label="调节..." label_selected="调节..." name="Set..." />
+                        <button label="更改..." label_selected="更改..." name="Set..." />
                         <check_box label="�许转让给社团" name="check deed"
-                             tool_tip="一个社团官员�以转让这�土地至社团，所以它将被社团和目�的土地分�情况支�。" />
-                        <button label="契约..." label_selected="契约..." name="Deed..."
-                             tool_tip="如果你是所选社团中的官员，则你�能�能转让土地." />
-                        <check_box label="地主义转让的形��献" name="check contib"
-                             tool_tip="当土地被转让给社团时, �一个主人贡献足够的土地�置以支�土地的�行." />
+                             tool_tip="一个社团官员�以转让这�土地至社团，使其被社团的土地��支�。" />
+                        <button label="转让..." label_selected="转让..." name="Deed..."
+                             tool_tip="�有你是所选社团官员的时候�能转让土地。" />
+                        <check_box label="拥有者在转让�时给出贡献" name="check contib"
+                             tool_tip="当土地被转让给社团时, �一个主人贡献足够的土地��以支�土地的�行。" />
                         <text type="string" length="1" name="For Sale:">
-                                å¾…å”®:
+                                出售:
                         </text>
                         <text type="string" length="1" name="Not for sale.">
-                                ��状�
+                                ��状�。
                         </text>
                         <text type="string" length="1" name="For Sale: Price L$[PRICE].">
                                 ä»·æ ¼: L$[PRICE].
@@ -39,38 +39,38 @@
                                 出售给: [BUYER]
                         </text>
                         <text type="string" length="1" name="Sell with landowners objects in parcel.">
-                                包括代售状�的东东.
+                                出售中包括物体。
                         </text>
                         <text type="string" length="1" name="Selling with no objects in parcel.">
-                                �包括代售状�下的东东.
+                                出售中�包括物体。
                         </text>
                         <button label="�消土地出售" label_selected="�消土地出售"
                              name="Cancel Land Sale" />
                         <text type="string" length="1" name="Claimed:">
-                                声明:
+                                认购时间:
                         </text>
-                        <text type="string" length="1" name="DateClaimText">
+                        <text type="string" length="1" name="DateClaimText"><!--placeholder-->
                                 星期二 八月15日 13:47:25 2006年
                         </text>
                         <text type="string" length="1" name="PriceLabel">
                                 �积：
                         </text>
-                        <text type="string" length="1" name="PriceText">
+                        <text type="string" length="1" name="PriceText"><!--placeholder-->
                                 4048平方米.
                         </text>
                         <text type="string" length="1" name="Traffic:">
-                                交通:
+                                ��:
                         </text>
-                        <text type="string" length="1" name="DwellText">
+                        <text type="string" length="1" name="DwellText"><!--placeholder-->
                                 0
                         </text>
                         <button label="购买土地..." label_selected="购买土地..." name="Buy Land..." />
                         <button label="为社团购买..." label_selected="为社团购买..."
                              name="Buy For Group..." />
-                        <button label="通过…购买" label_selected="通过…购买" name="Buy Pass..."
-                             tool_tip="通行��供给你一个暂时通往这�土地的通�。" />
+                        <button label="购买通行�..." label_selected="购买通行�..." name="Buy Pass..."
+                             tool_tip="通行�让你�以暂时访问这�土地。" />
                         <button label="放弃土地..." label_selected="放弃土地..." name="Abandon Land..." />
-                        <button label="放弃土地..." label_selected="放弃土地..." name="Reclaim Land..." />
+                        <button label="回认土地..." label_selected="回认土地..." name="Reclaim Land..." />
                         <button label="林登出售..." label_selected="林登出售..." name="Linden Sale..."
                              tool_tip="土地必需有主人， 设定内容以���被��。" />
                         <text name="new users only">
@@ -79,9 +79,53 @@
                         <text name="anyone">
                                 任何人
                         </text>
+                        <string
+                                 name="area_text">
+                                �积
+                        </string>
+                        <string
+                                 name="area_size_text">
+                                [AREA] 平方米
+                        </string>
+                        <string
+                                 name="auction_id_text">
+                                �� ID: [ID]
+                        </string>
+                        <string
+                                 name="need_tier_to_modify">
+                                您必须确认购买�能修改这�土地。
+                        </string>
+                        <string
+                                 name="group_owned_text">
+                                (社团所有)
+                        </string>
+                        <string
+                                 name="profile_text">
+                                档案...
+                        </string>
+                        <string
+                                 name="info_text">
+                                信�...
+                        </string>
+                        <string
+                                 name="public_text">
+                                (公共)
+                        </string>
+                        <string
+                                 name="none_text">
+                                (æ— )
+                        </string>
+                        <string
+                                 name="sale_pending_text">
+                                (等待出售中)
+                        </string>
+                        <string name="no_selection_text">
+                        没有选中的地�。
+请到 世界�� > 关于土地 或选择�一�地��显示详细资料。
+                        </string>
                 </panel>
                 <panel label="契约��" name="land_covenant_panel">
-                        <text type="string" length="1" name="covenant_timestamp_text">
+                        <text type="string" length="1" name="covenant_timestamp_text"><!--placeholder, not translatable-->
                                 上次修改时间 星期三12 月3 1日 16:00:00 1969年
                         </text>
                         <text type="string" length="1" name="region_name_lbl">
@@ -91,139 +135,159 @@
                                 leyla
                         </text>
                         <text type="string" length="1" name="estate_name_lbl">
-                                �人领地:
+                                地产:
                         </text>
-                        <text type="string" length="1" name="estate_name_text">
+                        <text type="string" length="1" name="estate_name_text"><!--placeholder, not translatable-->
                                 大陆
                         </text>
                         <text type="string" length="1" name="estate_owner_lbl">
-                                �动产主人:
+                                地产主人:
                         </text>
-                        <text type="string" length="1" name="estate_owner_text">
+                        <text type="string" length="1" name="estate_owner_text"><!--placeholder, not translatable-->
                                 (æ— )
                         </text>
                         <text type="string" length="1" name="resellable_clause">
-                                这�区域内被购买的土地�能�能被�新出售。
+                                这�区域内购买的土地�能被�新出售。
                         </text>
                         <text type="string" length="1" name="changeable_clause">
-                                这�区域内被购买的土地�能�能被连接/划分。
+                                这�区域内购买的土地�能被�并/划分。
                         </text>
-                        <text_editor type="string" length="1" name="covenant_editor">
-                                这��动产没有�供任何契约��。
+                        <text_editor type="string" length="1" name="covenant_editor"><!--placeholder, not translatable-->
+                                这�地产没有�供任何契约��。
                         </text_editor>
                         <text name="can_resell">
                                 这�区域内被购买的土地�以被�新出售.
                         </text>
                         <text name="can_not_resell">
-                                这�区域内被购买的土地�能�能被�新出售。
+                                这�区域内被购买的土地�能被�新出售。
                         </text>
                         <text name="can_change">
-                                这�区域内被购买的土地�以被连接或者被划分。
+                                这�区域内被购买的土地�以被�并/划分。
                         </text>
                         <text name="can_not_change">
-                                这�区域内被购买的土地�能�能被�系或者被划分。
+                                这�区域内被购买的土地�能被�并/划分。
                         </text>
                 </panel>
-                <panel label="东东" name="land_objects_panel">
-                        <text type="string" length="1" name="Simulator primitive usage:">
-                                模拟器简�用法:
-                        </text>
-                        <text type="string" length="1" name="0 out of 0 available">
-                                0个，总数为14055 (14055个有效)
+                <panel label="物体" name="land_objects_panel">
+                        <text  name="parcel_object_bonus">
+                                区域�外物体因数: [BONUS]
                         </text>
+                        <text type="string" length="1" name="Simulator primitive usage:">
+                                模拟器元件使用情况:
+                        </text>
+                        <text
+                                 name="objects_available">
+                                [COUNT]个, 最多 [MAX] 个 (还剩 [AVAILABLE] 个)
+                        </text>
+                        <string
+                                 name="objects_available_text">
+                                [COUNT] 个, 最多 [MAX] 个 (还剩 [AVAILABLE] 个)
+                        </string>
+                        <string
+                                 name="objects_deleted_text">
+                                [COUNT] 个, 最多 [MAX] 个 ([DELETED] 个将会被删除)
+                        </string>
                         <text type="string" length="1" name="Primitives parcel supports:">
-                                原始土地支柱:
+                                地�支�元件数:
                         </text>
                         <text type="string" length="1" name="object_contrib_text">
-                                926
+                                [COUNT] 个
                         </text>
                         <text type="string" length="1" name="Primitives on parcel:">
-                                土地上所有的原始建筑:
+                                地�上的元件数:
                         </text>
                         <text type="string" length="1" name="total_objects_text">
-                                0
+                                [COUNT] 个
                         </text>
                         <text type="string" length="1" name="Owned by parcel owner:">
-                                为土地拥有者所有:
+                                土地拥有者所有:
                         </text>
                         <text type="string" length="1" name="owner_objects_text">
-                                0
+                                [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOwner" />
                         <button label="归还..." label_selected="归还..." name="ReturnOwner..."
-                             tool_tip="将东东归还其主人." />
+                             tool_tip="将物体归还其主人。" />
                         <text type="string" length="1" name="Set to group:">
-                                转入社团状�:
+                                设为社团的元件数:
                         </text>
                         <text type="string" length="1" name="group_objects_text">
-                                0
+                                [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowGroup" />
                         <button label="归还..." label_selected="归还..." name="ReturnGroup..."
-                             tool_tip="将东东归还其主人." />
+                             tool_tip="将物体归还其主人。" />
                         <text type="string" length="1" name="Owned by others:">
                                 为其他人所有:
                         </text>
                         <text type="string" length="1" name="other_objects_text">
-                                0
+                                [COUNT] 个
                         </text>
                         <button label="显示" label_selected="显示" name="ShowOther" />
                         <button label="归还..." label_selected="归还..." name="ReturnOther..."
-                             tool_tip="将东东归还其主人." />
+                             tool_tip="将物体归还其主人。" />
                         <text type="string" length="1" name="Selected / sat upon:">
-                                已选的/�上去:
+                                被选择 / 被�上的:
                         </text>
                         <text type="string" length="1" name="selected_objects_text">
-                                0
+                                [COUNT] 个
                         </text>
-                        <text type="string" length="1" name="Autoreturn other resident&amp;apos;s objects (minutes, 0 for off):">
-                                自动归还其他居民的东东（分钟, 0为关闭):
+                        <text type="string" length="1" name="Autoreturn">
+                                自动归还其他居民的物体 (分钟, 0为关闭):
                         </text>
                         <text type="string" length="1" name="Object Owners:">
-                                东东主人:
+                                物体主人:
                         </text>
                         <button label="更新��" label_selected="更新��" name="Refresh List" />
-                        <button label="归还东东..." label_selected="归还东东..."
+                        <button label="归还物体..." label_selected="归还物体..."
                              name="Return objects..." />
+                        <name_list name="owner list">
+                                <column name="type"/>
+                                <column name="online_status"/>
+                                <column label="�称" name="name"/>
+                                <column label="æ•°ç›®" name="count"/>
+                                <column name="mostrecent"/>
+                        </name_list>
                         <button label="" label_selected="" name="Type" tool_tip="以�类分类" />
                         <button label="�称" label_selected="�称" name="Name" tool_tip="以�字分类" />
-                        <button label="清点" label_selected="清点" name="Count" tool_tip="以点数分类" />
+                        <button label="数目" label_selected="数目" name="Count" tool_tip="以数目分类" />
                 </panel>
-                <panel label="Options" name="land_options_panel">
+                <panel label="选项" name="land_options_panel">
                         <text type="string" length="1" name="allow_label">
-                                �许其他居民去:
+                                �许其他居民:
                         </text>
+                        <check_box label="编辑地形" name="edit land check" 
+                                tool_tip="如果选中的�，�都能编辑您的土地地形。最好是��选中这项，因为您总�以编辑您自己的土地。"/>
+                        <check_box label="创造地标" name="check landmark" />
+                        <check_box label="飞翔" name="check fly" tool_tip="如果选中的�，居民�以在您的土地上飞行。如果�选中的�，他们�能飞入或飞过您的土地。"/>
                         <text name="allow_label2">
-                                创造东东:
+                                创建物体:
                         </text>
-                        <check_box label="创造东东" name="edit objects check" />
-                        <check_box label="编辑地形" name="edit land check" />
-                        <check_box label="创造地标" name="check landmark" />
+                        <check_box label="所有居民" name="edit objects check" />
                         <check_box label="社团" name="edit group objects check" />
                         <text name="allow_label3">
-                                进入东东:
+                                带入物体:
                         </text>
                         <check_box label="所有居民" name="all object entry check" />
                         <check_box label="社团" name="group object entry check" />
                         <text name="allow_label4">
                                 �行脚本:
                         </text>
-                        <check_box label="�行社团脚本" name="check group scripts" />
-                        <check_box label="飞翔" name="check fly" />
-                        <check_box label="�行其它脚本" name="check other scripts" />
+                        <check_box label="社团" name="check group scripts" />
+                        <check_box label="所有居民" name="check other scripts" />
                         <text type="string" length="1" name="land_options_label">
                                 土地选项:
                         </text>
-                        <check_box label="安全 (无�伤)" name="check safe" />
-                        <check_box label="�制推动" name="PushRestrictCheck"
-                             tool_tip="ll推动目标将�能通过土地主人脚本代��行，或者通过推动�本身是脚本主人的脚本推动。" />
-                        <check_box label="Show in Search &gt; Places (L$30/week) under" name="ShowDirectoryCheck" />
+                        <check_box label="安全 (�会�伤)" name="check safe" tool_tip="如果选中的�，土地设置为安全，�用格斗伤害。�选中的�，�用格斗伤害。"/>
+                        <check_box label="��许推动" name="PushRestrictCheck"
+                             tool_tip="防止脚本进行推动。选中该项也许对防止在您的土地上�生扰乱行为有帮助。llPushObject 将�能通过土地主人的脚本代��行，或者通过推动�本身是脚本所有者的脚本。" />
+                        <check_box label="显示在�索中 (L$30/周)，分类为" name="ShowDirectoryCheck" />
                         <combo_box name="land category">
                                 <combo_item name="AnyCategory">
                                         任�分类
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        林登家的地点
+                                        林登实验室的地点
                                 </combo_item>
                                 <combo_item name="Adult">
                                         �人
@@ -232,25 +296,25 @@
                                         艺术和文化
                                 </combo_item>
                                 <combo_item name="Business">
-                                        生�
+                                        商业
                                 </combo_item>
                                 <combo_item name="Educational">
-                                        教育的
+                                        教育
                                 </combo_item>
                                 <combo_item name="Gaming">
-                                        �彩游�
+                                        �彩/游�
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        临时�所
+                                        �会
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        �好的��者
+                                        �行者�好
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
                                         公园和大自然
                                 </combo_item>
                                 <combo_item name="Residential">
-                                        土木建筑
+                                        居�区
                                 </combo_item>
                                 <combo_item name="Shopping">
                                         购物
@@ -259,29 +323,27 @@
                                         其他
                                 </combo_item>
                         </combo_box>
-                        <check_box label="在网上公布��" name="PublishCheck"
-                             tool_tip="将你土地的信��布到网络上去." />
                         <check_box label="�人内容" name="MatureCheck"
-                             tool_tip="你的土地信�被认为带有�人内容." />
+                             tool_tip="你的土地信�或内容会被认为带有�人内容。" />
                         <button label="?" label_selected="?" name="?" />
                         <text type="string" length="1" name="Snapshot:">
                                 å¿«ç…§:
                         </text>
                         <texture_picker label="" name="snapshot_ctrl" tool_tip="点击这里�选择图片" />
-                        <text type="string" length="1" name="Landing Point: (none)">
-                                �陆点数: (none)
+                        <text type="string" length="1" name="landing_point">
+                                �陆点: [LANDING]
                         </text>
-                        <button label="调节" label_selected="调节" name="Set"
-                             tool_tip="设置你的化身的登陆地点。此地点必须在此�土地上。" />
+                        <button label="设置" label_selected="设置" name="Set"
+                             tool_tip="设置访问者抵达时的�陆点。将会设置到您化身在该地�内的�置。" />
                         <button label="清除" label_selected="清除" name="Clear"
-                             tool_tip="清除登陆地点上的障�." />
+                             tool_tip="清除�陆点" />
                         <text type="string" length="1" name="Teleport Routing: ">
-                                闪电传�路线:
+                                瞬间移动传�路线:
                         </text>
                         <combo_box name="landing type"
-                             tool_tip="Teleport Routing -- select how to handle teleports onto your land.">
+                             tool_tip="Teleport Routing -- 选择如何应对到你的土地的瞬间移动。">
                                 <combo_item type="string" length="1" name="Blocked">
-                                        加�
+                                        ��许
                                 </combo_item>
                                 <combo_item type="string" length="1" name="LandingPoint">
                                         �陆点
@@ -290,49 +352,204 @@
                                         任��置
                                 </combo_item>
                         </combo_box>
+                        <string
+                                 name="push_restrict_text">
+                                ��许推动
+                        </string>
+                        <string
+                                 name="push_restrict_region_text">
+                                ��许推动 (区域强制)
+                        </string>
                 </panel>
-                <panel label="Media" name="land_media_panel">
+                <panel label="媒体" name="land_media_panel">
+                        <text
+                                 name="with media:">
+                                媒体类型:
+                        </text>
+<combo_box
+                                 allow_text_entry="false"
+                                 max_chars="20"
+                                 name="media type"
+                                 tool_tip="指定该 URL 是动画，网页，或者其它媒体" />
                         <check_box label="Restrict spatialized sound to this parcel" name="check sound local" />
-                        <text type="string" length="1" name="Music URL:">
-                                音�URL:
+                        <text
+                                 name="at URL:">
+                                媒体 URL:
+                        </text>
+                        <button
+                                 label="设置..."
+                                 label_selected="设置..."
+                                 name="set_media_url"
+                                  />
+                        <text
+                                 name="Description:">
+                                �述:
                         </text>
                         <text type="string" length="1" name="Media texture:">
                                 媒体
 �质:
-                        </text>
+                        </text>                 
+                        <line_editor
+                                 name="url_description"
+                                 tool_tip="在播放/加载按钮�显示的文字" />
                         <text type="string" length="1" name="Replace this texture:">
                                 替�该�质:
                         </text>
                         <texture_picker label="" name="media texture" tool_tip="点击这里�选择图片" />
-                        <text type="string" length="1" name="with content from this URL:">
-                                内容�自URL :
+                        <text
+                                 name="replace_texture_help">
+                                (点击播放按钮�使用该�质的物体将会
+显示选择的动画或网页。)
+                        </text>
+                        <text
+                                 name="Options:">
+                                媒体
+选项:
                         </text>
-                        <check_box label="自动调整内容大� (较慢或�低图�质�)"
+                        <check_box label="自动调整内容大� "
                              name="media_auto_scale"
-                             tool_tip="检测此项将会对此��土地的满�度自动缩�/增加。它�以轻微�慢和�低�视效果，但�会�求其他的�质缩放或排列。" />
+                             tool_tip="打开此项将自动缩放该地�上的内容。其速度和质��能会���低，但�会需�任何其他的�质缩放或对�。" />
+                        <check_box
+                                 label="循环播放"
+                                 name="media_loop"
+                                 tool_tip="循环播放媒体。当媒体播放完毕时，它将从开始处�新播放。" />
+                        <check_box
+                                 initial_value="false"
+                                 label="��媒体 URL"
+                                 name="hide_media_url"
+                                 tool_tip="打开该选项将对未��许的土地信�察看者��媒体 URL。请注�该选项�适用于 HTML 类型。" />
+                        <check_box
+                                 initial_value="false"
+                                 label="��音� URL"
+                                 name="hide_music_url"
+                                 tool_tip="打开该选项将对未��许的土地信�察看者��音� URL。" />
+                        <text
+                                 name="media_size"
+                                 tool_tip="渲染媒体的尺寸，设为 0 使用默认值">
+                                媒体尺寸:
+                        </text>
+                        <spinner
+                                 name="media_size_width"
+                                 tool_tip="渲染媒体的尺寸，设为 0 使用默认值" />
+                        <spinner
+                                 name="media_size_height"
+                                 tool_tip="渲染媒体的尺寸，设为 0 使用默认值" />
+                        <text
+                                 name="pixels"
+                                 right="-10">
+                                �素
+                        </text>
+                        <text
+                                 name="MusicURL:">
+                                音� URL:
+                        </text>
+                        <line_editor
+                                 name="music_url"
+                                 right="-15" />
+                        <text
+                                 name="Sound:">
+                                声音:
+                        </text>
+                        <check_box
+                                 initial_value="false"
+                                 label="�制空间声音到这个地�"
+                                 name="check sound local" />
+                        <text
+                                 name="Voice settings:">
+                                语音:
+                        </text>
+                        <radio_group
+                                 draw_border="true"
+                                 name="parcel_voice_channel">
+                                <radio_item
+                                         name="Estate">
+                                        使用地产空间声音频�
+                                </radio_item>
+                                <radio_item
+                                         name="Private">
+                                        使用地��有的空间声音频�
+                                </radio_item>
+                                <radio_item
+                                         name="Disabled">
+                                        在此地��用空间声音
+                                </radio_item>
+                        </radio_group>
                 </panel>
-                <panel label="Access" name="land_access_panel">
+                <panel label="访问" name="land_access_panel">
+                                        <check_box label="�许公众访问" name="public_access"/>
                         <text type="string" length="1" name="Limit access to this parcel to:">
-                                �制进入该土地的通�:
-                        </text>
-                        <check_box label="社团: (无)" name="GroupCheck" />
-                        <check_box label="化身: (0 项被列出, 最多300�)" name="AccessCheck" />
-                        <button label="添加..." label_selected="添加..." name="Add..." />
-                        <button label="移除" label_selected="移除" name="Remove" />
-                        <check_box label="通过�许的暂时通�出售:" name="PassCheck" />
-                        <spinner label="林登�标价:" name="PriceSpin" />
+                                对该地�的访问
+                        </text>
+                        <text
+                                 name="Only Allow">
+                                �止以下居民访问:
+                        </text>
+                        <check_box
+                                 initial_value="false"
+                                 label="没有给林登实验室�供支付信�的居民"
+                                 name="limit_payment"
+                                 tool_tip="�止未识别的居民进入。" />
+                        <check_box
+                                 initial_value="false"
+                                 label="没有年龄确认为�年人的居民"
+                                 name="limit_age_verified"
+                                 tool_tip="�止没有验�年龄的居民进入。详细信��� support.secondlife.com 。" />
+                        <string
+                                 name="estate_override">
+                                这些选项中的一个或多个在地产级别被设定
+                        </string>
+                        <check_box 
+                                label="�许社团访问: [GROUP]" 
+                                name="GroupCheck" 
+                                tool_tip="请在一般标签页中设定社团。"/>
+                        <check_box
+                                 initial_value="false"
+                                 label="�以下出售通行�"
+                                 name="PassCheck"
+                                 tool_tip="�许临时访问该地�" />
+                        <combo_box
+                                 name="pass_combo">
+                                <combo_item
+                                         name="Anyone"
+                                         value="anyone">
+                                        任何人
+                                </combo_item>
+                                <combo_item
+                                         name="Group"
+                                         value="group">
+                                        社团
+                                </combo_item>
+                        </combo_box>
+                        <spinner label="L$ 标价:" name="PriceSpin" />
                         <spinner label="访问时间:" name="HoursSpin" />
-                </panel>
-                <panel label="Ban" name="land_ban_panel">
-                        <check_box label="阻止以下化身: (0�被列出, 最多300�)" name="LandBanCheck" />
-                        <button label="添加..." label_selected="添加..." name="Add..." />
-                        <button label="移除" label_selected="移除" name="Remove" />
-                        <text type="string" length="1" name="Deny by Payment Status:">
-                                被支付情况信�拒�:
-                        </text>
-                        <check_box label="�认文件中的没有完�支付的信�" name="DenyAnonymousCheck" />
-                        <check_box label="�认文件中的支付信�" name="DenyIdentifiedCheck" />
-                        <check_box label="�认使用过的支付信�" name="DenyTransactedCheck" />
+                        
+                        <text
+                                 initial_value="false"
+                                 label="总是�许"
+                                 name="AllowedText">
+                                被�许的居民
+                        </text>
+                        <name_list
+                                 name="AccessList"
+                                 tool_tip="(已列出 [LISTED] �, 最多[MAX] �)" />
+                        <button label="添加..." label_selected="添加..." name="add_allowed" />
+                        <button label="删除" label_selected="删除" name="remove_allowed" />
+                                                <text
+                                 label="Ban"
+                                 name="BanCheck">
+                          被�止的居民
+                        </text>
+                        <name_list
+                                 name="BannedList"
+                                 tool_tip="(已列出 [LISTED] �, 最多[MAX] �)" />
+                        <button
+                                 label="添加..."
+                                 label_selected="添加..."
+                                 name="add_banned" />
+                        <button
+                                 label="删除"
+                                 label_selected="删除"
+                                 name="remove_banned" />
                 </panel>
         </tab_container>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml b/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
new file mode 100644
index 0000000..14ab2e4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="active_speakers"

+         title="活跃的说�人">

+        <panel

+                 name="active_speakers_panel">

+                <scroll_list

+                         name="speakers_list">

+                        <column

+                                 label="�字"

+                                 name="speaker_name" />

+                </scroll_list>

+                <panel

+                         name="volume_container"

+                         right="-10">

+                        <button

+                                 label=""

+                                 name="mute_btn"

+                                 toggle="true"

+                                 tool_tip="�蔽该居民的语音" />

+                </panel>

+        </panel>

+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
index 4133242..cd41a43 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
@@ -6,36 +6,18 @@
         <text name="description_label">
                 �述:
         </text>
-        <spinner label="优先" name="priority"
-             tool_tip="�在�顾�此动画的模�下控制其它动画。" />
-        <text name="preview_label">
-                预览
-        </text>
-        <combo_box label="" name="preview_base_anim"
-             tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-                <combo_item name="Standing">
-                        站立
-                </combo_item>
-                <combo_item name="Walking">
-                        步行
-                </combo_item>
-                <combo_item name="Sitting">
-                        �下
-                </combo_item>
-                <combo_item name="Flying">
-                        起飞
-                </combo_item>
-        </combo_box>
-        <check_box label="绕圈飞行" name="loop_check" tool_tip="使此动画循环播放." />
-        <spinner label="In(%)" name="loop_in_point"
-             tool_tip="在动画设置一点用以返还循环到此点。" />
-        <spinner label="出局(%)" name="loop_out_point"
-             tool_tip="在动画设置一点用以�止循环。" />
+        <spinner label="优先级" name="priority"
+             tool_tip="控制哪些动画�以被该动画覆盖。" />
+        <check_box label="循环" name="loop_check" tool_tip="使此动画循环播放." />
+        <spinner label="始 (%)" name="loop_in_point"
+             tool_tip="选择循环�返回的点。" />
+        <spinner label="终 (%)" name="loop_out_point"
+             tool_tip="选择循环结�的点。" />
         <text name="hand_label">
                 手势
         </text>
         <combo_box label="" name="hand_pose_combo"
-             tool_tip="Controls what hands do during animation.">
+             tool_tip="控制动画中手的动作。">
                 <combo_item name="Spread">
                         伸展
                 </combo_item>
@@ -43,49 +25,48 @@
                         放�
                 </combo_item>
                 <combo_item name="PointBoth">
-                        两者都指
+                        两手都指
                 </combo_item>
                 <combo_item name="Fist">
-                        手部
+                        �拳
                 </combo_item>
                 <combo_item name="RelaxedLeft">
-                        放�左边
+                        左手放�
                 </combo_item>
                 <combo_item name="PointLeft">
-                        指左边
+                        左手指
                 </combo_item>
                 <combo_item name="FistLeft">
-                        左手
+                        左手�拳
                 </combo_item>
                 <combo_item name="RelaxedRight">
-                        放��边
+                        �手放�
                 </combo_item>
                 <combo_item name="PointRight">
-                        指�边
+                        �手指
                 </combo_item>
                 <combo_item name="FistRight">
-                        �手
+                        �手�拳
                 </combo_item>
                 <combo_item name="SaluteRight">
-                        ��敬礼
+                        �手敬礼
                 </combo_item>
                 <combo_item name="Typing">
-                        T键入
+                        打字中
                 </combo_item>
                 <combo_item name="PeaceRight">
-                        和平�利
+                        �手和平
                 </combo_item>
         </combo_box>
         <text name="emote_label">
                 表情
         </text>
-        <combo_box label="" name="emote_combo"
-             tool_tip="Controls what face does during animation.">
+        <combo_box label="" name="emote_combo" >
                 <combo_item name="[None]">
                         [None]
                 </combo_item>
                 <combo_item name="Aaaaah">
-                        å•Š
+                        å•Šå•Šå•Š
                 </combo_item>
                 <combo_item name="Afraid">
                         害怕
@@ -118,7 +99,7 @@
                         大笑
                 </combo_item>
                 <combo_item name="Plllppt">
-                        Plllppt
+                        呸
                 </combo_item>
                 <combo_item name="Repulsed">
                         拒�
@@ -142,18 +123,52 @@
                         担心
                 </combo_item>
         </combo_box>
-        <spinner label="Ease In (sec)" name="ease_in_time"
+
+        <text name="preview_label">
+                预览
+        </text>
+        <combo_box label="" name="preview_base_anim"
+             tool_tip="测试在化身�常�动作�时您的动画的行为">
+                <combo_item name="Standing">
+                        站立
+                </combo_item>
+                <combo_item name="Walking">
+                        步行
+                </combo_item>
+                <combo_item name="Sitting">
+                        �下
+                </combo_item>
+                <combo_item name="Flying">
+                        起飞
+                </combo_item>
+        </combo_box>
+
+
+        <spinner label="�入 (秒)" name="ease_in_time"
              tool_tip="动画�入的所需时间（秒）" />
-        <spinner label="Ease Out (sec)" name="ease_out_time"
+        <spinner label="�出 (秒)" name="ease_out_time"
              tool_tip="动画�出的所需时间（秒）" />
-        <button label="" name="play_btn" tool_tip="播放/�止你现有的动画." />
-        <button label="" name="stop_btn" tool_tip="�止动画回播" />
+        <button label="" name="play_btn" tool_tip="播放/暂�你现有的动画." />
+        <button label="" name="stop_btn" tool_tip="�止动画播放" />
         <slider label="" name="playback_slider" />
         <text name="bad_animation_text">
                 �能读�动画文件。
-        
-        推�Poser 4产生的BVH格�文件。
+
+推�Poser 4产生的BVH格�文件。
         </text>
         <button label="�消" name="cancel_btn" />
         <button label="上传(L$[AMOUNT])" name="ok_btn" />
+        <string name="failed_to_initialize">
+                �始化动作失败。
+        </string>
+        <string name="anim_too_long">
+                动画文件长度为 [LENGTH] 秒。
+
+最长�许的长度为 [MAX_LENGTH] 秒。
+        </string>
+        <string name="failed_file_read">
+                无法读�动画文件。
+
+[STATUS]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_auction.xml b/linden/indra/newview/skins/default/xui/zh/floater_auction.xml
index 79a24f4..6f1bd44 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_auction.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_auction.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="开始销售林登土地">
+<floater name="floater_auction" title="开始林登土地销售">
         <check_box label="包�黄色选择�" name="fence_check" />
         <combo_box name="saletype_combo">
                 <combo_item name="Auction">
                         ��
                 </combo_item>
-                <combo_item name="FirstLand">
-                        首次�陆
-                </combo_item>
         </combo_box>
         <button label="å¿«ç…§" label_selected="å¿«ç…§" name="snapshot_btn" />
         <button label="OK" label_selected="OK" name="ok_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
index d6172f6..4b1b64f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatarpicker" title="选择人物">
-        <text name="Type part of the person&apos;s name:">
+
+<floater
+         min_height="340"
+         min_width="200"
+         name="avatarpicker"
+         title="选择居民">
+        <text
+                 name="instruct_search_resident_name">
                 键入这个人的部分姓�:
         </text>
         <button label="寻找" label_selected="寻找" name="Find" />
-        <text name="Or select a calling card:">
+        <text
+                 name="Or select their calling card:">
                 或者选择一张通��:
         </text>
         <button label="选择" label_selected="选择" name="Select" />
         <button label="关闭" label_selected="关闭" name="Close" />
-        <text name="NotFound">
-                &apos;[TEXT]&apos;没有找到
-        </text>
-</floater>
+        <string name="NotFound">
+                没有找到 &apos;[TEXT]&apos;
+        </string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml b/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
index bdb4e75..8f2ba92 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_avatar_textures.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatar_texture_debug" title="Avatar Textures">
+<floater name="avatar_texture_debug" title="化身�质">
         <text name="">
-                Baked Textures
+                烘烤的�质
         </text>
         <text name="">
-                Composite Textures
+                ���质
         </text>
         <texture_picker label="头部" name="baked_head" />
         <texture_picker label="化妆" name="head_bodypaint" />
         <texture_picker label="头�" name="hair" />
-        <button label="Dump" label_selected="Dump" name="Dump" />
-        <texture_picker label="眼�" name="baked_eyes" />
-        <texture_picker label="Eye" name="eye_texture" />
-        <texture_picker label="Upper Body" name="baked_upper_body" />
-        <texture_picker label="Upper Body Tattoo" name="upper_bodypaint" />
+        <button label="转储" label_selected="转储" name="Dump" />
+        <texture_picker label="�眼" name="baked_eyes" />
+        <texture_picker label="眼�" name="eye_texture" />
+        <texture_picker label="上身" name="baked_upper_body" />
+        <texture_picker label="上身纹身" name="upper_bodypaint" />
         <texture_picker label="内衣" name="undershirt" />
         <texture_picker label="手套" name="gloves" />
         <texture_picker label="衬衣" name="shirt" />
-        <texture_picker label="Upper Jacket" name="upper_jacket" />
-        <texture_picker label="Lower Body" name="baked_lower_body" />
-        <texture_picker label="Lower Body Tattoo" name="lower_bodypaint" />
+        <texture_picker label="上身外衣" name="upper_jacket" />
+        <texture_picker label="下身" name="baked_lower_body" />
+        <texture_picker label="下身纹身" name="lower_bodypaint" />
         <texture_picker label="内裤" name="underpants" />
         <texture_picker label="袜�" name="socks" />
         <texture_picker label="éž‹å­�" name="shoes" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_beacons.xml b/linden/indra/newview/skins/default/xui/zh/floater_beacons.xml
new file mode 100644
index 0000000..0aaea0b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_beacons.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="beacons"
+         title="ä¿¡æ ‡">
+        <panel
+                 name="beacons_panel">
+        <check_box
+                         name="touch_only"
+                         label="有触摸脚本的物体" />
+    <check_box
+                         name="scripted"
+                         label="有脚本的物体" />
+    <check_box
+                         name="physical"
+                         label="物�物体" />
+    <check_box
+                         name="sounds"
+                         label="声音�" />
+    <check_box
+                         name="particles"
+                         label="粒��" />
+    <check_box
+                         name="highlights"
+                         label="渲染高亮" />
+    <check_box
+                         name="beacons"
+                         label="渲染信标" />
+        <text
+                         name="beacon_width_label">
+                信标宽度:
+        </text> 
+        </panel>
+</floater>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
index 64ada24..a7b1c7e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_build_options.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="格�选项">
-        <spinner label="格��� (米)&quot;" name="GridResolution" />
-        <spinner label="格�宽度 (米)" name="GridDrawSize" />
-        <check_box label="Enable Sub-Unit Snapping" name="GridSubUnit" />
+<floater name="build options floater" title="网格选项">
+        <spinner label="网格�� (米)" name="GridResolution" />
+        <spinner label="网格宽度 (米)" name="GridDrawSize" />
+        <check_box
+                 initial_value="false"
+                 label="�用���对�"
+                 name="GridSubUnit" />
+        <check_box
+                 initial_value="false"
+                 label="显示剖�"
+                 name="GridCrossSection" />
         <slider label="格���明度" name="GridOpacity" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml b/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml
index b4d265a..817965c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="撞击, 推动和敲打">
+<floater name="floater_bumps" title="碰撞�推动和敲打">
         <text name="none_detected">
                 没有监测到
         </text>
         <text name="bump">
-                [TIME]  [FIRST] [LAST] 抛弃了你
+                [TIME]  [FIRST] [LAST] 撞了你
         </text>
         <text name="llpushobject">
-                [TIME]  [FIRST] [LAST]用脚本推了你
+                [TIME]  [FIRST] [LAST] 用脚本推了你
         </text>
         <text name="selected_object_collide">
-                [TIME]  [FIRST] [LAST] 用一件东东敲打了你
+                [TIME]  [FIRST] [LAST] 用一件物体敲打了你
         </text>
         <text name="scripted_object_collide">
-                [TIME]  [FIRST] [LAST]用一件脚本东东敲打了你
+                [TIME]  [FIRST] [LAST] 用一件有脚本物体敲打了你
         </text>
         <text name="physical_object_collide">
-                [TIME]  [FIRST] [LAST] 用一件物�东东敲打了你
+                [TIME]  [FIRST] [LAST] 用一件物�的物体敲打了你
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 079f792..2ce722e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_buy_contents" title="购买内容">
         <text name="contains_text">
-                [NAME]包括:
+                [NAME] 包括:
         </text>
         <text name="buy_text">
-                购买L$[AMOUNT]于[NAME]?
+                以 L$[AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
         <button label="è´­ä¹°" label_selected="è´­ä¹°" name="buy_btn" />
         <check_box label="马上穿上衣�" name="wear_check" />
+        <string
+                 name="no_copy_text">
+                (���制)
+        </string>
+        <string
+                 name="no_modify_text">
+                (��更改)
+        </string>
+        <string
+                 name="no_transfer_text">
+                (��转让)
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
index bc8b13a..e065d2a 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_currency.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="购买现钞">
+<floater name="buy currency" title="购买货�">
         <text name="info_buying">
-                购买现钞:
+                购买货�:
         </text>
         <text name="info_cannot_buy">
                 现在无法购买:
@@ -10,14 +10,14 @@
                 你需�更多的货�:
         </text>
         <text name="error_message">
-                出错
+                事情好��大对头。
         </text>
         <button label="去网页" name="error_web" />
         <text name="contacting">
-                �系林登X...
+                正在连接 LindeX...
         </text>
         <text name="buy_action_unknown">
-                购买L$按照LindeX货�兑�比率
+                在 LindeX 货�交�所购买 L$
         </text>
         <text name="buy_action">
                 [NAME] L$ [PRICE]
@@ -50,12 +50,15 @@
                 L$ [AMT]
         </text>
         <text name="purchase_warning_repurchase">
-                请确认�购买现钞.
+                确认此次�作�会购买现钞。
 你需��试该�作。
         </text>
         <text name="purchase_warning_notenough">
-                你没有购买足够的货�，�足以购买。
+                你没有购买足够的货�。请增加购买的�度。
         </text>
         <button label="è´­ä¹°" name="buy_btn" />
         <button label="�消" name="cancel_btn" />
+                <string name="buy_currency">
+                以大约 US$ [USD] 购买 L$ [LINDENS]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
index f7336aa..06b56e8 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_land.xml
@@ -7,13 +7,13 @@
                 (未知)
         </text>
         <text name="estate_name_label">
-                �人领地:
+                地产:
         </text>
         <text name="estate_name_text">
                 (未知)
         </text>
         <text name="estate_owner_label">
-                �动产主人:
+                地产主人:
         </text>
         <text name="estate_owner_text">
                 (未知)
@@ -25,17 +25,17 @@
                 这�区域内被购买的土地�能�以被�新出售，也�能�能被�新出售。
         </text>
         <text name="changeable_clause">
-                �能�以或�能��以被连接或划分
+                �能�以也�能��以被�并或划分
         </text>
         <text name="covenant_text">
-                你必须��这项�动产契约��:
+                你必须��以下的�动产契约��:
         </text>
         <text_editor name="covenant_editor">
                 请等待...
         </text_editor>
         <check_box label="我��以上规定的�约" name="agree_covenant" />
         <text name="info_parcel_label">
-                土地:
+                地�:
         </text>
         <text name="info_parcel">
                 Scotopteryx 138,204
@@ -56,9 +56,9 @@
                 购买该土地将会:
         </text>
         <text name="error_message">
-                出错
+                事情好�哪里出了问题。
         </text>
-        <button label="去网页" name="error_web" />
+        <button label="打开网页" name="error_web" />
         <text name="account_action">
                 你将�级至优先级会员。
         </text>
@@ -90,66 +90,75 @@
                 你有L$2,100.
         </text>
         <text name="currency_action">
-                购买更多L$
+                购买�外的 L$
         </text>
         <line_editor name="currency_amt">
                 1000
         </line_editor>
         <text name="currency_est">
-                for approx. US$ [AMOUNT2]
+                以大约 US$ [AMOUNT2]
         </text>
         <text name="currency_balance">
                 你有L$2,100.
         </text>
-        <check_box label="Remove Group Contribution On Purchase" name="remove_contribution" />
+        <check_box
+                 label="从团队��贡献中撤去 [AMOUNT] 平方米。"
+                 name="remove_contribution"
+                 visible="false" />
         <button label="è´­ä¹°" name="buy_btn" />
         <button label="�消" name="cancel_btn" />
         <text name="can_resell">
-                �能被�新出售.
+                �以被�新出售。
         </text>
         <text name="can_not_resell">
-                �能�会被�新出售.
+                ��以被�新出售。
         </text>
         <text name="can_change">
-                �能被连接或划分.
+                �以被�并或划分。
         </text>
         <text name="can_not_change">
-                �能�会被连接或划分.
+                ��以被�并或划分。
         </text>
         <text name="cant_buy_for_group">
-                你没有为目�你的社团购买土地的许��。
+                你没有为目�你的社团购买土地的许�。
         </text>
         <text name="no_land_selected">
                 没有选择任何土地
         </text>
         <text name="multiple_parcels_selected">
-                选择了多���类型的土地。请�试选择一�较�的土地。
+                选择了多个��的地�。请�试选择一�较�的土地。
         </text>
         <text name="no_permission">
-                你没有为目�你的社团购买土地的许��。
+                你没有为目�你的社团购买土地的许�。
         </text>
         <text name="parcel_not_for_sale">
-                所选择的土地�在待售状�.
+                所选择的土地是��的。
         </text>
         <text name="group_already_owns">
-                这个社团已�拥有了这�土地.
+                社团已�拥有了这�土地。
         </text>
         <text name="you_already_own">
-                你已�拥有了这�土地.
+                你已�拥有了这�土地。
         </text>
         <text name="set_to_sell_to_other">
-                所选的土地被设置�转�至其他社团。
+                所选的土地被设置�转�至他方。
         </text>
         <text name="no_public_land">
-                所选中的土地中没有公共区域.
+                所选中的土地中没有公共区域。
         </text>
         <text name="not_owned_by_you">
-                你选择了一�由其他人�有的土地.请�试选择一�较�的土地.
+                你选择了一�由其他人�有的土地。请�试选择一�较�的土地。
+        </text>
+        <text name="for_first_time_group">
+                这�土地将为第一次购买者�留。你�能为社团购买它。
+        </text>
+        <text name="for_first_time">
+                这�土地将为第一次购买者�留。你已�拥有自己的土地了。
         </text>
         <text name="processing">
-                Processing your purchase...
+                处�购买中...
  
-(This may take a minute or two.)
+(�能�等待一两分钟。)
         </text>
         <text name="fetching_error">
                 在获�土地购买信�的时候出现错误。
@@ -178,44 +187,55 @@
         <text name="first_purchase">
                 这是你第一次购买土地，并且是你唯一一次能够购买&apos;第一�土地&apos;的机会.
         </text>
+        <text name="first_time_but_not_first_land">
+                这是你第一次购买土地，但你购买的�是为第一次购买土地的用户�留的土地。你�以使用查询功能，定�一�更便宜的 &apos;第一�土地&apos;的代售土地.
+        </text>
         <text name="land_holdings">
-                你拥有[BUYER]平方米的土地.
+                你拥有[BUYER]平方米的土地。
         </text>
         <text name="pay_to_for_land">
-                支付L$ [AMOUNT]至[SELLER]购买这�土地
+                支付L$ [AMOUNT] 至 [SELLER] 购买这�土地
         </text>
         <text name="buy_for_US">
-                Buy L$ [AMOUNT] for approx. US$ [AMOUNT2] ,
+                以大约 US$ [AMOUNT2] 购买 L$ [AMOUNT] ,
         </text>
         <text name="parcel_meters">
                 这�土地的�积为[AMOUNT]平方米。
         </text>
         <text name="premium_land">
-                这�土地是�外奖励, 而且现在�按[AMOUNT]平方米出售。
+                这�土地现在加价出售, 而且现在�按[AMOUNT]平方米出售。
         </text>
         <text name="discounted_land">
                 这�土地正在打折, 而且现在�按[AMOUNT]平方米出售。
         </text>
         <text name="meters_supports_object">
                 [AMOUNT]平方米
-s支�数�为[AMOUNT2]的东东
+支�[AMOUNT2]个物体
         </text>
         <text name="sold_with_objects">
-                和东东一起出售
+                和物体一起出售
         </text>
         <text name="insufficient_land_credits">
                 在这次购买完�之�，社团[GROUP]将需�足够的被贡献的土地所用的信用�度，�覆盖这片土地。
         </text>
         <text name="have_enough_lindens">
-                你有L$ [AMOUNT],这些钱足够购买这�土地。
+                你有L$ [AMOUNT], 这些钱足够购买这�土地。
         </text>
         <text name="not_enough_lindens">
-                你�有L$ [AMOUNT],你还需� L$ [AMOUNT2] �.
+                你�有L$ [AMOUNT], 你还需� L$ [AMOUNT2]。
         </text>
         <text name="balance_left">
-                此项消费�,你还会有L$ [AMOUNT]结余.
+                此项消费�, 你还会有L$ [AMOUNT]结余.
         </text>
         <text name="balance_needed">
                 你需�购买至少 L$ [AMOUNT]�购买这�土地。
         </text>
+        <string
+                 name="no_parcel_selected">
+                (没有选择地�)
+        </string>
+        <string
+                 name="buy_currency">
+                以大约 US$ [USD] 购买 L$ [LINDENS]
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
index 54c829d..b7c977c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_buy_object.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="contents" title="购买东东拷�">
+<floater name="contents" title="购买物体副本">
         <text name="contents_text">
                 以�它的内容：
         </text>
         <text name="buy_text">
-                购买L$[AMOUNT]于[NAME]?
+                以 L$[AMOUNT] 从 [NAME] 处购买?
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
         <button label="è´­ä¹°" label_selected="è´­ä¹°" name="buy_btn" />
+        <string name="title_buy_text">
+                è´­ä¹°
+        </string>
+        <string name="title_buy_copy_text">
+                购买�件
+        </string>
+        <string name="no_copy_text">
+                (���制)
+        </string>
+        <string name="no_modify_text">
+                (��更改)
+        </string>
+        <string name="no_transfer_text">
+                (��转让)
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_camera.xml b/linden/indra/newview/skins/default/xui/zh/floater_camera.xml
new file mode 100644
index 0000000..23c7387
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_camera.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="move floater"
+         title="">
+        <!-- 图标是代�中的自定按钮(写死的) -->
+        <string name="rotate_tooltip">围绕焦点旋转摄�机</string>
+        <string name="zoom_tooltip">��焦点缩放摄�机</string>
+        <string name="move_tooltip">上下左�移动摄�机</string>
+</floater>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
index cae2952..fe44967 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chat_history.xml
@@ -1,5 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="chat floater" title="�天记录">
-        <button label="�蔽居民" label_selected="�蔽居民" name="Mute resident" />
-        <check_box label="显示�蔽内容" name="show mutes" />
+<floater name="chat floater" title="本地�天">
+        <string name="ringing">
+                正在连接到世界内语音�天...
+        </string>
+        <string name="connected">
+                已连接。
+        </string>
+        <string name="unavailable">
+                当��置语音��用。
+        </string>
+        <string name="hang_up">
+                从世界内语音�天断开
+        </string>
+        <layout_stack name="panels">
+                <layout_panel name="im_contents_panel" min_width="275">
+                        <combo_box label="动作" name="Gesture">
+                                <combo_item name="Gestures">
+                                        动作
+                                </combo_item>
+                        </combo_box>
+                        <check_box label="显示�蔽的文字" name="show mutes" />
+                        <button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn"
+                             tool_tip="显示在该�时通信会�中活动的�与者。" />
+                        <panel name="chat_panel">
+                                <string name="gesture_label">
+                                        动作
+                                </string>
+                                <line_editor label="点击这里开始�天。" name="Chat Editor" />
+                                <flyout_button label="说" name="Say" tool_tip="(回车键)" >
+                                        <flyout_button_item name="shout_item">喊�</flyout_button_item>
+                                        <flyout_button_item name="say_item">说</flyout_button_item>
+                                        <flyout_button_item name="whisper_item">�声说</flyout_button_item>
+                                </flyout_button>
+                        </panel>
+                </layout_panel>
+        </layout_stack>
 </floater>
+<!--Translated for Second Life 1.21.3 -->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
new file mode 100644
index 0000000..cff5808
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<multi_floater name="floater_chatterbox" title="交�">

+</multi_floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml b/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml
index 3572602..1e94b01 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_clothing.xml
@@ -2,7 +2,7 @@
 <floater name="clothing" title="衣物">
         <scroll_list name="clothing_list">
                 <column label="" name="icon" />
-                <column label="Name" name="name" />
+                <column label="�称" name="name" />
         </scroll_list>
         <button label="脱掉" name="take_off_btn" />
         <button label="穿上" name="wear_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml b/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml
index b9e7b53..80c7297 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_color_picker.xml
@@ -10,10 +10,10 @@
                 �色:
         </text>
         <text name="h_val_text">
-                颜色:
+                色调:
         </text>
         <text name="s_val_text">
-                �过:
+                饱和度:
         </text>
         <text name="l_val_text">
                 亮度:
@@ -26,6 +26,6 @@
                 当�颜色:
         </text>
         <text name="(Drag below to save.)">
-                (拖动下列内容以储存.)
+                (拖动到下方储存。)
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_critical.xml b/linden/indra/newview/skins/default/xui/zh/floater_critical.xml
index de628aa..ecf454f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_critical.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_critical.xml
@@ -2,6 +2,8 @@
 <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/default/xui/zh/floater_customize.xml b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
index e25f38f..d798f4c 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_customize.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater customize" title="外表">
         <tab_container name="customize tab container">
-                <panel label="Body Parts" />
-                <panel label="外形" name="Shape">
-                        <button label="创建新的身�" label_selected="创建新的身�"
+                <panel label="身体部�" />
+                <panel label="体型" name="Shape">
+                        <button label="创建新的体型" label_selected="创建新的体型"
                              name="Create New" />
                         <button label="脱掉" label_selected="脱掉" name="Take Off" />
                         <button label="存储" label_selected="存储" name="Save" />
@@ -16,14 +16,22 @@
                         <button label="鼻�" label_selected="鼻�" name="Nose" />
                         <button label="嘴部" label_selected="嘴部" name="Mouth" />
                         <button label="下巴" label_selected="下巴" name="Chin" />
-                        <button label="���" label_selected="���" name="Torso" />
+                        <button label="腹部" label_selected="腹部" name="Torso" />
                         <button label="腿部" label_selected="腿部" name="Legs" />
+                        <radio_group name="sex radio">
+                                <radio_item type="string" length="1" name="radio">
+                                        女性
+                                </radio_item>
+                                <radio_item type="string" length="1" name="radio2">
+                                        男性
+                                </radio_item>
+                        </radio_group>
                         <button label="�机排列" label_selected="�机排列" name="Randomize" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -35,19 +43,13 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的体型，需从你的库存中拖拽一个新的体型至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的体型，需从你的库存中拖拽一个新的体型至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件穿�的�利。
                         </text>
-                        <radio_group name="sex radio">
-                                <radio_item type="string" length="1" name="radio">
-                                        女性
-                                </radio_item>
-                                <radio_item type="string" length="1" name="radio2">
-                                        男性
-                                </radio_item>
-                        </radio_group>
+
                 </panel>
                 <panel label="皮肤" name="Skin">
                         <button label="创建新的皮肤" label_selected="创建新的皮肤"
@@ -65,7 +67,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -74,22 +76,24 @@
                                 [DESC]: 没有被穿�
                         </text>
                         <text type="string" length="1" name="path">
-                                �于[PATH]
+                                �于 [PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的皮肤，需从你的库存中拖拽一个新的皮肤至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的皮肤，需从你的库存中拖拽一个新的皮肤至你的
+化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <texture_picker label="头部纹身" name="Head Tattoos" tool_tip="点击这里�选择图片" />
                         <texture_picker label="上身的纹身" name="Upper Tattoos"
                              tool_tip="点击这里�选择图片" />
-                        <texture_picker label="�低纹身" name="Lower Tattoos"
+                        <texture_picker label="下身纹身" name="Lower Tattoos"
                              tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="头�" name="Hair">
-                        <button label="传建新的头�" label_selected="传建新的头�"
+                        <button label="创建新的头�" label_selected="传建新的头�"
                              name="Create New" />
                         <button label="脱掉" label_selected="脱掉" name="Take Off" />
                         <button label="存储" label_selected="存储" name="Save" />
@@ -98,13 +102,13 @@
                         <button label="颜色" label_selected="颜色" name="Color" />
                         <button label="风格" label_selected="风格" name="Style" />
                         <button label="眉毛" label_selected="眉毛" name="Eyebrows" />
-                        <button label="�部的" label_selected="�部的" name="Facial" />
+                        <button label="胡须" label_selected="胡须" name="Facial" />
                         <button label="�机排列" label_selected="�机排列" name="Randomize" />
                         <text type="string" length="1" name="title">
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -116,15 +120,16 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的�型，需从你的库存中拖拽一个新的�型至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的�型，需从你的库存中拖拽一个新的�型至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <texture_picker label="�质" name="Texture" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="眼�" name="Eyes">
-                        <button label="传建新的眼�" label_selected="传建新的眼�"
+                        <button label="创建新的眼�" label_selected="创建新的眼�"
                              name="Create New" />
                         <button label="脱掉" label_selected="脱掉" name="Take Off" />
                         <button label="存储" label_selected="存储" name="Save" />
@@ -135,7 +140,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -147,14 +152,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的眼�，需从你的库存中拖拽一个新的眼�至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的眼�，需从你的库存中拖拽一个新的眼�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
-                        <texture_picker label="爱丽�" name="Iris" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="瞳孔" name="Iris" tool_tip="点击这里�选择图片" />
                 </panel>
-                <panel label="Clothes" />
+                <panel label="�饰" />
                 <panel label="衬衣" name="Shirt">
                         <button label="创建新的衬衫" label_selected="创建新的衬衫"
                              name="Create New" />
@@ -166,7 +172,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -178,14 +184,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的衬衫，需从你的库存中拖拽一个新的衬衫至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的衬衫，需从你的库存中拖拽一个新的衬衫至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="裤�" name="Pants">
                         <button label="创建新的裤�" label_selected="创建新的裤�"
@@ -198,7 +205,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -210,14 +217,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的裤�，需从你的库存中拖拽一个新的裤�至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的裤�，需从你的库存中拖拽一个新的裤�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="éž‹å­�" name="Shoes">
                         <button label="创建新的鞋�" label_selected="创建新的鞋�"
@@ -230,7 +238,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -242,14 +250,14 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的鞋�，需从你的库存中拖拽一个新的鞋�至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的鞋�，需从你的库存中拖拽一个新的鞋�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
-                        </text>
+                                你没有修改这件�饰的�利。                 </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="袜�" name="Socks">
                         <button label="创建新的袜�" label_selected="创建新的袜�"
@@ -262,7 +270,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -274,14 +282,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的袜�，需从你的库存中拖拽一个新的袜�至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的袜�，需从你的库存中拖拽一个新的袜�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="夹克" name="Jacket">
                         <button label="创建新的夹克" label_selected="创建新的夹克"
@@ -294,7 +303,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -306,16 +315,17 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的夹克，需从你的库存中拖拽一个新的夹克至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的夹克，需从你的库存中拖拽一个新的夹克至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="上身的针织�" name="Upper Fabric"
+                                 <texture_picker label="上身�质" name="Upper Fabric"
                              tool_tip="点击这里�选择图片" />
-                        <texture_picker label="�低建筑物高度" name="Lower Fabric"
+                        <texture_picker label="下身�质" name="Lower Fabric"
                              tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="手套" name="Gloves">
@@ -329,7 +339,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -341,14 +351,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的手套，需从你的库存中拖拽一个新的手套至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的手套，需从你的库存中拖拽一个新的手套至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="内衣" name="Undershirt">
                         <button label="创建新的内衣" label_selected="创建新的内衣"
@@ -361,7 +372,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -373,14 +384,15 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的内衣，需从你的库存中拖拽一个新的内衣至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的内衣，需从你的库存中拖拽一个新的内衣至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="内裤" name="Underpants">
                         <button label="创建新的内裤" label_selected="创建新的内裤"
@@ -393,7 +405,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -405,17 +417,18 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的内裤，需从你的库存中拖拽一个新的内裤至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的内裤，需从你的库存中拖拽一个新的内裤至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
                 <panel label="裙�" name="Skirt">
-                        <button label="创建新的短裙" label_selected="创建新的短裙"
+                        <button label="创建新的裙�" label_selected="创建新的短裙"
                              name="Create New" />
                         <button label="脱掉" label_selected="脱掉" name="Take Off" />
                         <button label="存储" label_selected="存储" name="Save" />
@@ -425,7 +438,7 @@
                                 [DESC]
                         </text>
                         <text type="string" length="1" name="title_no_modify">
-                                [DESC]:�能修饰
+                                [DESC]: 无法修改
                         </text>
                         <text type="string" length="1" name="title_loading">
                                 [DESC]: 载入中...
@@ -437,17 +450,18 @@
                                 �于[PATH]
                         </text>
                         <text type="string" length="1" name="not worn instructions">
-                                �使用新的裙�，需从你的库存中拖拽一个新的裙�至你的化身上。�外的，你也�以从底稿中创建一个新的并使用。
+                                �使用新的裙�，需从你的库存中拖拽一个新的裙�至你的化身上。
+或者，你也�以从新创建一个，并穿上它。
                         </text>
                         <text type="string" length="1" name="no modify instructions">
-                                你没有修改这件�饰的许��。
+                                你没有修改这件�饰的�利。
                         </text>
                         <color_swatch label="颜色/�色" name="Color/Tint"
                              tool_tip="点击这里�打开色彩选择器" />
-                        <texture_picker label="纺织�" name="Fabric" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="质地" name="Fabric" tool_tip="点击这里�选择图片" />
                 </panel>
         </tab_container>
-        <button label="制造装备" label_selected="制造装备" name="Make Outfit" />
+        <button label="�存为装�" label_selected="�存为装�" name="Make Outfit" />
         <button label="储存全部" label_selected="储存全部" name="Save All" />
         <button label="关闭" label_selected="关闭" name="Close" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
new file mode 100644
index 0000000..5c4791b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="180"

+         min_width="400"

+         name="Day Cycle Floater"

+         title="日夜周期编辑器">

+        <tab_container

+                 name="Day Cycle Tabs"

+                 tab_position="top">

+                <panel

+                         label="日夜周期"

+                         name="Day Cycle">

+                        <button

+                                 label="?"

+                                 name="WLDayCycleHelp" />

+                        <text

+                                 name="WL12am">

+                                 上�12时

+                        </text>

+                        <text

+                                 name="WL3am">

+                                上�3时

+                        </text>

+                        <text

+                                 name="WL6am">

+                                上�6时

+                        </text>

+                        <text

+                                 name="WL9amHash">

+                                上�9时

+                        </text>

+                        <text

+                                 name="WL12pmHash">

+                                下�12时

+                        </text>

+                        <text

+                                 name="WL3pm">

+                                下�3时

+                        </text>

+                        <text

+                                 name="WL6pm">

+                                下�6时

+                        </text>

+                        <text

+                                 name="WL9pm">

+                                下�9时

+                        </text>

+                        <text

+                                 name="WL12am2">

+                                 上�12时

+                        </text>

+                        <button

+                                 label="添加键"

+                                 label_selected="Add Key"

+                                 name="WLAddKey" />

+                        <button

+                                 label="删除键"

+                                 label_selected="Delete Key"

+                                 name="WLDeleteKey" />

+                        <text

+                                 name="WLCurKeyFrameText">

+                                关键帧设定:

+                        </text>

+                        <text

+                                 name="WLCurKeyTimeText">

+                                键时间:

+                        </text>

+                        <spinner

+                                 label="æ—¶"

+                                 name="WLCurKeyHour" />

+                        <spinner

+                                 label="分"

+                                 name="WLCurKeyMin" />

+                        <text

+                                 name="WLCurKeyTimeText2">

+                                键预设:

+                        </text>

+                        <combo_box

+                                 allow_text_entry="false"

+                                 label="Preset"

+                                 max_chars="20"

+                                 name="WLKeyPresets" />

+                        <view_border />

+                        <text

+                                 name="DayCycleText">

+                                ��:

+                        </text>

+                        <combo_box

+                                 allow_text_entry="false"

+                                 label="5 min"

+                                 max_chars="20"

+                                 name="WLSnapOptions" />

+                        <text

+                                 name="DayCycleText2">

+                                周期长度:

+                        </text>

+                        <spinner

+                                 label="æ—¶"

+                                 name="WLLengthOfDayHour" />

+                        <spinner

+                                 label="分"

+                                 name="WLLengthOfDayMin" />

+                        <spinner

+                                 label="秒"

+                                 name="WLLengthOfDaySec" />

+                        <text

+                                 name="DayCycleText3">

+                                预览:

+                        </text>

+                        <button

+                                 label="播放"

+                                 label_selected="Play"

+                                 name="WLAnimSky" />

+                        <button

+                                 label="�止!"

+                                 label_selected="Stop"

+                                 name="WLStopAnimSky" />

+                        <button

+                                 label="使用地产时间"

+                                 label_selected="使用地产时间"

+                                 name="WLUseLindenTime" />

+                        <button

+                                 label="�存测试日"

+                                 label_selected="Save Test Day"

+                                 name="WLSaveDayCycle" />

+                        <button

+                                 label="读�测试日"

+                                 label_selected="Load Test Day"

+                                 name="WLLoadDayCycle" />

+                </panel>

+        </tab_container>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml b/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml
new file mode 100644
index 0000000..61e1556
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="floater_device_settings" title="语音�天设备设置">

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
index b5eb94b..1484e78 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_directory.xml
@@ -1,36 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="directory" title="�索">
         <tab_container name="Directory Tabs">
-                <panel label="全部" name="all_panel">
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="Name" name="name" />
-                                <column label="Price" name="price" />
-                                <column label="Time (PDT)" name="date" />
-                                <column label="Time" name="time" />
-                                <column label="Traffic" name="dwell" />
-                                <column label="Area" name="area" />
-                                <column label="L$/sq.m" name="per_meter" />
-                                <column label="Online" name="online" />
-                                <column label="Members" name="members" />
-                        </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
-                        <text name="find">
-                                寻找:
-                        </text>
-                        <button label="�索" label_selected="�索" name="Search" />
-                        <check_box label="包��人内容" name="incmature" />
-                </panel>
-                <panel label="分类目录" name="classified_panel">
+                <panel
+                         label="All"
+                         name="find_all_panel">
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
+                        <button
+                                 label="�退"
+                                 name="back_btn" />
+                        <button
+                                 label="�进"
+                                 name="forward_btn" />
+                        <line_editor
+                                 label="�索"
+                                 name="search_editor"
+                                 tool_tip="�索第二人生" />
+                        <button
+                                 label="�索"
+                                 name="search_btn" />
+                        <combo_box
+                                 name="Category">
+                                <combo_item
+                                         name="AnyCategory"
+                                         value="All">
+                                        所有分类
+                                </combo_item>
+                                <combo_item
+                                         name="Events">
+                                        事件
+                                </combo_item>
+                                <combo_item
+                                         name="Groups"
+                                         value="Groups">
+                                        社团
+                                </combo_item>
+                                <combo_item
+                                         name="People"
+                                         value="People">
+                                        å±…æ°‘
+                                </combo_item>
+                                <combo_item
+                                         name="Places"
+                                         value="Places">
+                                        地点
+                                </combo_item>
+                                <combo_item
+                                         name="Wiki"
+                                         value="Wiki">
+                                        Wiki
+                                </combo_item>
+                        </combo_box>
+                        <check_box
+                                 initial_value="false"
+                                 label="包括�人内容"
+                                 name="mature_check" />
+                        <text
+                                 name="loading_text">加载中...</text>
+                        <text
+                                 name="done_text">完�</text>
+<!--                    <text
+                                 name="redirect_404_url">http://secondlife.com/app/search/notfound.html</text>
+-->             </panel>
+        
+                <panel label="分类广告" name="classified_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
                                 <column label="Name" name="name" />
                                 <column label="Price" name="price" />
                         </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                        <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev" />
+                        <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
                         <text name="find">
                                 寻找:
                         </text>
@@ -52,13 +103,13 @@
                                         特殊�引力
                                 </combo_item>
                                 <combo_item name="NewProducts">
-                                        新物�
+                                        新产�
                                 </combo_item>
                                 <combo_item name="Employment">
                                         �业
                                 </combo_item>
                                 <combo_item name="Wanted">
-                                        通缉
+                                        需求
                                 </combo_item>
                                 <combo_item name="Service">
                                         �务
@@ -67,28 +118,39 @@
                                         �人的
                                 </combo_item>
                         </combo_box>
+                        <button
+                                 label="�览"
+                                 label_selected="�览"
+                                 name="Browse" />
                         <button label="�索" label_selected="�索" name="Search" />
-                        <button label="地点和广告..." label_selected="地点和广告..."
+                        <button label="投放广告..." label_selected="投放广告..."
                              name="Place an Ad..." />
                         <button label="删除" label_selected="删除" name="Delete" />
                 </panel>
-                <panel label="事件或活动" name="events_panel">
+                
+                <panel label="事件" name="events_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Time (PDT)" name="date" />
+                                <column label="�称" name="name" />
+                                <column label="时间 (PT)" name="date" />
                                 <column label="" name="event_id" />
-                                <column label="Time" name="time" />
+                                <column label="时间" name="time" />
                         </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                        <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev" />
+                        <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
                         <radio_group name="date_mode">
                                 <radio_item name="current">
-                                        In-Progress and Upcoming
+                                        当�和近期事件
                                 </radio_item>
                                 <radio_item name="date">
-                                        Date
+                                        日期
                                 </radio_item>
                         </radio_group>
                         <button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;"
@@ -104,7 +166,7 @@
                                 �类列表:
                         </text>
                         <text name="text2">
-                                Name/Desc:
+                                �称/�述:
                         </text>
                         <combo_box name="category combo">
                                 <combo_item name="All">
@@ -120,7 +182,7 @@
                                         现场音�
                                 </combo_item>
                                 <combo_item name="Commercial">
-                                        生�
+                                        商业
                                 </combo_item>
                                 <combo_item name="Nightlife/Entertainment">
                                         夜生活/娱�
@@ -141,40 +203,51 @@
                                         慈善机构
                                 </combo_item>
                                 <combo_item name="Miscellaneous">
-                                        混色
+                                        其他
                                 </combo_item>
                         </combo_box>
                         <check_box label="显示�人内容" name="incmature" />
                         <button label="�索" label_selected="�索" name="Search" tool_tip="�索" />
                         <button label="删除" label_selected="删除" name="Delete" />
                 </panel>
-                <panel label="Popular Places" name="popular_panel">
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Traffic" name="dwell" />
-                        </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
-                        <check_box label="�显示有图�的地点" name="incpictures" />
-                        <check_box label="包��人区中的地点" name="incmature" />
-                        <text
-                             name="These are the most popular places in the world, as measured by traffic,         the amount of time people spend there.">
-                                这里有在第二人生世界里最�行的场所，由交通状况，和人们在那里花费的时间长短�衡�。
-                        </text>
+                
+                <panel label="热门地点" name="showcase_panel">
+                        <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev" />
+                        <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
+                        <button
+                                 label="�退"
+                                 name="back_btn" />
+                        <button
+                                 label="�进"
+                                 name="forward_btn" />
+                        <string 
+                                 name="loading_text">加载中...</string>
+                        <string
+                                 name="done_text">完�</string>
                 </panel>
-                <panel label="Land Sales" name="land_sales_panel">
+                <panel label="土地出售" name="land_sales_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="L$ Price" name="price" />
-                                <column label="Area" name="area" />
-                                <column label="L$/sq.m" name="per_meter" />
+                                <column label="�称" name="name" />
+                                <column label="L$ ä»·æ ¼" name="price" />
+                                <column label="�积" name="area" />
+                                <column label="L$/平米" name="per_meter" />
                         </scroll_list>
                         <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                        <button label="下一页&gt;" label_selected="下一页&gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
                         <combo_box name="type">
                                 <combo_item name="AllTypes">
                                         所有类型
@@ -185,22 +258,22 @@
                                 <combo_item name="ForSale">
                                         代售
                                 </combo_item>
-                                <combo_item name="FirstLand">
-                                        首次�陆
-                                </combo_item>
+                                <!--<combo_item name="FirstLand">
+                                        �次订阅土地
+                                </combo_item>-->
                                 <combo_item name="MainlandSales">
                                         出售 - 大陆
                                 </combo_item>
                                 <combo_item name="EstateSales">
-                                        出售 - 土地
+                                        出售 - 地产
                                 </combo_item>
                         </combo_box>
                         <combo_box name="rating">
                                 <combo_item name="PG&amp;Mature">
-                                        �年人和在家长指导下的未�年人
+                                        �制级和指导级
                                 </combo_item>
                                 <combo_item name="PGonly">
-                                        仅在家长指导下观看
+                                        仅指导级
                                 </combo_item>
                                 <combo_item name="Matureonly">
                                         仅�人
@@ -208,31 +281,40 @@
                         </combo_box>
                         <check_box label="标价 &lt;= L$" name="pricecheck" />
                         <check_box label="地区&gt;= 平方米" name="areacheck" />
-                        <button label="�索" label_selected="�索" name="Search" />
-                        <text name="land">
+                        <line_editor left="245" name="priceedit" width="50"/>
+                        <line_editor left="245" name="areaedit" width="50"/>
+                        <button label="�索" label_selected="�索" name="Search" left="306" />
+                        <text name="land" left="399" >
                                 土地�以直接用林登元购买(L$)，也�以用林登元或美元��。
-想直接购买, 进入土地，在标题�上点击地点的�字。
+�直接购买, 进入土地，然�在点击���上的地点的�字。
                         </text>
                 </panel>
-                <panel label="Places" name="places_panel">
+                
+                <panel label="地点" name="places_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Traffic" name="dwell" />
+                                <column label="�称" name="name" />
+                                <column label="��" name="dwell" />
                         </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                        <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev" />
+                        <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
                         <text name="find">
-                                寻找:
+                                查找:
                         </text>
-                        <check_box label="包��人区中的地点" name="incmature" />
+                        <check_box label="包�有�制级内容的地�" name="incmature" />
                         <combo_box name="Category">
                                 <combo_item name="AnyCategory">
                                         任�分类
                                 </combo_item>
                                 <combo_item name="LindenLocation">
-                                        林登家的地点
+                                        林登实验室的地点
                                 </combo_item>
                                 <combo_item name="Adult">
                                         �人
@@ -241,25 +323,25 @@
                                         艺术和文化
                                 </combo_item>
                                 <combo_item name="Business">
-                                        生�
+                                        商业
                                 </combo_item>
                                 <combo_item name="Educational">
-                                        教育的
+                                        教育
                                 </combo_item>
                                 <combo_item name="Gaming">
-                                        �彩游�
+                                        �彩/游�
                                 </combo_item>
                                 <combo_item name="Hangout">
-                                        临时�所
+                                        �会
                                 </combo_item>
                                 <combo_item name="NewcomerFriendly">
-                                        �好的��者
+                                        �行者�好
                                 </combo_item>
                                 <combo_item name="Parks&amp;Nature">
-                                        公园和大自然
+                                        公园和自然
                                 </combo_item>
                                 <combo_item name="Residential">
-                                        土木建筑
+                                        居�区
                                 </combo_item>
                                 <combo_item name="Shopping">
                                         购物
@@ -270,34 +352,56 @@
                         </combo_box>
                         <button label="�索" label_selected="�索" name="Search" />
                 </panel>
-                <panel label="People" name="people_panel">
+                
+                <panel label="å±…æ°‘" name="people_panel">
                         <scroll_list name="results">
                                 <column label="" name="icon" />
                                 <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Online" name="online" />
+                                <column label="�字" name="name" />
+                                <column label="在线" name="online" />
                         </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                        <button label="&lt; 上一页" label_selected="&lt; 上一页" name="&lt; Prev" />
+                        <button label="下一页 &gt;" label_selected="下一页 &gt;" name="Next &gt;" />
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
                         <text name="find">
-                                寻找:
+                                查找:
                         </text>
                         <check_box label="在线" name="online check" />
                         <button label="�索" label_selected="�索" name="Search" />
                 </panel>
+                
                 <panel label="社团" name="groups_panel">
-                        <scroll_list name="results">
-                                <column label="" name="icon" />
-                                <column label="" name="type" />
-                                <column label="Name" name="name" />
-                                <column label="Members" name="members" />
-                        </scroll_list>
-                        <button label="&lt; 之�" label_selected="&lt; 之�" name="&lt; Prev" />
-                        <button label="下一个&gt;" label_selected="下一个&gt;" name="Next &gt;" />
+                
+                        <string name="searching_text">
+                                查找中……
+                        </string>
+                        <string name="not_found_text">
+                                什么也没找到。
+                        </string>
+                        <button
+                                 label="�退"
+                                 name="back_btn" />
+                        <button
+                                 label="�进"
+                                 name="forward_btn" />
+                        <string 
+                                 name="loading_text">加载中...</string>
+                        <string
+                                 name="done_text">完�</string>
                         <text name="find">
                                 寻找:
                         </text>
-                        <button label="�索" label_selected="�索" name="Search" />
+                        <button label="�索" label_selected="�索" name="search_btn" />
+                        <check_box
+                                 label="包括�人社团"
+                                 name="mature_check" />
                 </panel>
+
         </tab_container>
 </floater>
+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
new file mode 100644
index 0000000..b4cb27e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="150"

+         min_width="600"

+         name="Environment Editor Floater"

+         title="Environment Editor">

+        <text

+                 name="EnvTimeText">

+                时间

+        </text>

+        <text

+                 name="EnvTimeText2">

+                12:00 PM

+        </text>

+        <icon

+                 name="EnvDayCycle" />

+        <slider

+                 label=""

+                 name="EnvTimeSlider"

+                 value="0.0" />

+        <text

+                 name="EnvCloudText">

+                云层覆盖

+        </text>

+        <slider

+                 label=""

+                 name="EnvCloudSlider"

+                 value="0.7" />

+        <text

+                 name="EnvWaterColorText">

+                水色

+        </text>

+        <color_swatch

+                 label=""

+                 name="EnvWaterColor"

+                 tool_tip="Click to open Color Picker" />

+        <text

+                 name="EnvWaterFogText">

+                水雾

+        </text>

+        <button

+                 label="使用地产时间"

+                 name="EnvUseEstateTimeButton" />

+        <button

+                 label="高级天空选项"

+                 name="EnvAdvancedSkyButton" />

+        <button

+                 label="高级水�选项"

+                 name="EnvAdvancedWaterButton" />

+        <button

+                 label="?"

+                 name="EnvSettingsHelpButton" />

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml
index 3473e35..d877b29 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_gesture.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="表演动作">
+<floater name="gestures" title="活动的动作">
         <text name="help_label">
-                使用激活命令或按命令键播放动画文件和
-声效。
+                点击动作或按快�键�播放动画和音效。
         </text>
         <scroll_list name="gesture_list">
-                <column label="Trigger" name="trigger" />
-                <column label="Key" name="shortcut" />
+                <column label="命令" name="trigger" />
+                <column label="按键" name="shortcut" />
                 <column label="" name="key" />
-                <column label="Name" name="name" />
+                <column label="�称" name="name" />
         </scroll_list>
         <button label="新建" name="new_gesture_btn" />
         <button label="库存" name="inventory_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
index f3253f9..b5db758 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="神仙工具">
+<floater name="godtools floater" title="神明工具">
         <tab_container name="GodTools Tabs">
-                <panel label="Grid" name="grid">
-                        <button label="�走所有用户" label_selected="�走所有用户"
+                <panel label="网格" name="grid">
+                        <button label="踢走所有用户" label_selected="踢走所有用户"
                              name="Kick all users" />
-                        <button label="快速到达此处地图的快照"
-                             label_selected="快速到达此处地图的快照"
+                        <button label="清除该区域的地图�视性缓存"
+                             label_selected="清除该区域的地图�视性缓存"
                              name="Flush This Region&apos;s Map Visibility Caches" />
                 </panel>
                 <panel label="区域" name="region">
                         <text name="Sim Name:">
-                                游�中的�字:
+                                模拟器�称:
                         </text>
-                        <check_box label="�曲" name="check prelude"
-                             tool_tip="设定此项�使这�土地�为��的项。" />
+                        <check_box label="�章" name="check prelude"
+                             tool_tip="设定该区域为�章。" />
                         <check_box label="太阳固定" name="check fixed sun"
-                             tool_tip="固定太阳的�置（例如在地区/地产）〉地形" />
-                        <check_box label="�新设置闪电传�上的家" name="check reset home"
-                             tool_tip="当居民闪电传�离开, 将会使他们的家�设在他们�陆的目的地处." />
+                             tool_tip="固定太阳的�置 (和 地区/地产 > 地形 �点的设定相似)" />
+                        <check_box label="瞬间移动时�设家" name="check reset home"
+                             tool_tip="当居民瞬间移动离开, 将会使他们的家�设在他们�陆的目的地处." />
                         <check_box label="��的" name="check visible"
-                             tool_tip="设定此项使此地对�神仙��视" />
-                        <check_box label="��" name="check damage"
-                             tool_tip="设定此项�在此地开�破�模�。" />
-                        <check_box label="阻止交通追踪" name="block dwell"
-                             tool_tip="设定此项使这�土地�进行交通�算。" />
-                        <check_box label="�定外形" name="block terraform"
-                             tool_tip="设置这里��许人们交�他们的土地。" />
+                             tool_tip="设定此项使此地对�神�视" />
+                                 <check_box label="伤害" name="check damage"
+                             tool_tip="设定此项�在此地�用伤害。" />
+                        <check_box label="阻止��追踪" name="block dwell"
+                             tool_tip="设定此项使这�土地�进行���算。" />
+                        <check_box label="�定地形" name="block terraform"
+                             tool_tip="设定此项��止人们修改他们土地的地形" />
                         <check_box label="沙盘" name="is sandbox"
-                             tool_tip="套牢此处�使这是沙盒区域." />
-                        <button label="硬地" label_selected="硬地" name="Bake Terrain"
-                             tool_tip="以默认模��存当�土地。" />
+                             tool_tip="设定此处是�是沙盒区域。" />
+                        <button label="烘烤" label_selected="烘烤" name="Bake Terrain"
+                             tool_tip="将当�地形�存为默认值。" />
                         <button label="��地形" label_selected="��地形" name="Revert Terrain"
-                             tool_tip="以默认�代现有土地。" />
+                             tool_tip="以默认值�代现有地形。" />
                         <button label="交�地形" label_selected="交�地形" name="Swap Terrain"
-                             tool_tip="将现有土地与DEFAULT互�." />
+                             tool_tip="将现有土地与默认值互�。" />
                         <text name="estate id">
-                                �动产ID:
+                                地产ID:
                         </text>
                         <text name="parent id">
-                                �级ID:
+                                �区域ID:
                         </text>
                         <line_editor name="parentestate" tool_tip="这是这�区域的�区域。" />
                         <text name="Grid Pos: ">
-                                方格收款�:
+                                网格�置
                         </text>
-                        <line_editor name="gridposx" tool_tip="这是方格x在此区域内的�置。" />
-                        <line_editor name="gridposy" tool_tip="这是方格y在此区域内的�置。" />
+                        <line_editor name="gridposx" tool_tip="这是区域在网格x内的�置。" />
+                        <line_editor name="gridposy" tool_tip="这是区域在网格y内的�置。" />
                         <text name="Redirect to Grid: ">
-                                从新定�方格�置:
+                                �定�到网格:
                         </text>
                         <text name="billable factor text">
                                 ��明细:
@@ -62,21 +62,21 @@
                         <button label="选择区域" label_selected="选择区域" name="Select Region"
                              tool_tip="用土地工具选择整个地区。" />
                         <button label="立刻自动�存" label_selected="立刻自动�存"
-                             name="Autosave now" tool_tip="�存压缩状�到自动存档目录。" />
+                             name="Autosave now" tool_tip="�存 gzip 压缩的状�到自动存档目录。" />
                 </panel>
-                <panel label="东东" name="objects">
+                <panel label="物体" name="objects">
                         <text name="Sim Name:">
-                                游�中的�字:
+                                模拟器�称:
                         </text>
                         <text name="region name">
-                                �尔士
+                                Welsh
                         </text>
                         <check_box label="无效脚本" name="disable scripts"
-                             tool_tip="设定此项用以关闭此区域内的所有脚本文档" />
+                             tool_tip="设定此项用以关闭此区域内的所有脚本" />
                         <check_box label="无效冲�" name="disable collisions"
                              tool_tip="设置这里使得这�区域内的�代�冲�无效。" />
                         <check_box label="无效物�" name="disable physics"
-                             tool_tip="设定此项用以关闭次区域内的所有物�模�。" />
+                             tool_tip="设定此项以关闭此区域内的所有物�。" />
                         <button label="应用" label_selected="应用" name="Apply"
                              tool_tip="点击这里�应用以上的更改." />
                         <button label="设置目标" label_selected="设置目标" name="Set Target"
@@ -84,28 +84,28 @@
                         <text name="target_avatar_name">
                                 (没有目标)
                         </text>
-                        <button label="删除其他土地上的选定的脚本东东"
-                             label_selected="删除其他土地上的选定的脚本东东"
+                        <button label="删除目标于他人土地上有脚本的物体"
+                             label_selected="删除目标于他人土地上有脚本的物体"
                              name="Delete Target&apos;s Scripted Objects On Others Land"
-                             tool_tip="删除所有�被土地上的目标拥有的东东。 (没有副本)东东将被归还." />
+                             tool_tip="删除他人土地上目标所有有脚本的物体。(���制)的物体将被返还。" />
                         <button label="删除*任何*土地上选中的脚本东东"
                              label_selected="删除*任何*土地上选中的脚本东东"
                              name="Delete Target&apos;s Scripted Objects On *Any* Land"
-                             tool_tip="删除此区域内目标所属的所有脚本东东。（没有副本）东东会被返回。" />
+                             tool_tip="删除该区域中目标所有有脚本的物体。(���制)的物体将被返还。" />
                         <button label="删除*所有*选中的东东"
                              label_selected="删除*所有*选中的东东"
                              name="Delete *ALL* Of Target&apos;s Objects"
-                             tool_tip="删除此目标在此区域内的所有东东" />
-                        <button label="到达最首�冲��" label_selected="到达最首�冲��"
+                             tool_tip="删除该区域中目标所有的物体。(���制)的物体将被返还。" />
+                        <button label="获�首�碰撞�" label_selected="�最首�碰撞�"
                              name="Get Top Colliders"
-                             tool_tip="获�一份关于东东承�最弱回收信�清�。" />
-                        <button label="到达首�脚本" label_selected="到达首�脚本"
+                             tool_tip="获�一份短相回��生最多的物�的列表。" />
+                        <button label="获�首�脚本" label_selected="获�首�脚本"
                              name="Get Top Scripts"
-                             tool_tip="获�一份关于最耗时脚本东东的列表。" />
+                             tool_tip="获�一份最耗时脚本的列表。" />
                         <button label="脚本摘�" label_selected="脚本摘�" name="Scripts digest"
-                             tool_tip="获�一份关于所有脚本文档�其出现次数的列表。" />
+                             tool_tip="获�一份所有脚本�其出现次数的列表。" />
                 </panel>
-                <panel label="Request" name="request">
+                <panel label="请求" name="request">
                         <text name="Destination:">
                                 目的地:
                         </text>
@@ -114,7 +114,7 @@
                                         选项
                                 </combo_item>
                                 <combo_item name="AgentRegion">
-                                        代�区域
+                                        代�所在区域
                                 </combo_item>
                         </combo_box>
                         <text name="Request:">
@@ -122,13 +122,13 @@
                         </text>
                         <combo_box name="request">
                                 <combo_item name="colliders&lt;steps&gt;">
-                                        冲� &lt;步骤&gt;
+                                        冲�者 &lt;步骤&gt;
                                 </combo_item>
                                 <combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-                                        脚本 &lt;计数&gt;,&lt;�选的样�&gt;
+                                        脚本 &lt;计数&gt;,&lt;�选的查询文字&gt;
                                 </combo_item>
                                 <combo_item name="objects&lt;pattern&gt;">
-                                        东东&lt;�样&gt;
+                                        物体 &lt;查询文字&gt;
                                 </combo_item>
                                 <combo_item name="rez&lt;asset_id&gt;">
                                         rez &lt;财产_id&gt;
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml b/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml
index 23687c8..c66d27f 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_group_info.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- deprecated - doesn't seem to be used -->
 <floater name="groupinfo" title="林登家�-社团信�">
         <tab_container name="tab">
-                <panel label="General" name="gen">
+                <panel label="一般" name="gen">
                         <text name="title_box">
                                 社团信�
                         </text>
@@ -9,7 +10,7 @@
                                 社团是你和朋�们�作的有趣的途径。
                         </text>
                         <text name="txt2">
-                                社团使你拥有头衔，徽章和选举�.
+                                社团使你拥有头衔，徽章和进行选举的能力。
                         </text>
                         <text name="txt3">
                                 任何人都�以创建社团。但�个人最多�能�加15个社团。
@@ -32,33 +33,33 @@
                         <check_box label="在社团��中显示" name="sho" />
                         <check_box label="在社团��中显示�员" name="sho_mem" />
                         <check_box label="在网上公布" name="allow_publish"
-                             tool_tip="将你个人的简介�布到网上." />
+                             tool_tip="将简介�布到网上。" />
                         <button label="?" label_selected="?" name="publish_help_btn" />
                         <check_box label="�人" name="mature"
-                             tool_tip="你的档案文件被认为带有�人内容." />
+                             tool_tip="您的社团档案带有�人内容。" />
                 </panel>
-                <panel label="Titles" name="tit">
+                <panel label="头衔" name="tit">
                         <text name="txt">
                                 社团头衔
                         </text>
                         <text name="txt2">
-                                社团有官员和社员，他们拥有��的头衔。
+                                社团的官员和�员都�以有特殊的头衔。
                         </text>
                         <text name="txt3">
-                                在世界里，�天时和�时通消�里，头衔出现在�字之�。
+                                头衔将在世界里��天时和�时通消�里出现在�字之�。
                         </text>
                         <text name="lbl">
-                                官员��:
+                                官员头衔:
                         </text>
                         <text name="lbl2">
                                 �员头衔:
                         </text>
                         <text name="lbl3">
-                                从你的库存中选��料制作社团徽章.
+                                从库存中拖出�质�设置社团徽章。
                         </text>
                         <texture_picker name="insig" tool_tip="点击这里�选择图片" />
                 </panel>
-                <panel label="Members" name="mem">
+                <panel label="�员" name="mem">
                         <text name="txt">
                                 社团�员
                         </text>
@@ -76,7 +77,7 @@
                         </text>
                         <button label="驱��员" label_selected="驱��员" name="eject_member_btn" />
                 </panel>
-                <panel label="Voting" name="voting">
+                <panel label="投票" name="voting">
                         <tab_container name="tab">
                                 <panel label="Election" name="recall">
                                         <text name="txt">
@@ -104,13 +105,13 @@
                                         </text>
                                         <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
                                                 <radio_item name="radio">
-                                                        Simple Majority
+                                                        简�多数
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        2/3 Majority
+                                                        2/3 多数 
                                                 </radio_item>
                                                 <radio_item name="radio3">
-                                                        Unanimous
+                                                        一致��
                                                 </radio_item>
                                         </radio_group>
                                         <text name="duration_lbl">
@@ -157,13 +158,13 @@
                                         </text>
                                         <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
                                                 <radio_item name="radio">
-                                                        Simple Majority
+                                                        简�多数
                                                 </radio_item>
                                                 <radio_item name="radio2">
-                                                        2/3 Majority
+                                                        2/3 多数 
                                                 </radio_item>
                                                 <radio_item name="radio3">
-                                                        Unanimous
+                                                        一致��
                                                 </radio_item>
                                         </radio_group>
                                         <text name="duration_lbl">
@@ -201,7 +202,7 @@
                                 </panel>
                         </tab_container>
                 </panel>
-                <panel label="Invite" name="inv">
+                <panel label="邀请" name="inv">
                         <text name="txt">
                                 社团邀请
                         </text>
@@ -249,14 +250,14 @@
                 </panel>
                 <panel label="金钱" name="mon">
                         <tab_container name="group money history tab">
-                                <panel label="Planning" name="money panel" />
-                                <panel label="Details" name="money panel2">
+                                <panel label="计划" name="money panel" />
+                                <panel label="详细" name="money panel2">
                                         <button label="&lt;较早" label_selected="&lt;较早" name="&lt; Earlier"
                                              tool_tip="时间返回" />
                                         <button label="延迟 &gt;" label_selected="延迟 &gt;" name="Later &gt;"
                                              tool_tip="时间�进" />
                                 </panel>
-                                <panel label="Sales" name="money panel3">
+                                <panel label="出售" name="money panel3">
                                         <button label="&lt;较早" label_selected="&lt;较早" name="&lt; Earlier"
                                              tool_tip="时间返回" />
                                         <button label="延迟 &gt;" label_selected="延迟 &gt;" name="Later &gt;"
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
new file mode 100644
index 0000000..199cbed
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater
+         name="Hardware Settings Floater"
+         title="硬件设置">
+
+        <text
+                 name="Filtering:">
+                过滤:
+        </text>
+        <check_box
+                 initial_value="false"
+                 label="��异性过滤 (打开会�低速度)"
+                 name="ani" />
+        <text
+                 name="Antialiasing:">
+    �锯齿:
+  </text>
+  <combo_box
+                 initial_value="false"
+                 label="Antialiasing"
+                 name="fsaa">
+    <combo_item
+                         name="FSAADisabled"
+                         value="0">
+      关闭
+    </combo_item>
+    <combo_item
+                         name="2x"
+                         value="2">
+      2×
+    </combo_item>
+    <combo_item
+                         name="4x"
+                         value="4">
+      4×
+    </combo_item>
+    <combo_item
+                         name="8x"
+                         value="8">
+      8×
+    </combo_item>
+    <combo_item
+                         name="16x"
+                         value="16">
+      16×
+    </combo_item>
+        </combo_box>
+        <spinner
+                 label="Gamma:"
+                 name="gamma" />
+        <text
+                 name="(brightness, lower is brighter)">
+                (亮度，越低越亮, 0=使用默认值)
+        </text>
+        <spinner
+                 label="夜间亮度:"
+                 name="nighttime_brightness" />
+        <text name="(higher is brighter, 1.0 is default)">(越高越亮，默认为1.0)</text>
+        <text name="Enable VBO:">�用 VBO:</text>
+        <check_box
+                 initial_value="true"
+                 label="�用 OpenGL 顶点缓存对象(Vertex Buffer Objects)"
+                 name="vbo"
+                 tool_tip="较新的硬件上打开这个选项将�使性能��。�过，较旧的硬件通常对VBO支��佳，打开的�您�能会�到程�崩溃。" />
+
+        <slider
+                 label="�质内存 (MB):"
+                 name="GrapicsCardTextureMemory"
+                 tool_tip="分�给图�的内存的数�。默认为全部显�内存。�少该选项也许�以改进性能，但也许也�时会使�质�得模糊。" />
+
+        <spinner
+                 label="雾�离比率:"
+                 name="fog" />
+
+        <button
+                 label="确定"
+                 label_selected="确定"
+                 name="OK"
+                 scale_image="true" />
+
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_html.xml b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
new file mode 100644
index 0000000..695ca27
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_html.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="htmlfloater"
+         title="">
+        <button
+                 label="关闭"
+                 name="close_btn"/>
+        <web_browser
+                 name="html_floater_browser"/>
+        <button
+                 label="�退"
+                 name="back_btn" />
+        <button
+                 label="�进"
+                 name="forward_btn" />
+        <button
+                 label="转到"
+                 name="go_btn" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_hud.xml b/linden/indra/newview/skins/default/xui/zh/floater_hud.xml
new file mode 100644
index 0000000..d31798b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_hud.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="floater_hud"

+         title="教程">

+        <web_browser

+                 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%0A读�中...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E" />

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_im.xml b/linden/indra/newview/skins/default/xui/zh/floater_im.xml
index 423e0ae..dd8716a 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_im.xml
@@ -1,9 +1,68 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="im_floater" title="�时消�通">
-        <text name="only_user_message">
-                你是这个阶段唯一的用户。
-        </text>
-        <text name="offline_message">
-                [FIRST] [LAST] 目��在线。
-        </text>
+<multi_floater
+         min_height="130"
+         min_width="350"
+         name="im_floater"
+         title="�时�天">
+        <tab_container
+                 name="Preview Tabs" />
+        <string
+                 name="only_user_message">
+                您是该会�中唯一的�与者。
+        </string>
+        <string
+                 name="offline_message">
+                [FIRST] [LAST] �在线。
+        </string>
+        <string
+                 name="invite_message">
+                点击 [BUTTON NAME] 按钮�接�/连接到该语音�天。
+        </string>
+        <string
+                 name="muted_message">
+                您已��蔽了该�居民。��消�的�将会自动解除�蔽。
+        </string>
+ 
+        <string
+                 name="generic_request_error">
+                �出请求时�生错误，请等会儿�试。
+        </string>
+        <string
+                 name="insufficient_perms_error">
+                您的���足。
+        </string>
+        <string
+                 name="session_does_not_exist_error">
+                该会�已�存在
+        </string>
+        <string
+                 name="no_ability_error">
+                您没有那�能力。
+        </string>
+        <string
+                 name="not_a_mod_error">
+                您�是会�管�员。
+        </string>
+        <string
+                 name="muted_error">
+                一�会�管�员�蔽了您的文字�天。
+        </string>
+        <!-- *所有* 事件字符串都应该有 [RECIPIENT] 在其中 -->
+        <string
+                 name="add_session_event">
+                无法�与 [RECIPIENT] 的�天会�中加入用户。
+        </string>
+        <string
+                 name="message_session_event">
+                无法将您的消��达到与 [RECIPIENT] 的�天会�中。
+        </string>
+        <string
+                 name="removed_from_group">
+                您已被从社团中去除。
+        </string>
+        <string
+                 name="close_on_no_ability">
+                您��有在�天会�中的能力。
+        </string>
 </multi_floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
index e669ce0..d3bf113 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_image_preview.xml
@@ -11,7 +11,7 @@
         </text>
         <combo_box label="衣�款�" name="clothing_type_combo">
                 <combo_item name="Image">
-                        头�
+                        图�
                 </combo_item>
                 <combo_item name="Hair">
                         头�
@@ -37,12 +37,19 @@
                 <combo_item name="Skirt">
                         裙�
                 </combo_item>
+                <combo_item
+                         name="SculptedPrim">
+                        Sculpted 元件
+                </combo_item>
         </combo_box>
         <text name="bad_image_text">
                 �能读�图�。
-        
-        �试将图�按24 bit Targa方�储存。
+
+�试将图�按24 bit Targa方�储存。
         </text>
+                <check_box
+                 label="使用无�压缩"
+                 name="lossless_check" />
         <button label="�消" name="cancel_btn" />
         <button label="上传(L$[AMOUNT])" name="ok_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
index 2989bd7..fff47d5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="检查东东">
+<floater name="inspect" title="审查物体">
         <scroll_list name="object_list"
-             tool_tip="从这份列表中选择一项东东，使它在游�世界中被�显">
-                <column label="东东�称" name="object_name" />
+             tool_tip="从这份列表中选择一项物体�在世界中�出显示它">
+                <column label="物体�称" name="object_name" />
                 <column label="主人�字" name="owner_name" />
-                <column label="创造者�字" name="creator_name" />
-                <column label="创造时间" name="creation_date" />
+                <column label="创建者�字" name="creator_name" />
+                <column label="创建时间" name="creation_date" />
         </scroll_list>
         <button label="查看主人档案..." name="button owner"
-             tool_tip="查看被�显的东东的主人�字" />
+             tool_tip="查看�出显示物体的主人的档案" />
         <button label="查看创建者档案..." name="button creator"
-             tool_tip="查看被�显东东的创造者的档案" />
+             tool_tip="查看�出显示物体的创建者的档案" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
index 038fa3d..dcc10e5 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message.xml
@@ -1,17 +1,79 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="(未知)" name="im_floater" title="(未知)">
-        <button label="档案..." label_selected="档案..." name="profile_btn" />
-        <button label="关闭" label_selected="关闭" name="close_btn" />
-        <text name="live_help_dialog">
-                *** 欢迎�到在线帮助站,在这里，我们出色的志愿者们会�助他们的第二人生居民朋�们在第二人生里精彩的生活� *** 
-请先按F1键，进入第二人生帮助页�。如果你想�的答案�在这里，请键入你的问题，点击开始，等候若干分钟�，在线的帮助者会给你回�。
-如果您的处�过程没有结�，请��关闭在线帮助站的页�。如果您没有得到回应，你�以一直选择�新�试一�。 
-注�: 在线帮助者并�是林登实验室的雇员, 所以，除�回应人的姓�为&apos;Linden&apos;,�则回�都应视为�正�的.
-        </text>
-        <text name="title_string">
-                Instant Message with [NAME]
-        </text>
-        <text name="typing_start_string">
-                [NAME] is typing...
-        </text>
-</floater>
+<floater
+         label="(unknown)"
+         min_height="155"
+         min_width="345"
+         name="im_floater"
+         title="(unknown)">
+                <string
+                 name="ringing">
+                正在加入语音�天...
+        </string>
+        <string
+                 name="connected">
+                已连接，点击结�通��挂断
+        </string>
+        <string
+                 name="hang_up">
+                连接已结�
+        </string>
+        <string
+                 name="title_string">
+                与 [NAME] 的�时通信
+        </string>
+        <string
+                 name="typing_start_string">
+                [NAME] 正在输入...
+        </string>
+        <string
+                 name="session_start_string">
+                正在开始和 [NAME] 的会�，请�候。
+        </string>
+        <string
+                 name="default_text_label">
+                点击这里开始�时�天。
+        </string>
+        <string
+                 name="answering">
+                正在连接...
+        </string>
+        <string
+                 name="default_text_label">
+                点击这里开始�时�天。
+        </string>
+        <button
+                 label="档案..."
+                 name="profile_callee_btn" />
+        <button
+                 label="呼�"
+                 name="start_call_btn" />
+        <button
+                 label="结�呼�"
+                 name="end_call_btn"
+                 pad_right="10"
+                 visible="false" />
+        <panel
+                 name="speaker_controls">
+                <volume_slider
+                         name="speaker_volume" />
+                <button
+                         label=""
+                         name="mute_btn"
+                         tool_tip="�音" />
+        </panel>
+        <text_editor
+                 name="im_history" />
+        <line_editor
+                 label="点击这里开始�时�天。"
+                 name="chat_editor" />
+        <button
+                 label="��"
+                 name="send_btn" />
+        <string
+                 name="live_help_dialog">
+                *** 欢迎�到帮助请求 *** 
+    请首先按 F1 �阅我们的第二人生帮助页�，或访问知识库 http://secondlife.com/knowledgebase/ 
+若你找�到所需的答案，请输入你的问题，然�等待�用的工作人员的回�。
+    -=-=- �应时间�固定，特别在高峰时期 -=-=-
+        </string>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
new file mode 100644
index 0000000..33c9612
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         default_tab_group="1"

+         label="(unknown)"

+         min_height="225"

+         min_width="265"

+         name="im_floater"

+         title="(unknown)">

+        <string

+                 name="ringing">

+                正在加入语音�天...

+        </string>

+        <string

+                 name="connected">

+                已连接，点击结�通��挂断

+        </string>

+        <string

+                 name="hang_up">

+                离开了语音�天

+        </string>

+        <string

+                 name="title_string">

+                与 [NAME] 的�时通信

+        </string>

+        <string

+                 name="typing_start_string">

+                [NAME] 正在输入...

+        </string>

+        <string

+                 name="session_start_string">

+                正在开始和 [NAME] 的会�，请�候。

+        </string>

+        <string

+                 name="default_text_label">

+                点击这里开始�时�天。

+        </string>

+        <layout_stack>

+                <layout_panel

+                         name="im_contents_panel">

+                        <button

+                                 label="呼�"

+                                 name="start_call_btn" />

+                        <button

+                                 label="结�呼�"

+                                 name="end_call_btn" />

+                        <button

+                                 name="toggle_active_speakers_btn"

+                                 tool_tip="显示在该�时通信会�中活动的�与者。" />

+                        <line_editor

+                                 label="点击这里开始�时�天。"

+                                 name="chat_editor" />

+                        <button

+                                 label="��"

+                                 name="send_btn" />

+                </layout_panel>

+        </layout_stack>

+        <string

+                 name="live_help_dialog">

+                *** 欢迎�到帮助请求 *** 

+    请首先按 F1 �阅我们的第二人生帮助页�，或访问知识库 http://secondlife.com/knowledgebase/ 

+若你找�到所需的答案，请输入你的问题，然�等待�用的工作人员的回�。

+    -=-=- �应时间�固定，特别在高峰时期 -=-=-

+        </string>

+</floater>

+

+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
new file mode 100644
index 0000000..4198c6d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         label="(未知)"

+         name="im_floater"

+         title="(未知)">

+        <string

+                 name="ringing">

+                正在加入语音�天...

+        </string>

+        <string

+                 name="connected">

+                已连接，点击结�通��挂断

+        </string>

+        <string

+                 name="hang_up">

+                离开了语音�天

+        </string>

+        <string

+                 name="live_help_dialog"

+                 wordwrap="false">

+                *** 欢迎�到帮助请求 *** 

+        请首先按 F1 �阅我们的第二人生帮助页�，或访问知识库 http://secondlife.com/knowledgebase/ 

+                若你找�到所需的答案，请输入你的问题，然�等待�用的工作人员的回�。

+        -=-=- �应时间�固定，特别在高峰时期 -=-=-

+        </string>

+        <string

+                 name="title_string">

+                与 [NAME] 的�时通信

+        </string>

+        <string

+                 name="typing_start_string">

+                [NAME] 正在输入...

+        </string>

+        <string

+                 name="session_start_string">

+                正在开始和 [NAME] 的会�，请�候。

+        </string>

+        <string

+                 name="moderated_chat_label">

+                (对��管�，语音默认关闭)

+        </string>

+        <string

+                 name="default_text_label">

+                点击这里语音�天。

+        </string>

+        <string

+                 name="muted_text_label">

+                您的文字�天已被社团管�员�用。

+        </string>

+        <layout_stack 

+                name="panels">

+                <layout_panel

+                         name="im_contents_panel">

+                        <button

+                                 label="社团信�"

+                                 name="group_info_btn" />

+                        <button

+                                 image_overlay_alignment="left"

+                                 label="加入通�"

+                                 name="start_call_btn"

+                                 width="90"/>

+                        <button

+                                 image_overlay_alignment="left"

+                                 label="结�通�"

+                                 name="end_call_btn"/>

+                        <button

+                                 label="&lt; &lt;"

+                                 label_selected="&gt; &gt;"

+                                 name="toggle_active_speakers_btn"

+                                 tool_tip="显示在该�时通信会�中活动的�与者。"/>

+                        <button

+                                 label="��"

+                                 name="send_btn" />

+                </layout_panel>

+        </layout_stack>

+</floater>

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
index c231b5c..a94e09e 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory.xml
@@ -1,25 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Inventory" title="库存">
+        <search_editor
+                 name="inventory search editor"
+                 label="在这里输入�查找的物体" />
         <tab_container name="inventory filter tabs">
-                <inventory_panel label="All Items" name="All Items" />
-                <inventory_panel label="Recent Items" name="Recent Items" />
+                <inventory_panel label="所有物体" name="All Items" />
+                <inventory_panel label="最近使用的物体" name="Recent Items" />
         </tab_container>
         <menu_bar name="Inventory Menu">
-                <menu label="File" name="File">
+                <menu label="文件 " name="File">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="打开" name="Open" />
-                        <menu_item_call label="新的窗�" name="New Window" />
-                        <menu_item_call label="显示冲�过滤器" name="Show Filters" />
+                        <menu_item_call label="新建窗�" name="New Window" />
+                        <menu_item_call label="显示�索过滤器" name="Show Filters" />
+                        <menu_item_call
+                                 label="清空过滤器"
+                                 name="Reset Current" />
                         <menu_item_call label="关闭所有文件夹" name="Close All Folders" />
                         <menu_item_call label="清空回收站" name="Empty Trash" />
                 </menu>
-                <menu label="创造" name="Create">
+                <menu label="创建" name="Create">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="新的文件夹" name="New Folder" />
                         <menu_item_call label="新的脚本" name="New Script" />
-                        <menu_item_call label="新的通知" name="New Note" />
-                        <menu_item_call label="新的姿势" name="New Gesture" />
-                        <menu name="New Clothes">
+                        <menu_item_call label="新的记事�" name="New Note" />
+                        <menu_item_call label="新的动作" name="New Gesture" />
+                        <menu name="新建衣物">
                                 <menu_item_call label="新的衬衫" name="New Shirt" />
                                 <menu_item_call label="新的裤�" name="New Pants" />
                                 <menu_item_call label="æ–°çš„éž‹å­�" name="New Shoes" />
@@ -30,23 +36,27 @@
                                 <menu_item_call label="新的内衣" name="New Undershirt" />
                                 <menu_item_call label="新的内裤" name="New Underpants" />
                         </menu>
-                        <menu name="New Body Parts">
+                        <menu name="新建身体部�">
                                 <menu_item_call label="新的身�" name="New Shape" />
                                 <menu_item_call label="新的皮肤" name="New Skin" />
                                 <menu_item_call label="新的头�" name="New Hair" />
                                 <menu_item_call label="新的眼�" name="New Eyes" />
                         </menu>
                 </menu>
-                <menu label="Sort" name="Sort">
+                <menu label="排�" name="Sort">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="通过�字" name="By Name" />
-                        <menu_item_check label="通过日期" name="By Date" />
-                        <menu_item_check label="文件夹永远通过�字查找" name="Folders Always By Name" />
+                        <menu_item_check label="按�称" name="By Name" />
+                        <menu_item_check label="按日期" name="By Date" />
+                        <menu_item_check label="文件夹总是按�称排列" name="Folders Always By Name" />
+                        <menu_item_check
+                                 label="系统文件夹置顶"
+                                 name="System Folders To Top" />
+
                 </menu>
-                <menu label="Filters" name="Filters">
+<!--            <menu label="Filters" name="Filters">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_check label="修改��" name="Modify Current" />
                         <menu_item_call label="�新设置��" name="Reset Current" />
-                </menu>
+                </menu> -->
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
index 73ffedc..85ec0c9 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_item_properties.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="库存财产�目">
+<floater name="item properties" title="物�属性">
         <text name="LabelItemNameTitle">
                 �字:
         </text>
@@ -10,64 +10,68 @@
                 创造者:
         </text>
         <text name="LabelCreatorName">
-                妮�儿 林登
+                Nicole Linden
         </text>
         <button label="档案..." label_selected="" name="BtnCreator" />
         <text name="LabelOwnerTitle">
                 主人:
         </text>
         <text name="LabelOwnerName">
-                斯雷�斯 林登
+                Thrax Linden
         </text>
         <button label="档案..." label_selected="" name="BtnOwner" />
         <text name="LabelAcquiredTitle">
-                获得:
+                获得时间:
         </text>
         <text name="LabelAcquiredDate">
-                星期三 5月24日12:50:46 2006
+                2006年 5月 24日 星期三 12:50:46 
         </text>
         <text name="OwnerLabel">
                 你�以：
         </text>
-        <check_box label="修饰" name="CheckOwnerModify" />
+        <check_box label="修改" name="CheckOwnerModify" />
         <check_box label="�制" name="CheckOwnerCopy" />
-        <check_box label="转�/抛弃" name="CheckOwnerTransfer" />
-        <text name="BaseMaskDebug">
-                B:
+        <check_box label="转�/赠与" name="CheckOwnerTransfer" />
+        <!--<text name="BaseMaskDebug">
+                基:
         </text>
         <text name="OwnerMaskDebug">
-                O:
+                主:
         </text>
         <text name="GroupMaskDebug">
-                G:
+                团:
         </text>
         <text name="EveryoneMaskDebug">
-                E:
+                ä¼—:
         </text>
         <text name="NextMaskDebug">
-                N:
-        </text>
+                �:
+        </text>-->
         <check_box label="与社团分享" name="CheckShareWithGroup" />
         <check_box label="�许任何人�制" name="CheckEveryoneCopy" />
         <text name="NextOwnerLabel">
                 下个拥有者�以:
         </text>
-        <check_box label="修饰" name="CheckNextOwnerModify" />
+        <check_box label="修改" name="CheckNextOwnerModify" />
         <check_box label="�制" name="CheckNextOwnerCopy" />
-        <check_box label="转�/抛弃" name="CheckNextOwnerTransfer" />
+        <check_box label="转�/赠与" name="CheckNextOwnerTransfer" />
         <text name="SaleLabel">
-                标记项目:
+                标记项目为:
         </text>
-        <check_box label="代售" name="CheckPurchase" />
+        <check_box label="�出售" name="CheckPurchase" />
         <radio_group name="RadioSaleType">
                 <radio_item name="radio">
-                        Original
+                        原件
                 </radio_item>
                 <radio_item name="radio2">
-                        �制
+                        �制�
                 </radio_item>
         </radio_group>
         <text name="TextPrice">
                 价格：L$
         </text>
+        <text name="unknown">(未知)</text>
+        <text name="public">(公共的)</text>
+        <text name="you_can">你�以:</text>
+        <text name="owner_can">拥有者�以:</text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index b91fc71..95a0808 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -4,19 +4,19 @@
         <check_box label="通��" name="check_calling_card" />
         <check_box label="衣物" name="check_clothing" />
         <check_box label="动作" name="check_gesture" />
-        <check_box label="地标建筑" name="check_landmark" />
-        <check_box label="笔记�" name="check_notecard" />
-        <check_box label="东东" name="check_object" />
+        <check_box label="地标" name="check_landmark" />
+        <check_box label="记事�" name="check_notecard" />
+        <check_box label="物体" name="check_object" />
         <check_box label="脚本" name="check_script" />
         <check_box label="声音" name="check_sound" />
         <check_box label="�质" name="check_texture" />
-        <check_box label="å¿«ç…§" name="check_snapshot" />
+        <check_box label="截图" name="check_snapshot" />
         <button label="全部" label_selected="全部" name="All" />
-        <button label="都�" label_selected="都�" name="None" />
-        <check_box label="永远显示文件夹" name="check_show_empty" />
+        <button label="清除" label_selected="清除" name="None" />
+        <check_box label="总是显示文件夹" name="check_show_empty" />
         <check_box label="自从下线开始" name="check_since_logoff" />
         <text type="string" length="1" name="- OR -">
-                - OR -
+                - 或者 -
         </text>
         <spinner label="若干�时之�" name="spin_hours_ago" />
         <spinner label="若干天�" name="spin_days_ago" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml b/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
new file mode 100644
index 0000000..f74922b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="floater_lagmeter"

+         title="延迟计�器">

+        <button

+                 label=""

+                 label_selected=""

+                 name="client_lagmeter"

+                 tool_tip="客户端延迟状况" />

+        <text

+                 name="client">

+                客户端:

+        </text>

+        <text

+                 name="client_text"

+                 right="-10">

+                正常

+        </text>

+        <text

+                 name="client_lag_cause"

+                 right="-32" />

+        <button

+                 label=""

+                 label_selected=""

+                 name="network_lagmeter"

+                 tool_tip="网络延迟状况" />

+        <text

+                 name="network">

+                网络:

+        </text>

+        <text

+                 name="network_text"

+                 right="-10">

+                正常

+        </text>

+        <button

+                 label=""

+                 label_selected=""

+                 name="server_lagmeter"

+                 tool_tip="�务器延迟状况" />

+        <text

+                 name="server">

+                �务器:

+        </text>

+        <text

+                 name="server_text"

+                 right="-10">

+                正常

+        </text>

+        <string

+                 name="max_title_msg">

+                延迟计�器

+        </string>

+

+        <string

+                 name="min_title_msg">

+                延迟

+        </string>

+

+        <string

+                 name="client_text_msg">

+                客户端

+        </string>

+        <string

+                 name="client_frame_time_window_bg_msg">

+                正常，窗�处于��状�

+        </string>

+        <string

+                 name="client_frame_time_critical_msg">

+                客户端�秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 以下

+        </string>

+        <string

+                 name="client_frame_time_warning_msg">

+                客户端�秒帧数在 [CLIENT_FRAME_RATE_CRITICAL] 到 [CLIENT_FRAME_RATE_WARNING] 之间

+        </string>

+        <string

+                 name="client_frame_time_normal_msg">

+                正常

+        </string>

+        <string

+                 name="client_draw_distance_cause_msg">

+                �能原因：�绘�离设置过高

+        </string>

+        <string

+                 name="client_texture_loading_cause_msg">

+                �能原因：图�加载中

+        </string>

+        <string

+                 name="client_texture_memory_cause_msg">

+                �能原因：内存中图�过多

+        </string>

+        <string

+                 name="client_complex_objects_cause_msg">

+                �能原因：场景中��物体过多

+        </string>

+        <string

+                 name="network_text_msg">

+                网络

+        </string>

+        <string

+                 name="network_packet_loss_critical_msg">

+                网络连接正在丢弃 [NETWORK_PACKET_LOSS_CRITICAL]% 以上的数�包

+        </string>

+        <string

+                 name="network_packet_loss_warning_msg">

+                网络连接正在丢弃 [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% 的数�包

+        </string>

+        <string

+                 name="network_performance_normal_msg">

+                正常

+        </string>

+        <string

+                 name="network_ping_critical_ms">

+                600

+        </string>

+        <string

+                 name="network_ping_warning_ms">

+                300

+        </string>

+        <string

+                 name="network_ping_critical_msg">

+                连接�应时间大于 [NETWORK_PING_CRITICAL] 毫秒

+        </string>

+        <string

+                 name="network_ping_warning_msg">

+                连接�应时间介于 [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] 毫秒

+        </string>

+        <string

+                 name="network_packet_loss_cause_msg">

+                有�能是连接问题，或“带宽�设置过高。

+        </string>

+        <string

+                 name="network_ping_cause_msg">

+                有�能是连接问题，或正使用文件共享下载程�。

+        </string>

+        <string

+                 name="server_text_msg">

+                �务器

+        </string>

+        <string

+                 name="server_single_process_max_time_ms">

+                20

+        </string>

+        <string

+                 name="server_frame_time_critical_msg">

+                模拟器�秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 以下

+        </string>

+        <string

+                 name="server_frame_time_warning_msg">

+                模拟器�秒帧数在 [SERVER_FRAME_RATE_CRITICAL] 和 [SERVER_FRAME_RATE_WARNING] 之间

+        </string>

+        <string

+                 name="server_frame_time_normal_msg">

+                正常

+        </string>

+        <string

+                 name="server_physics_cause_msg">

+                �能原因：物�物体过多

+        </string>

+        <string

+                 name="server_scripts_cause_msg">

+                �能原因：有脚本的物体过多

+        </string>

+        <string

+                 name="server_net_cause_msg">

+                �能原因：网络��过大

+        </string>

+        <string

+                 name="server_agent_cause_msg">

+                �能原因：区域中移动的人太多

+        </string>

+        <string

+                 name="server_images_cause_msg">

+                �能原因：图�计算过多

+        </string>

+        <string

+                 name="server_generic_cause_msg">

+                �能原因：模拟器负载过大

+        </string>

+</floater>

+

+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml b/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
index 9d340ab..83dacc0 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_land_holdings.xml
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="land holdings floater" title="我的土地">
         <scroll_list name="parcel list">
-                <column label="Name" name="name" />
-                <column label="Location" name="location" />
-                <column label="Area" name="area" />
+                <column label="�称" name="name" />
+                <column label="地点" name="location" />
+                <column label="�积" name="area" />
                 <column label="" name="hidden" />
         </scroll_list>
-        <button label="闪电传�" label_selected="闪电传�" name="Teleport"
-             tool_tip="闪电传�到此地的中心." />
+        <button label="瞬间移动" label_selected="瞬间移动" name="Teleport"
+             tool_tip="瞬间移动到该地的中心。" />
         <button label="在地图中显示" label_selected="在地图中显示"
-             name="Show on Map" tool_tip="将此地在世界地图上显示出�" />
+             name="Show on Map" tool_tip="将该地在世界地图上显示出�。" />
         <text name="contrib_label">
-                �你的社团�赠:
+                对你的社团的��贡献:
         </text>
         <scroll_list name="grant list">
-                <column label="Group" name="group" />
-                <column label="Area" name="area" />
+                <column label="社团" name="group" />
+                <column label="�积" name="area" />
         </scroll_list>
         <text name="allowed_label">
-                �许该支付方案购买土地:
+                当�支付方案下�许的土地�有�:
         </text>
         <text name="allowed_text">
-                0 平方米
+                [AREA] 平方米
         </text>
         <text name="current_label">
-                目�土地所有者:
+                目��有土地�:
         </text>
         <text name="current_text">
-                0 平方米
+                [AREA] 平方米
         </text>
         <text name="available_label">
-                �以进行土地购买活动:
+                �以购买的土地�:
         </text>
         <text name="available_text">
-                0 平方米
+                [AREA] 平方米
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
new file mode 100644
index 0000000..a090239
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         can_tear_off="true"

+         min_height="310"

+         min_width="241"

+         name="landmarkpicker"

+         title="整�: 地标">

+        <check_box

+                 initial_value="true"

+                 label="显示文件夹"

+                 name="show_folders_check" />

+        <button

+                 label="新建"

+                 label_selected="新建"

+                 name="New" />

+        <button

+                 label="�命�"

+                 label_selected="�命�"

+                 name="Rename" />

+        <button

+                 label="新建文件夹"

+                 label_selected="新建文件夹"

+                 name="NewFolder" />

+        <button

+                 label="编辑"

+                 label_selected="编辑"

+                 name="Edit" />

+        <button

+                 label="删除"

+                 label_selected="删除"

+                 name="Delete" />

+        <button

+                 label="关闭"

+                 label_selected="关闭"

+                 name="Close" />

+</floater>

+ 

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml b/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
index b7527fc..e05a577 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_live_lsleditor.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="脚本：新的脚本">
-        <button label="�至" label_selected="�至" name="Reset" />
+        <button label="�置" label_selected="�置" name="Reset" />
         <check_box label="�行" name="running" />
+        <string
+                 name="script_running">
+                �行
+        </string>
+        <check_box label="Mono" name="mono" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml b/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
new file mode 100644
index 0000000..6ae47af
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="script ed float"

+         title="LSL Wiki">

+        <check_box

+                 label="跟�光标"

+                 name="lock_check" />

+        <combo_box

+                 label="�定"

+                 name="history_combo" />

+        <button

+                 label="�退"

+                 name="back_btn" />

+        <button

+                 label="�进"

+                 name="fwd_btn" />

+</floater>

+

+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
new file mode 100644
index 0000000..5477f2b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="140"

+         min_width="467"

+         name="floater_about"

+         title="媒体�览器">

+        <layout_stack

+                 name="stack1"

+                 top="-20">

+                <layout_panel

+                         name="nav_controls">

+                        <button

+                                 label="�退"

+                                 name="back" />

+                        <button

+                                 label="�进"

+                                 name="forward" />

+                        <button

+                                 label="刷新"

+                                 name="reload" />

+                        <button

+                                 label="转到"

+                                 name="go" />

+                </layout_panel>

+                <layout_panel

+                         name="parcel_owner_controls">

+                        <button

+                                 label="当�URL设置为地�媒体地�"

+                                 name="assign" />

+                </layout_panel>

+                <layout_panel

+                         name="external_controls">

+                        <button

+                                 label="在我的网页�览器中打开"

+                                 name="open_browser" />

+                        <check_box

+                                 label="总在我的�览器中打开"

+                                 name="open_always" />

+                        <button

+                                 label="关闭"

+                                 name="close" />

+                </layout_panel>

+        </layout_stack>

+</floater>

+

+<!--Translated for Second Life 1.19.1 RC3 -->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml b/linden/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
new file mode 100644
index 0000000..ad5aadc
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         name="MemLeak"
+         title="内存泄�模拟">
+        <spinner
+                 label="泄�速度 (字节�秒):"
+                 name="leak_speed" />
+        <spinner
+                 label="最大泄�内存 (MB):"
+                 name="max_leak" />
+        <text
+                 name="total_leaked_label">
+                当�泄�的内存: [SIZE] KB
+        </text> 
+        <text
+                 name="note_label_1">
+                [NOTE1]
+        </text>
+        <text
+                 name="note_label_2">
+                [NOTE2]
+        </text> 
+        <button
+                 label="开始"
+                 name="start_btn" />
+        <button
+                 label="结�"
+                 name="stop_btn" />
+        <button
+                 label="释放"
+                 name="release_btn" />
+        <button
+                 label="关闭"
+                 name="close_btn" />
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mute.xml b/linden/indra/newview/skins/default/xui/zh/floater_mute.xml
index dba916e..62b6f07 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_mute.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mute.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="�蔽居民和东东">
-        <scroll_list name="mutes" tool_tip="List of currently muted residents" />
+<floater
+         name="mute floater"
+         short_title="�蔽列表"
+         title="�蔽居民和物体">
+<scroll_list name="mutes" tool_tip="当��蔽的居民列表" />
         <button label="�蔽居民..." label_selected="�蔽居民..."
-             name="Mute resident..." tool_tip="选择一个�户并�蔽此人" />
-        <button label="�蔽�字为…的东东"
-             label_selected="�蔽�字为…的东东" name="Mute object by name..." />
+             name="Mute resident..." tool_tip="选择一个居民并�蔽此人" />
+        <button label="按�称�蔽物体..."
+             label_selected="按�称�蔽物体..." name="Mute object by name..." />
         <button label="解除�蔽" label_selected="解除�蔽" name="Unmute"
-             tool_tip="从消声�中将居民或东东删除。" />
+             tool_tip="从消声�中将居民或物体删除。" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml
new file mode 100644
index 0000000..ebeb108
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="140"

+         min_width="375"

+         name="mute by name"

+         title="按�称�蔽物体">

+        <text

+                 name="message"

+                 right="380">

+                按�称�蔽�影�物体的公开�天和��，而�会影�到声音。

+你必须准确地输入物体的�称。

+        </text>

+        <line_editor

+                 name="object_name">

+                物体�称

+        </line_editor>

+        <button

+                 label="确定"

+                 name="OK" />

+        <button

+                 label="�消"

+                 name="Cancel" />

+</floater>

+

+<!--Translated for Second Life 1.19.1 RC3 -->

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml b/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml
new file mode 100644
index 0000000..1dfaf55
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="floater_my_friends"

+         title="�系人">

+        <tab_container

+                 name="friends_and_groups"

+                 tab_position="top"

+                 tab_width="80">

+                <panel

+                         filename="panel_friends.xml"

+                         label="好�"

+                         name="friends_panel" />

+                <panel

+                         filename="panel_groups.xml"

+                         label="社团"

+                         name="groups_panel" />

+        </tab_container>

+</floater>

+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
index c7abad0..8fbbf92 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_new_outfit_dialog.xml
@@ -2,7 +2,7 @@
 <floater name="modal container" title=" ">
         <button label="存储" label_selected="存储" name="Save" />
         <button label="�消" label_selected="�消" name="Cancel" />
-        <check_box label="外形" name="checkbox_Shape" />
+        <check_box label="体型" name="checkbox_Shape" />
         <check_box label="皮肤" name="checkbox_Skin" />
         <check_box label="头�" name="checkbox_Hair" />
         <check_box label="眼�" name="checkbox_Eyes" />
@@ -17,7 +17,7 @@
         <check_box label="内裤" name="checkbox_Underpants" />
         <check_box label="裙�" name="checkbox_Skirt" />
         <check_box label="胸部" name="checkbox_Chest" />
-        <check_box label="头型" name="checkbox_Skull" />
+        <check_box label="头部" name="checkbox_Skull" />
         <check_box label="左肩" name="checkbox_Left Shoulder" />
         <check_box label="�肩" name="checkbox_Right Shoulder" />
         <check_box label="左手" name="checkbox_Left Hand" />
@@ -30,54 +30,54 @@
         <check_box label="下巴" name="checkbox_Chin" />
         <check_box label="左耳" name="checkbox_Left Ear" />
         <check_box label="�耳" name="checkbox_Right Ear" />
-        <check_box label="左眼�" name="checkbox_Left Eyeball" />
-        <check_box label="�眼�" name="checkbox_Right Eyeball" />
+        <check_box label="左眼" name="checkbox_Left Eyeball" />
+        <check_box label="�眼" name="checkbox_Right Eyeball" />
         <check_box label="鼻�" name="checkbox_Nose" />
-        <check_box label="R �高胳膊�置" name="checkbox_R Upper Arm" />
-        <check_box label="R预备" name="checkbox_R Forearm" />
-        <check_box label="L 增加臂长" name="checkbox_L Upper Arm" />
-        <check_box label="L 预备" name="checkbox_L Forearm" />
+        <check_box label="�上臂" name="checkbox_R Upper Arm" />
+        <check_box label="��臂" name="checkbox_R Forearm" />
+        <check_box label="左上臂" name="checkbox_L Upper Arm" />
+        <check_box label="左�臂" name="checkbox_L Forearm" />
         <check_box label="�胯" name="checkbox_Right Hip" />
-        <check_box label="R �高腿部�置" name="checkbox_R Upper Leg" />
-        <check_box label="R 增加腿长" name="checkbox_R Lower Leg" />
+        <check_box label="�大腿" name="checkbox_R Upper Leg" />
+        <check_box label="��腿" name="checkbox_R Lower Leg" />
         <check_box label="左胯" name="checkbox_Left Hip" />
-        <check_box label="L 增加腿长" name="checkbox_L Upper Leg" />
-        <check_box label="L 缩短腿长" name="checkbox_L Lower Leg" />
+        <check_box label="左大腿" name="checkbox_L Upper Leg" />
+        <check_box label="左�腿" name="checkbox_L Lower Leg" />
         <check_box label="è‚šå­�" name="checkbox_Stomach" />
         <check_box label="左胸肌" name="checkbox_Left Pec" />
         <check_box label="�胸肌" name="checkbox_Right Pec" />
-        <check_box label="中心2" name="checkbox_Center 2" />
-        <check_box label="上端�侧" name="checkbox_Top Right" />
-        <check_box label="上端" name="checkbox_Top" />
-        <check_box label="上端左侧" name="checkbox_Top Left" />
-        <check_box label="Center中心" name="checkbox_Center" />
-        <check_box label="底部左侧" name="checkbox_Bottom Left" />
-        <check_box label="底部" name="checkbox_Bottom" />
-        <check_box label="底部�侧" name="checkbox_Bottom Right" />
+        <check_box label="中央2" name="checkbox_Center 2" />
+        <check_box label="�上方" name="checkbox_Top Right" />
+        <check_box label="上方" name="checkbox_Top" />
+        <check_box label="左上方" name="checkbox_Top Left" />
+        <check_box label="中央" name="checkbox_Center" />
+        <check_box label="左下方" name="checkbox_Bottom Left" />
+        <check_box label="下方" name="checkbox_Bottom" />
+        <check_box label="�下方" name="checkbox_Bottom Right" />
         <text type="string" length="1" name="Make New Outfit">
-                制作新的装备
+                制作新的装�
         </text>
         <text type="string" length="1"
              name="Outfits are folders that contain clothing and body parts. Drag an outfit folder onto your avatar to put it on.   &quot;Make New Outfit&quot; makes a new folder and saves copies of the items you are now wearing into it.">
-                装备是一些文件夹，这些文件夹中包��饰和一些身体躯干。
-拖拽一项装备文件夹至你的化身身上，并�开鼠标，将其�留在化身身体上。
+                装�是包��饰和一些身体躯干的文件夹。
+将装�文件夹拖动到化身身上�穿上它。
  
-&quot;制造新的装备&quot;会创建新的文件夹，并�存你正在使用或穿�的物�的副本在新的文件夹中。
+&quot;制造新的装�&quot;会创建新的文件夹，并�存你正在使用或穿�的物�的副本在新的文件夹中。
         </text>
         <text type="string" length="1" name="Folder name:">
                 文件夹�称:
         </text>
         <text type="string" length="1" name="Items to include in outfit:">
-                包括装备中的物��目:
+                装�中包括的物�:
         </text>
         <text type="string" length="1" name="Body Parts:">
-                躯干
+                体形
         </text>
         <text type="string" length="1" name="Clothes:">
                 �饰:
         </text>
         <text type="string" length="1" name="Attachments:">
-                附属:
+                附件:
         </text>
         <text type="string" length="1" name="Options:">
                 选项:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml b/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml
index 0ead435..e5b6528 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_openobject.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="东东内容">
+<floater name="objectcontents" title="物体内容">
         <text type="string" length="1" name="object_name">
                 [DESC]:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
index d065349..2691383 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay.xml
@@ -13,7 +13,7 @@
                 [FIRST] [LAST]
         </text>
         <text type="string" length="1" name="fastpay text">
-                快速支付通�:
+                快速支付:
         </text>
         <text type="string" length="1" name="amount text">
                 数�:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
index 956104f..ec56c65 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_pay_object.xml
@@ -10,13 +10,13 @@
                 [FIRST] [LAST]
         </text>
         <text type="string" length="1" name="object_name_label">
-                通过东东:
+                通过物体:
         </text>
         <text type="string" length="1" name="object_name_text">
                 ...
         </text>
         <text type="string" length="1" name="fastpay text">
-                快速支付通�:
+                快速支付:
         </text>
         <text type="string" length="1" name="amount text">
                 数�:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml b/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
new file mode 100644
index 0000000..34840c4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_post_process.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="400"

+         min_width="300"

+         name="Post-Process Floater"

+         title="�期处�设定">

+        <tab_container

+                 name="Post-Process Tabs">

+                <panel

+                         label="颜色过滤器"

+                         name="wmiColorFilterPanel">

+                        <check_box

+                                 initial_value="false"

+                                 label="�用"

+                                 name="wmiColorFilterToggle" />

+                        <text

+                                 name="wmiColorFilterBrightnessText">

+                                亮度

+                        </text>

+                        <text

+                                 name="wmiColorFilterSaturationText">

+                                饱和度

+                        </text>

+                        <text

+                                 name="wmiColorFilterContrastText">

+                                对比度

+                        </text>

+                        <text

+                                 name="wmiColorFilterBaseText">

+                                对比度基调

+                        </text>

+                        <slider

+                                 label="R"

+                                 name="wmiColorFilterBaseR"

+                                 value="1.0" />

+                        <slider

+                                 label="G"

+                                 name="wmiColorFilterBaseG"

+                                 value="1.0" />

+                        <slider

+                                 label="B"

+                                 name="wmiColorFilterBaseB"

+                                 value="1.0" />

+                        <slider

+                                 label="I"

+                                 name="wmiColorFilterBaseI"

+                                 value="1.0" />

+                </panel>

+                <panel

+                         label="夜间视觉"

+                         name="wmiNightVisionPanel">

+                        <check_box

+                                 label="�用"

+                                 name="wmiNightVisionToggle" />

+                        <text

+                                 name="wmiNightVisionBrightMultText">

+                                光线放大�数

+                        </text>

+                        <text

+                                 name="wmiNightVisionNoiseSizeText">

+                                噪点尺寸

+                        </text>

+                        <text

+                                 name="wmiNightVisionNoiseStrengthText">

+                                噪声强度

+                        </text>

+                </panel>

+                <panel

+                         label="Bloom"

+                         name="wmiBloomPanel">

+                        <check_box

+                                 initial_value="false"

+                                 label="Enable"

+                                 name="wmiBloomToggle" />

+                        <text

+                                 name="wmiBloomExtractText">

+                                明度��

+                        </text>

+                        <slider

+                                 label=""

+                                 name="wmiBloomExtract"

+                                 value="0.7" />

+                        <text

+                                 name="wmiBloomSizeText">

+                                辉光尺寸

+                        </text>

+                        <slider

+                                 label=""

+                                 name="wmiBloomSize"

+                                 value="1.0" />

+                        <text

+                                 name="wmiBloomStrengthText">

+                                辉光强度

+                        </text>

+                        <slider

+                                 label=""

+                                 name="wmiBloomStrength"

+                                 value="1.0" />

+                </panel>

+                <panel

+                         label="�外选项"

+                         name="Extras">

+                        <button

+                                 label="读�效果"

+                                 label_selected="读�效果"

+                                 name="PPLoadEffect" />

+                        <button

+                                 label="�存效果"

+                                 label_selected="�存效果"

+                                 name="PPSaveEffect" />

+                        <line_editor

+                                 label="效果�称"

+                                 name="PPEffectNameEditor" />

+                </panel>

+        </tab_container>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
index dc6df6f..39934b1 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_postcard.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="��明信片">
+<floater name="Postcard" title="��快照">
         <text name="to_label">
-                接收员的邮件:
+                收件人电�邮件地�:
         </text>
         <text name="from_label">
-                你的电�邮箱:
+                你的电�邮件地�:
         </text>
         <text name="name_label">
                 你的姓�:
@@ -13,16 +13,31 @@
                 主题:
         </text>
         <text name="msg_label">
-                信�:
+                正文:
         </text>
+        <text_editor
+                 name="msg_form">
+                在这里键入你的信�。
+        </text_editor>
         <check_box label="在网上公布" name="allow_publish_check"
              tool_tip="将此明信片�布到网络上" />
         <check_box label="�人内容" name="mature_check"
              tool_tip="这张明信片包��人内容." />
         <button label="?" name="publish_help_btn" />
+        <string
+                 name="default_subject">
+                �自第二人生的明信片
+        </string>
+        <string
+                 name="default_message">
+                瞧瞧这个!
+        </string>
         <text name="fine_print">
-                如果你的明信片收到者加入SL，你会得到一份�外的奖励。
+                如果你的收件人加入SL，你会得到一份介�奖励。
         </text>
         <button label="�消" name="cancel_btn" />
         <button label="��" name="send_btn" />
+        <string name="upload_message">
+         ��中……
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
index 1e6f6e5..0af9120 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Preferences" title="�好">
         <button label="关于..." label_selected="关于..." name="About..." />
-        <button label="OK" label_selected="OK" name="OK" />
+        <button label="确定" label_selected="确定" name="OK" />
         <button label="�消" label_selected="�消" name="Cancel" />
         <button label="应用" label_selected="应用" name="Apply" />
+        <button label="帮助" label_selected="帮助" name="Help" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
index 76f5e65..854c7cb 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_animation.xml
@@ -3,7 +3,7 @@
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
-        <button label="在全世界播放" label_selected="�止" name="Anim play btn"
+        <button label="在世界中播放" label_selected="�止" name="Anim play btn"
              tool_tip="播放这段动画且其他人也�以观看。" />
         <button label="本地播放" label_selected="�止" name="Anim audition btn"
              tool_tip="播放这段动画且仅有您�以观看。" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
new file mode 100644
index 0000000..554323a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="classified_preview"

+         title="分类广告信�">

+        <panel

+                 name="classified_details_panel" />

+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
index 0cf530c..7bc2024 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_embedded_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="最上层泥土">
+<floater name="preview_texture" title="最上层泥土">
         <button label="�制至库存" label_selected="�制至库存"
              name="Copy To Inventory" />
         <text type="string" length="1" name="dimensions">
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml
new file mode 100644
index 0000000..18017a4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="event_preview"

+         title="事件信�">

+        <panel

+                 name="event_details_panel" />

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
index 699b13d..b499f9d 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_existing_landmark.xml
@@ -4,6 +4,6 @@
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
-        <button label="闪电传�" label_selected="" name="Teleport btn" />
+        <button label="瞬间移动" label_selected="" name="Teleport btn" />
         <button label="在地图中显示" label_selected="" name="Show on Map btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
index 41b63d2..4dfc091 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_gesture.xml
@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture" title="动作">
+<floater name="gesture_preview" title="动作">
         <text name="desc_label">
                 �述:
         </text>
         <text name="trigger_label">
-                引��:
+                命令:
         </text>
         <text name="replace_text"
-             tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture!">
+             tool_tip="将命令�用这些�替�。例如说，命令‘你好’替�为‘好呀�’ 将会将对� ‘我想说你好’ �� ‘我想说好呀�’ 并�时播放动作。">
                 替�为:
         </text>
         <line_editor name="replace_editor"
-             tool_tip="Replace the trigger word(s) with these words. For example, trigger &apos;hello&apos; replace with &apos;howdy&apos; will turn the chat &apos;I wanted to say hello&apos; into &apos;I wanted to say howdy&apos; as well as playing the gesture" />
+             tool_tip="将命令�用这些�替�。例如说，命令‘你好’替�为‘好呀�’ 将会将对� ‘我想说你好’ �� ‘我想说好呀�’ 并�时播放动作。" />
         <text name="key_label">
                 快�键:
         </text>
-        <combo_box label="都�" name="modifier_combo" />
-        <combo_box label="都�" name="key_combo" />
+        <combo_box label="æ— " name="modifier_combo" />
+        <combo_box label="æ— " name="key_combo" />
         <text>
-                图书馆:
+                库:
         </text>
         <text>
                 步骤:
         </text>
+        <scroll_list
+                 draw_border="true"
+                 name="library_list">
+                Animation
+Sound
+Chat
+Wait
+        </scroll_list>
         <button label="添加&gt;&gt;" name="add_btn" />
         <button label="上移" name="up_btn" />
         <button label="下移" name="down_btn" />
         <button label="移除" name="delete_btn" />
         <text name="help_label">
-                所有的步骤都是自行�生，除�你添加了等待步骤。
+                所有的步骤都�时�生，
+除�你添加了等待步骤。
         </text>
         <radio_group name="animation_trigger_type">
                 <radio_item>
@@ -39,9 +48,9 @@
                 </radio_item>
         </radio_group>
         <check_box label="直到动画完�" name="wait_anim_check" />
-        <check_box label="时间计算精确到秒" name="wait_time_check" />
+        <check_box label="等待时间, 以秒计" name="wait_time_check" />
         <check_box label="激活" name="active_check"
-             tool_tip="Active gestures can be triggered by chatting their trigger phrases or pressing their hot keys.  Gestures usually become inactive when there is a key binding conflict." />
+             tool_tip="激活的动作�以被命令或快�键�动。动作一般当按键冲�时会�为�激活的状�。" />
         <button label="预览" name="preview_btn" />
         <button label="存储" name="save_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
new file mode 100644
index 0000000..0820df9
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml
@@ -0,0 +1,10 @@
+<?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/default/xui/zh/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
index feccac6..60ef174 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview notecard" title="注�:">
-        <button label="存储" label_selected="存储" name="Save" />
+        <button label="�存" label_selected="�存" name="Save" />
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
         <text_editor type="string" length="1" name="Notecard Editor">
                 请等待...
         </text_editor>
+        <string
+                 name="no_object">
+                无法找到包�这个记事�的物体。
+        </string>
+        <string
+                 name="not_allowed">
+                你没有查看该记事�的�利。
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
index cfc961f..3853f05 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_notecard_keep_discard.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="注�:更改你的外形，第二部分">
+<floater name="preview_notecard" title="注�:更改你的外形，第二部分">
         <text_editor type="string" length="1" name="Notecard Editor">
                 请等待...
         </text_editor>
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
-        <button label="��" label_selected="��" name="Keep" />
+        <button label="�留" label_selected="�留" name="Keep" />
         <button label="放弃" label_selected="放弃" name="Discard" />
+        <string
+                 name="no_object">
+                无法找到包�这个记事�的物体。
+        </string>
+        <string
+                 name="not_allowed">
+                你没有查看该记事�的�利。
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
index 5721b42..b5dc7c2 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_sound.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview sound" title="声音: 女性嘘声2">
+<floater name="preview_sound" title="声音: 女性嘘声2">
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
-        <button label="在全世界播放" label_selected="在全世界播放"
+        <button label="在世界中播放" label_selected="在世界中播放"
              name="Sound play btn"
-             tool_tip="播放这段音频且其他人也��到。." />
+             tool_tip="播放这段音频且其他人也��到。" />
         <button label="本地播放" label_selected="本地播放" name="Sound audition btn"
              tool_tip="播放这段音频且仅有您�以�到。" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
index a3b0711..c5d54e9 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="�质: �色金属涂抹">
+<floater name="preview_texture" title="�质: �色金属涂抹">
         <text type="string" length="1" name="desc txt">
                 �述:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
index f4b74a9..acf1ded 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_texture_keep_discard.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview texture" title="�质: 手形">
-        <text type="string" length="1" name="desc txt">
+<floater name="preview_texture" title="�质: 手形">
+        <text type="string" name="desc txt">
                 �述:
         </text>
-        <button label="��" label_selected="��" name="Keep" />
+        <button label="�留" label_selected="�留" name="Keep" />
         <button label="放弃" label_selected="放弃" name="Discard" />
         <text type="string" length="1" name="dimensions">
                 尺寸: [WIDTH] x [HEIGHT]
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml b/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml
new file mode 100644
index 0000000..005a62f
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="url_preview"

+         title="地点信�">

+        <panel

+                 name="place_details_panel" />

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
index 95658da..24dc421 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
@@ -12,6 +12,6 @@
         <text name="price_text">
                 广告价格(L$):
         </text>
-        <button label="调节价格" name="set_price_btn" />
+        <button label="设置价格" name="set_price_btn" />
         <button label="�消" name="cancel_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml b/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml
new file mode 100644
index 0000000..ad777f5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_region_info.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater name="regioninfo" title="地区/地产" />

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
index e59b4d3..d19b274 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_abuse.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_report_abuse" title="报告�架">
+<floater name="floater_report_abuse" title="举报�良行为">
         <text name="reporter_title">
                 报告者:
         </text>
@@ -9,42 +9,137 @@
         <text name="pos_title">
                 �置:
         </text>
-        <texture_picker name="screenshot" />
+        <texture_picker label="截图..." name="screenshot" />
         <check_box label="包��幕截图" name="screen_check" />
         <combo_box name="category_combo"
-             tool_tip="Category -- select the category that best describes this report">
-                <combo_item name="Selectcategory">
-                        选择一个分类
+             tool_tip="分类 -- 选择�述该报告最�适的分类">
+                <combo_item name="Select_category">
+                        选择分类
+                </combo_item>
+                <combo_item name="Age__Age_play">
+                        年龄 &gt; 年龄扮演
+                </combo_item>
+                <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+                        年龄 &gt; �年人居民在 Teen Second Life 上
+                </combo_item>
+                <combo_item name="Age__Underage_resident_on_Adult_Second_Life">
+                        年龄 &gt; 未�年人居民在�人 Second Life 上
+                </combo_item>
+                <combo_item name="Assault__Combat_sandbox___unsafe_area">
+                        攻击 &gt; 格斗沙盒 / �安全地区
+                </combo_item>
+                <combo_item name="Assault__Safe_area">
+                        攻击 &gt; 安全地区
+                </combo_item><combo_item name="Assault__Weapons_testing_sandbox">
+                        攻击 &gt; 武器测试沙盒
+                </combo_item>
+                <combo_item name="Copyright_or_intellectual_property_violation">
+                        版�或知识产�侵犯
+                </combo_item>
+                <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+                        商业 &gt; 没能够�供产�或�务
+                </combo_item>
+                <combo_item name="Disclosure__Real_world_information">
+                        �露 &gt; 真实世界信�
+                </combo_item>
+                <combo_item name="Disclosure__Remotely_monitoring chat">
+                        �露 &gt; 远处监视�天
+                </combo_item>
+                <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+                        �露 &gt; 第二人生信� / �天 / �时消�
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+                        扰乱秩� &gt; 滥用区域资�
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+                        扰乱秩� &gt; 滥用有脚本的物体
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Object_littering">
+                        扰乱秩� &gt; 乱扔物体
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Repetitive_spam">
+                        扰乱秩� &gt; ��的垃圾信�
+                </combo_item>
+                <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+                        扰乱秩� &gt; �需�的商业垃圾信�
+                </combo_item>
+                <combo_item name="Fraud__L$">
+                        欺骗 &gt; L$
+                </combo_item>
+                <combo_item name="Fraud__Land">
+                        欺骗 &gt; 土地
+                </combo_item>
+                <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+                        欺骗 &gt; 传销，�鼠会或链�邮件
+                </combo_item>
+                <combo_item name="Fraud__US$">
+                        欺骗 &gt; US$
+                </combo_item>
+                <combo_item name="Harassment__Advert_farms___visual_spam">
+                        骚扰 &gt; 广告 / 视觉垃圾信�
+                </combo_item>
+                <combo_item name="Harassment__Defaming_individuals_or_groups">
+                        骚扰 &gt; 侮辱个人或团体
+                </combo_item>
+                <combo_item name="Harassment__Impeding_movement">
+                        骚扰 &gt; 妨�移动
+                </combo_item>
+                <combo_item name="Harassment__Sexual_harassment">
+                        骚扰 &gt; 性骚扰
+                </combo_item>
+                <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+                        骚扰 &gt; 请求或诱导他人��使用�款
+                </combo_item>
+                <combo_item name="Harassment__Verbal_abuse">
+                        骚扰 &gt; 语言辱骂等�良行为
+                </combo_item>
+                <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+                        猥亵 &gt; �具攻击性的内容或行为
+                </combo_item>
+                <combo_item name="Indecency__Broadly_visible_mature_content">
+                        猥亵 &gt; 明显��的�人内容
+                </combo_item>
+                <combo_item name="Indecency__Inappropriate_avatar_name">
+                        猥亵 &gt; �妥当的化身�字
+                </combo_item>
+                <combo_item name="Indecency__Mature_content_in_PG_region">
+                        猥亵 &gt; �人内容�于 PG 区域内
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
+                        知识产�侵犯 &gt; 撤除内容
+                </combo_item>
+                <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
+                        知识产�侵犯 &gt; CopyBot 或者���洞利用
                 </combo_item>
                 <combo_item name="Intolerance">
-                        ��性
+                        �宽容
                 </combo_item>
-                <combo_item name="Harassment">
-                        折磨
+                <combo_item name="Land__Abuse_of_sandbox_resources">
+                        土地 &gt; 滥用沙盒资�
                 </combo_item>
-                <combo_item name="Assault">
-                        攻击
+                <combo_item name="Land__Encroachment__Objects_textures">
+                        土地 &gt; 入侵 &gt; 物体或�质
                 </combo_item>
-                <combo_item name="Disclosure">
-                        ��
+                <combo_item name="Land__Encroachment__Particles">
+                        土地 &gt; 入侵 &gt; 粒�
                 </combo_item>
-                <combo_item name="Indecency">
-                        侵犯
+                <combo_item name="Land__Encroachment__Trees_plants">
+                        土地 &gt; 入侵 &gt; 树木/�被
                 </combo_item>
-                <combo_item name="Age">
-                        年纪
+                <combo_item name="Trademark_violation">
+                        商标侵害
                 </combo_item>
-                <combo_item name="Parcel">
-                        ��土地
+                <combo_item name="Wagering_gambling">
+                        赌�
                 </combo_item>
                 <combo_item name="Other">
                         其他
                 </combo_item>
         </combo_box>
         <button label="" label_selected="" name="pick_btn"
-             tool_tip="东东拾�器 - 确认一个东东为此份报告中的一项" />
+             tool_tip="物体拾�器 - 确认一个物体为此份报告中的一项" />
         <text name="select_object_label">
-                点击按钮然�点击东东:
+                点击按钮然�点击物体:
         </text>
         <text name="object_name_label">
                 �字:
@@ -57,8 +152,12 @@
         </text>
         <button label="选择" label_selected="" name="select_abuser"
              tool_tip="从列表中选择被辱者的姓�。" />
+        <check_box
+                 label="�知��字"
+                 name="omit_abuser_name"
+                 tool_tip="如果你无法�供实施�良行为的居民的�字，请选择这项。"/>
         <text name="abuser_name_title2">
-                辱骂情况�生的地�:
+                �良行为�生的地�:
         </text>
         <text name="sum_title">
                 总结:
@@ -67,11 +166,11 @@
                 详细:
         </text>
         <text name="bug_aviso">
-                请详尽的�述关于日期，地点，辱骂事件的特�，相关的�天记录，如果�能请选择对象。
+                请详尽的�述关于日期，地点，�良行为事件的特�，相关的�天记录，如果�能请选择对象。
         </text>
         <text name="incomplete_title">
-                通知：�完整的报告将�会被调查
+                注�：�完整的报告将�会被调查
         </text>
-        <button label="报告�架" label_selected="报告�架" name="send_btn" />
+        <button label="报告�良行为" label_selected="报告�良行为" name="send_btn" />
         <button label="�消" label_selected="�消" name="cancel_btn" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
index 65472d4..0a5d292 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_report_bug.xml
@@ -10,7 +10,7 @@
                 �置:
         </text>
         <text name="select_object_label">
-                点击按钮选择一个东东:
+                点击按钮然�点击物体:
         </text>
         <button label="" label_selected="" name="pick_btn"
              tool_tip="东东拾�器 - 确认一个东东为此份报告中的一项" />
@@ -23,7 +23,7 @@
         <check_box label="包��幕截图" name="screen_check" />
         <texture_picker label="工作..." name="screenshot" />
         <text name="category_label">
-                �类列表:
+                分类:
         </text>
         <combo_box name="category_combo"
              tool_tip="Category -- select the category that best describes this report">
@@ -31,7 +31,7 @@
                         选择一个分类
                 </combo_item>
                 <combo_item name="Building">
-                        楼宇
+                        建造
                 </combo_item>
                 <combo_item name="Character">
                         角色
@@ -43,7 +43,7 @@
                         文档
                 </combo_item>
                 <combo_item name="Exploit">
-                        开�
+                        �洞
                 </combo_item>
                 <combo_item name="Graphics">
                         图�
@@ -52,22 +52,22 @@
                         库存
                 </combo_item>
                 <combo_item name="Lag">
-                        滞�
+                        延迟
                 </combo_item>
                 <combo_item name="MissingContent">
                         �失内容
                 </combo_item>
                 <combo_item name="LindenDollars(L$)">
-                        Linden Dollars (L$)
+                        林登� (L$)
                 </combo_item>
                 <combo_item name="Permissions">
-                        �许
+                        许�
                 </combo_item>
                 <combo_item name="Physics">
-                        实物
+                        物�
                 </combo_item>
                 <combo_item name="Script">
-                        剧本
+                        脚本
                 </combo_item>
                 <combo_item name="Sound">
                         音效
@@ -79,7 +79,7 @@
                         用户界�
                 </combo_item>
                 <combo_item name="Miscellaneous">
-                        混色
+                        其他
                 </combo_item>
         </combo_box>
         <text name="sum_title">
@@ -89,14 +89,16 @@
                 详细:
         </text>
         <text_editor name="details_edit">
-                修��洞的途径：:
+���洞�生的步骤:
 
-观察的结果：:
+观察到的结果:
+
+期望的结果:
         </text_editor>
         <text name="bug_aviso">
-                If this bug allows you to do something you should not be able 
-to do, especially if it impacts performance or security, please 
-select the &apos;Exploit&apos; category. Thank you!
+                注�：�完整的报告将�会被调查
+                如果这个�洞�许你�你�应该�的事情，特别
+                是妨�到性能或安全，请选择�洞一类。谢谢!
         </text>
         <button label="报告�洞" label_selected="报告�洞" name="send_btn" />
         <button label="�消" label_selected="�消" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml
index 0d40bd7..733e192 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_debug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="script debug floater" title="脚本错误/警告">
         <tab_container name="Preview Tabs">
-                <floater label="剧本" name="all_scripts" title="所有脚本" />
+                <floater label="脚本" name="all_scripts" title="所有脚本" />
         </tab_container>
 </multi_floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
index 2941882..27c97aa 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_ed_panel.xml
@@ -4,12 +4,39 @@
         <text_editor type="string" length="1" name="Script Editor">
                 请等待...
         </text_editor>
+                <string
+                 name="loading">
+                请等待......
+        </string>
+        <string
+                 name="can_not_view">
+                你没有�利查看该脚本。
+        </string>
+        <string
+                 name="public_objects_can_not_run">
+                公共物体�能�行脚本。
+        </string>
+        <string
+                 name="script_running">
+                �行中
+        </string>
+
+        <combo_box
+                 allow_text_entry="false"
+                 label="�入..."
+                 max_chars="20"
+                 name="Insert..." />
+
         <menu_bar name="script_menu">
-                <menu name="File">
+                <menu 
+                        label="文件"
+                        name="File">
                         <menu_item_call label="存储" name="Save" />
                         <menu_item_call label="��所有更改" name="Revert All Changes" />
                 </menu>
-                <menu name="Edit">
+                <menu 
+                        label="编辑"
+                        name="Edit">
                         <menu_item_call label="撤销" name="Undo" />
                         <menu_item_call label="�置" name="Redo" />
                         <menu_item_separator label="-----------" name="separator" />
@@ -18,12 +45,18 @@
                         <menu_item_call label="粘贴" name="Paste" />
                         <menu_item_separator label="-----------" name="separator2" />
                         <menu_item_call label="全选" name="Select All" />
-                        <menu_item_call label="�消选定" name="Deselect" />
+                        <menu_item_call label="�消选择" name="Deselect" />
                         <menu_item_separator label="-----------" name="separator3" />
-                        <menu_item_call label="查找 / 替代..." name="Search / Replace..." />
+                        <menu_item_call label="查找 / 替�..." name="Search / Replace..." />
+
                 </menu>
-                <menu name="Help">
+                <menu 
+                        label="帮助"
+                        name="Help">
                         <menu_item_call label="帮助..." name="Help..." />
+                        <menu_item_call
+                                 label="LSL Wiki 帮助..."
+                                 name="LSL Wiki Help..." />
                 </menu>
         </menu_bar>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml b/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml
index 25e71d7..81ba081 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_script_search.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script search" title="脚本�索">
-        <check_box label="诉讼�消" name="case_text" />
-        <button label="�索" label_selected="�索" name="search_btn" />
+        <check_box label="�区分大�写" name="case_text" />
+        <button label="查找" label_selected="查找" name="search_btn" />
         <button label="替�" label_selected="替�" name="replace_btn" />
         <button label="全部替�" label_selected="全部替�" name="replace_all_btn" />
         <text type="string" length="1" name="txt">
-                �索
+                查找
         </text>
         <text type="string" length="1" name="txt2">
                 替�
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml b/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml
new file mode 100644
index 0000000..67d4dc4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_select_key.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="modal container"

+         title="">

+        <button

+                 label="�消"

+                 label_selected="�消"

+                 name="Cancel" />

+        <text

+                 name="Save item as:">

+                请按键选择

+        </text>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
index 7247383..7ecc330 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="sell land" title="出售土地...">
         <text name="info_parcel_label">
-                土地:
+                地�:
         </text>
         <text name="info_parcel">
-                土地的�称
+                PARCEL NAME
         </text>
         <text name="info_size_label">
                 尺寸:
         </text>
         <text name="info_size">
-                [AREA]平方米
+                [AREA] 平方米
         </text>
         <text name="info_action">
                 出售这�土地:
@@ -31,37 +31,37 @@
                 把土地出售给:
         </text>
         <text name="sell_to_text">
-                选择是�把东东出售给任何人或是一个特定的人.
+                选择是�把地�出售给任何人或是一个特定的购买者。
         </text>
         <combo_box name="sell_to">
                 <combo_item name="--selectone--">
-                        -- select one --
+                        -- 选择用户 --
                 </combo_item>
                 <combo_item name="Anyone">
                         任何人
                 </combo_item>
                 <combo_item name="Specificuser:">
-                        特殊用户：
+                        指定用户：
                 </combo_item>
         </combo_box>
         <button label="选择..." name="sell_to_select_agent" />
         <text name="sell_objects_label">
-                是�和土地一起出售东东?
+                土地上的物体和土地一起出售�？
         </text>
         <text name="sell_objects_text">
-                Land owner&apos;s transferable objects on parcel will change ownership.
+                地�所有人在地�上的�转让的物体，其所有�将会转让。
         </text>
         <radio_group name="sell_objects">
                 <radio_item name="no">
-                        No, keep ownership of objects
+                        ��，�留物体的所有�
                 </radio_item>
                 <radio_item name="yes">
-                        Yes, sell objects with land
+                        是的，和土地一起出售物体
                 </radio_item>
         </radio_group>
-        <button label="显示东东" name="show_objects" />
+        <button label="显示物体" name="show_objects" />
         <text name="nag_message_label">
-                请谨记: 所有的售出都是最�阶段.
+                请谨记: 所有土地交易都�能撤销。
         </text>
         <button label="设置土地为代售状�" name="sell_btn" />
         <button label="�消" name="cancel_btn" />
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml b/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
index 91db4b0..cdb02ec 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="�低缺陷设定">
-        <combo_box name="boolean_combo">
-                <combo_item name="TRUE">
+<floater
+         name="settings_debug"
+         title="调试设定">
+        <combo_box
+                 name="boolean_combo">
+                <combo_item
+                         name="TRUE"
+                         value="true">
                         TRUE
                 </combo_item>
-                <combo_item name="FALSE">
+                <combo_item
+                         name="FALSE"
+                         value="">
                         FALSE
                 </combo_item>
         </combo_box>
-        <spinner label="x" name="val_spinner_1" />
-        <spinner label="x" name="val_spinner_2" />
-        <spinner label="x" name="val_spinner_3" />
-        <spinner label="x" name="val_spinner_4" />
+        <color_swatch
+                 label="颜色"
+                 name="color_swatch"
+                 visible="true" />
+        <button
+                 label="�置为默认值"
+                 name="default_btn" />
 </floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml b/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
new file mode 100644
index 0000000..6aeaac7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="floaterreleasemessage"

+         title="正在进入地区">

+        <button

+                 label="关闭"

+                 name="close_btn"/>

+        <string

+                 name="in-world_help_title">

+                世界内帮助

+        </string>

+        <string

+                 name="additional_help_title">

+                附加帮助

+        </string>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
index 3fd6971..0e83c98 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_snapshot.xml
@@ -1,23 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Snapshot" title="快照预览">
         <text name="type_label">
-                你想干什么?
+                截图类型
         </text>
-        <radio_group label="快照类型" name="snapshot_type_radio">
+        <radio_group label="截图类型" name="snapshot_type_radio">
                 <radio_item name="postcard">
-                        Send a postcard
+                        通过电�邮件��
                 </radio_item>
                 <radio_item name="texture">
-                        Upload a snapshot
+                        �存至库存 (L$10)
                 </radio_item>
                 <radio_item name="local">
-                        Save snapshot to hard drive
+                        �存至硬盘
                 </radio_item>
         </radio_group>
         <text name="type_label2">
-                你需�多大的图�?
+                尺寸
         </text>
-        <combo_box label="决议" name="postcard_size_combo">
+        <text
+                 name="file_size_label">
+                文件尺寸: [SIZE] KB
+        </text>
+        <button label="刷新截图" name="new_snapshot_btn" />
+        <button label="上传 (L$10)" name="upload_btn" />
+        <button label="��" name="send_btn" />
+        <flyout_button
+                 label="�存"
+                 list_position="below"
+                 name="save_btn"
+                 tool_tip="�存图�到文件">
+                        <flyout_button_item
+                         value="save">�存</flyout_button_item>
+                        <flyout_button_item
+                         value="save as">�存为...</flyout_button_item>
+        </flyout_button>
+        <button label="放弃" name="discard_btn" />
+        <button
+                 label="更多 >>"
+                 name="more_btn"
+                 tool_tip="高级选项" />
+                <button
+                 label="&lt;&lt; 较少"
+                 name="less_btn"
+                 tool_tip="高级选项" />
+
+
+        
+        <combo_box label="分辨率" name="postcard_size_combo">
                 <combo_item name="640x480">
                         640x480
                 </combo_item>
@@ -31,10 +60,10 @@
                         当�窗�
                 </combo_item>
                 <combo_item name="Custom">
-                        习惯
+                        自定义
                 </combo_item>
         </combo_box>
-        <combo_box label="决议" name="texture_size_combo">
+        <combo_box label="分辨率" name="texture_size_combo">
                 <combo_item name="CurrentWindow">
                         当�窗�
                 </combo_item>
@@ -48,10 +77,10 @@
                         大 (512x512)
                 </combo_item>
                 <combo_item name="Custom">
-                        习惯
+                        自定义
                 </combo_item>
         </combo_box>
-        <combo_box label="决议" name="local_size_combo">
+        <combo_box label="分辨率" name="local_size_combo">
                 <combo_item name="CurrentWindow">
                         当�窗�
                 </combo_item>
@@ -74,12 +103,29 @@
                         1600x1200
                 </combo_item>
                 <combo_item name="Custom">
-                        习惯
+                        自定义
                 </combo_item>
         </combo_box>
+        <combo_box
+                label="格�"
+                 name="local_format_combo">
+                        <combo_item
+                         name="PNG">
+                                PNG
+                        </combo_item>
+                        <combo_item
+                         name="JPEG">
+                                JPEG
+                        </combo_item>
+                        <combo_item
+                         name="BMP">
+                                BMP
+                        </combo_item>
+        </combo_box>
         <spinner label="宽度" name="snapshot_width" />
         <spinner label="高度" name="snapshot_height" />
-        <slider label="画�质�" name="image_quality_slider" />
+        <check_box label="��画�宽高比" name="keep_aspect_check" />
+        <slider label="图�质�" name="image_quality_slider" />
         <text name="layer_type_label">
                 获�:
         </text>
@@ -88,24 +134,23 @@
                         色彩
                 </combo_item>
                 <combo_item name="Depth">
-                        深度
+                        景深
                 </combo_item>
                 <combo_item name="ObjectMattes">
-                        Object Mattes
+                        物体轮廓
                 </combo_item>
         </combo_box>
         <text name="file_size_label">
-                全�: [SIZE]
+                文件尺寸: [SIZE] �字节
         </text>
-        <check_box label="快照中显示界�" name="ui_check" />
-        <check_box label="在快照中显示" name="hud_check" />
-        <check_box label="�存���开�" name="keep_open_check" />
-        <check_box label="��特定�貌的比率" name="keep_aspect_check" />
-        <check_box label="冻结当�画�(全�预览)" name="freeze_frame_check" />
-        <button label="æ–°çš„å¿«ç…§" name="new_snapshot_btn" />
-        <check_box label="自动-快照" name="auto_snapshot_check" />
-        <button label="上传 (L$10)" name="upload_btn" />
-        <button label="��" name="send_btn" />
-        <button label="存储" name="save_btn" />
-        <button label="放弃" name="discard_btn" />
+        <check_box label="截图中显示界�" name="ui_check" />
+        <!---->
+        <check_box label="在截图中显示显示�附件" name="hud_check" />
+        <check_box label="�存���窗�开�" name="keep_open_check" />
+                <check_box label="冻结当�画�(全�预览)" name="freeze_frame_check" />
+        <check_box label="自动截图" name="auto_snapshot_check" />
+                <text
+                 name="unknown">未知</text>
+
 </floater>
+<!--Translated for Second Life 1.21.0 (95157)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
index e5d0abf..77bb748 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_sound_preview.xml
@@ -8,21 +8,4 @@
         </text>
         <button label="�消" label_selected="�消" name="cancel_btn" />
         <button label="上传 (L$10)" label_selected="上传 (L$10)" name="ok_btn" />
-        <text name="text">
-                速率(kbps):
-        </text>
-        <radio_group name="bitrate">
-                <radio_item name="32">
-                        32
-                </radio_item>
-                <radio_item name="64">
-                        64
-                </radio_item>
-                <radio_item name="96">
-                        96
-                </radio_item>
-                <radio_item name="128">
-                        128
-                </radio_item>
-        </radio_group>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml b/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml
index 8381e5f..8acbed2 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_telehub.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="闪电传�集�地">
+<floater name="telehub" title="瞬间移动枢纽">
         <text name="status_text_connected">
-                闪电传�连接点和东东连接[OBJECT]
+                连接到物体 [OBJECT] 的瞬移枢纽
         </text>
         <text name="status_text_not_connected">
-                没有�陆点连接
+                没有连接到瞬移枢纽。
         </text>
         <text name="help_text_connected">
-                移除，请点击断开连接
+                �移除，请点击断开连接
         </text>
         <text name="help_text_not_connected">
-                选择一个对象，并点击闪电传�连接点。
+                选择一个对象，然�点击“连接瞬移枢纽�。
         </text>
-        <button label="连接闪电传�集�点" name="connect_btn" />
+        <button label="连接瞬移枢纽" name="connect_btn" />
         <button label="断开连接" name="disconnect_btn" />
         <text name="spawn_points_text">
-                �陆点 (地点, �是东东):
+                �陆点 (地点, �是物体):
         </text>
-        <button label="Add Spawn" name="add_spawn_point_btn" />
+        <button label="添加�陆点" name="add_spawn_point_btn" />
         <button label="移除�陆点" name="remove_spawn_point_btn" />
         <text name="spawn_point_help">
-                选择对象东东，并点击添加至确定�置。
-接下�你�以移动或者删除该东东。
-�置和电�传�集�点的中心有关。
+                选择目标物体，然�点击添加，�指定�置。
+接下�你�以移动或者删除该物体。
+�置是与瞬间移动枢纽的相对�置。
 选择列表中的选项�显示它在世界中的�置。
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 98c56cb..bbca686 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -3,15 +3,24 @@
         <text type="string" length="1" name="Multiple">
                 多项
         </text>
+        <string name="choose_picture">
+                点击选择�质
+        </string>
         <text type="string" length="1" name="unknown">
-                尺寸: 512 x 512
+                尺寸: [DIMENSIONS]
         </text>
+        <search_editor
+                 label="在这里输入查找�质"
+                 name="inventory search editor" />
         <button label="默认" label_selected="默认" name="Default" />
-        <button label="都�" label_selected="都�" name="None" />
+        <button label="无�质" label_selected="无�质" name="None" />
         <button label="空白" label_selected="空白" name="Blank" />
         <check_box label="显示文件夹" name="show_folders_check" />
         <check_box label="立�应用" name="apply_immediate_check" />
         <button label="" label_selected="" name="Pipette" />
         <button label="�消" label_selected="�消" name="Cancel" />
         <button label="选择" label_selected="选择" name="Select" />
+        <string name="pick title">
+                选择:
+        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
index d62802e..ed046ad 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -1,103 +1,151 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="toolbox floater" title="">
-        <button label="" label_selected="" name="button focus" />
-        <text name="tool label">
-                焦点
-        </text>
-        <button label="" label_selected="" name="button move" />
-        <text name="tool label2">
-                移动
-        </text>
-        <button label="" label_selected="" name="button edit" />
-        <text name="tool label3">
-                编辑
-        </text>
-        <button label="" label_selected="" name="button create" />
-        <text name="tool label4">
-                创造
-        </text>
-        <button label="" label_selected="" name="button land" />
-        <text name="tool label5">
-                土地
-        </text>
-        <check_box label="Zoom" name="radio zoom" />
-        <check_box label="轨�(Ctrl)" name="radio orbit" />
-        <check_box label="平底(Ctrl-Shift)" name="radio pan" />
+        <button label="" label_selected="" name="button focus" 
+                tool_tip="�焦" />
+        <button label="" label_selected="" name="button move" 
+                tool_tip="移动"/>
+        <button label="" label_selected="" name="button edit" 
+                tool_tip="编辑" />
+        <button label="" label_selected="" name="button create" 
+                tool_tip="创造"/>
+        <button label="" label_selected="" name="button land" 
+                tool_tip="土地"/>
+                
+<!-- Focus panel/�焦�� -->
+
+        <check_box label="缩放" name="radio zoom" />
+        <check_box label="环绕(Ctrl)" name="radio orbit" />
+        <check_box label="平移(Ctrl-Shift)" name="radio pan" />
+        
+<!-- Move panel/移动�� -->
+
         <check_box label="移动" name="radio move" />
-        <check_box label="举起(Ctrl)" name="radio lift" />
+        <check_box label="举起 (Ctrl)" name="radio lift" />
         <check_box label="旋转 (Ctrl-Shift)" name="radio spin" />
+        
+<!-- Edit panel/编辑�� -->
+
         <check_box label="�置" name="radio position" />
         <check_box label="旋转(Ctrl)" name="radio rotate" />
         <check_box label="拉伸(Ctrl-Shift)" name="radio stretch" />
         <check_box label="选择�质" name="radio select face" />
-        <check_box label="编辑连接部分" name="checkbox edit linked parts" />
-        <check_box label="使用�方格" name="checkbox snap to grid" />
-        <button label="选项..." label_selected="选项..." name="Options..." />
-        <check_box label="�时拉伸两边" name="checkbox uniform" />
-        <check_box label="拉伸�质" name="checkbox stretch textures" />
-        <text name="text ruler mode">
-                管�员模�:
-        </text>
-        <text name="text status">
-                拖拽并移动, �时按shift-拖拽�制东东
+        <check_box label="编辑连接部件" name="checkbox edit linked parts" />
+        <text
+                 name="text ruler mode">
+                标尺模�:
         </text>
-        <combo_box name="combobox grid mode">
-                <combo_item name="World">
+        <combo_box
+                 name="combobox grid mode">
+                <combo_item
+                         name="World">
                         世界
                 </combo_item>
-                <combo_item name="Local">
-                        本地的
+                <combo_item
+                         name="Local">
+                        本地
                 </combo_item>
-                <combo_item name="Reference">
-                        �考资料
+                <combo_item
+                         name="Reference" >
+                        �照物
                 </combo_item>
         </combo_box>
-        <button label="" label_selected="" name="ToolCube" />
-        <button label="" label_selected="" name="ToolPrism" />
-        <button label="" label_selected="" name="ToolPyramid" />
-        <button label="" label_selected="" name="ToolTetrahedron" />
-        <button label="" label_selected="" name="ToolCylinder" />
-        <button label="" label_selected="" name="ToolHemiCylinder" />
-        <button label="" label_selected="" name="ToolCone" />
-        <button label="" label_selected="" name="ToolHemiCone" />
-        <button label="" label_selected="" name="ToolSphere" />
-        <button label="" label_selected="" name="ToolHemiSphere" />
-        <check_box label="�制选择" name="checkbox copy selection" />
-        <button label="" label_selected="" name="ToolTorus" />
-        <button label="" label_selected="" name="ToolTube" />
-        <button label="" label_selected="" name="ToolRing" />
-        <button label="" label_selected="" name="ToolTree" />
-        <button label="" label_selected="" name="ToolGrass" />
+        <check_box label="使用网格" name="checkbox snap to grid" />
+        <button label="选项..." label_selected="选项..." name="Options..." />
+        <check_box label="�时拉伸两边" name="checkbox uniform" />
+        <check_box label="拉伸�质" name="checkbox stretch textures" />
+        <text name="text status">
+                拖动�移动物体, 按� Shift 拖动��制
+        </text>
+        <button label="" label_selected="" name="ToolCube" tool_tip="立方体" />
+        <button label="" label_selected="" name="ToolPrism" 
+                tool_tip="棱柱" />
+        <button label="" label_selected="" name="ToolPyramid" 
+                tool_tip="棱锥" />
+        <button label="" label_selected="" name="ToolTetrahedron" 
+                tool_tip="四�体" />
+        <button label="" label_selected="" name="ToolCylinder" 
+                tool_tip="圆柱体" />
+        <button label="" label_selected="" name="ToolHemiCylinder" 
+                tool_tip="�圆柱体" />
+        <button label="" label_selected="" name="ToolCone" 
+                tool_tip="圆锥" />
+        <button label="" label_selected="" name="ToolHemiCone" 
+                tool_tip="�圆锥" />
+        <button label="" label_selected="" name="ToolSphere" 
+                tool_tip="�体" />
+        <button label="" label_selected="" name="ToolHemiSphere" 
+                tool_tip="��体" />
+        <button
+                 name="ToolTorus"
+                 tool_tip="圆环" />
+        <button
+                 image_disabled="object_tube.tga"
+                 image_disabled_selected="object_tube_active.tga"
+                 label=""
+                 label_selected=""
+                 name="ToolTube"
+                 tool_tip="圆管" />
+        <button
+                 image_disabled="object_ring.tga"
+                 image_disabled_selected="object_ring_active.tga"
+                 label=""
+                 label_selected=""
+                 name="ToolRing"
+                 tool_tip="环" />
+        <button
+                 image_disabled="object_tree.tga"
+                 image_disabled_selected="object_tree_active.tga"
+                 label=""
+                 label_selected=""
+                 name="ToolTree"
+                 tool_tip="树木" />
+        <button
+                 image_disabled="object_grass.tga"
+                 image_disabled_selected="object_grass_active.tga"
+                 label=""
+                 label_selected=""
+                 name="ToolGrass"
+                 tool_tip="�地" />
+        <check_box label="�制选择项" name="checkbox copy selection" />
         <check_box label="��选定工具" name="checkbox sticky" />
-        <check_box label="�制中心" name="checkbox copy centers" />
-        <check_box label="旋转�制" name="checkbox copy rotates" />
+        <check_box label="居中附件" name="checkbox copy centers" />
+        <check_box label="旋转附件" name="checkbox copy rotates" />
+        
+<!-- Land panel/土地�� -->
+
         <check_box label="选择土地" name="radio select land" />
         <check_box label="磨平土地" name="radio flatten" />
         <check_box label="抬高土地" name="radio raise" />
-        <check_box label="�低土地高度" name="radio lower" />
+        <check_box label="�低土地" name="radio lower" />
         <check_box label="使土地光滑" name="radio smooth" />
         <check_box label="粗糙化土地" name="radio noise" />
         <check_box label="��土地" name="radio revert" />
         <combo_box name="combobox brush size">
                 <combo_item name="Small">
-                        �型的
+                        å°�
                 </combo_item>
                 <combo_item name="Medium">
-                        中型的
+                        中
                 </combo_item>
                 <combo_item name="Large">
-                        大型的
+                        大
                 </combo_item>
         </combo_box>
-        <button label="应用所选项目" label_selected="应用所选项目"
-             name="button apply to selection" tool_tip="修饰所选土地" />
-        <check_box label="显示东东主人" name="checkbox show owners" />
-        <button label="多于&gt;&gt;" name="button more" tool_tip="高级选项" />
-        <button label="&lt;&lt; 少于" name="button less" tool_tip="高级选项" />
+        <text type="string" name="Strength:">
+                  强度:
+        </text>
+        <button label="应用到所选项目" label_selected="应用到所选项目"
+             name="button apply to selection" tool_tip="更改所选土地" />
+        <check_box label="显示物�主人" name="checkbox show owners" />
+        <button label="更多 &gt;&gt;" name="button more" tool_tip="高级选项" />
+        <button label="&lt;&lt; 更少" name="button less" tool_tip="高级选项" />
+        
+<!-- Sub-tabs/�标签页 -->
+        
         <tab_container name="Object Info Tabs">
-                <panel label="General" name="General">
+                <panel label="一般" name="General">
                         <text name="Name:">
-                                �字:
+                                �称:
                         </text>
                         <text name="Description:">
                                 �述:
@@ -106,34 +154,34 @@
                                 创造者:
                         </text>
                         <text name="Creator Name">
-                                斯雷�斯 林登
+                                斯雷�斯·林登
                         </text>
                         <button label="档案..." label_selected="档案..." name="button creator profile" />
                         <text name="Owner:">
                                 主人:
                         </text>
                         <text name="Owner Name">
-                                斯雷�斯 林登
+                                斯雷�斯·林登
                         </text>
                         <button label="档案..." label_selected="档案..." name="button owner profile" />
                         <text name="Group:">
-                                Group:
+                                社团:
                         </text>
                         <text name="Group Name Proxy">
-                                林登家�的人
+                                The Lindens
                         </text>
-                        <button label="调节..." label_selected="调节..." name="button set group" />
+                        <button label="设置..." label_selected="设置..." name="button set group" />
                         <text name="prim info">
-                                1个东东, 1个�董
+                                1个物体, 1个元件
                         </text>
                         <text name="Permissions:">
-                                许��:
+                                �利:
                         </text>
                         <text name="perm_modify">
-                                你�以修饰这件东东.
+                                你�以修改这件物体。
                         </text>
                         <check_box label="与社团分享" name="checkbox share with group"
-                             tool_tip="�许社团�员�移动，改进，�制以�删除Allow group members to move, modify, copy and delete." />
+                             tool_tip="�许社团�员�移动，改进，�制以�删除" />
                         <text name="text deed continued">
                                 契约...
                         </text>
@@ -141,99 +189,135 @@
                                 转让
                         </text>
                         <button label="契约..." label_selected="契约..." name="button deed"
-                             tool_tip="社团共享的东东�被社团官员认�。" />
+                             tool_tip="社团共享的物体�被社团官员认�。" />
                         <check_box label="�许任何人移动" name="checkbox allow everyone move" />
                         <check_box label="�许任何人�制" name="checkbox allow everyone copy" />
-                        <check_box label="代售" name="checkbox for sale" />
+                        <check_box label="出售" name="checkbox for sale" />
+                        <check_box
+                                 label="在�索中显示"
+                                 name="search_check"
+                                 tool_tip="让别人�以在�索结果中看到这件物体。" />
                         <text name="Price:  L$">
                                 价格：L$
                         </text>
                         <radio_group name="sale type">
                                 <radio_item name="Original">
-                                        Original
+                                        原件
                                 </radio_item>
                                 <radio_item name="Copy">
-                                        �制
+                                        附件
                                 </radio_item>
                                 <radio_item name="Contents">
-                                        Contents
+                                        内容
                                 </radio_item>
                         </radio_group>
                         <text name="Next owner can:">
                                 下个拥有者�以:
                         </text>
-                        <check_box label="修饰" name="checkbox next owner can modify" />
+                        <check_box label="修改" name="checkbox next owner can modify" />
                         <check_box label="�制" name="checkbox next owner can copy" />
-                        <check_box label="转�/抛弃" name="checkbox next owner can transfer" />
+                        <check_box label="转�/赠�" name="checkbox next owner can transfer" />
                         <text name="label click action">
                                 当点击鼠标左键时:
                         </text>
                         <combo_box name="clickaction">
+                        <!-- Do not reorder these items, the index numbers are
+                                        used internally. JC -->
                                 <combo_item name="Touch/grab(default)">
-                                        触摸/抢走 (默认)
+                                        触摸/抓� (默认)
                                 </combo_item>
                                 <combo_item name="Sitonobject">
-                                        �在东东上
+                                        �在物体上
                                 </combo_item>
                                 <combo_item name="Buyobject">
-                                        购买东东
+                                        购买物体
                                 </combo_item>
                                 <combo_item name="Payobject">
-                                        �付东东
+                                        �物体付款
                                 </combo_item>
                                 <combo_item name="Open">
                                         打开
                                 </combo_item>
+                                <combo_item name="Play">
+                                        播放地�媒体
+                                </combo_item>
+                                <combo_item name="Opemmedia">
+                                        打开地�媒体
+                                </combo_item>
+
                         </combo_box>
+                        
                         <text name="B:">
-                                B:
+                                基:
                         </text>
                         <text name="O:">
-                                O;
+                                主:
                         </text>
                         <text name="G:">
-                                G:
+                                团:
                         </text>
                         <text name="E:">
-                                E:
+                                ä¼—:
                         </text>
                         <text name="N:">
-                                N:
+                                �:
                         </text>
                         <text name="F:">
-                                F:
-                        </text>
-                        <text name="text modify info 1">
-                                你�以修饰这件东东.
-                        </text>
-                        <text name="text modify info 2">
-                                你�以修饰这些东东.
-                        </text>
-                        <text name="text modify info 3">
-                                你�能修饰这个东东.
-                        </text>
-                        <text name="text modify info 4">
-                                你�能修饰这些东东.
-                        </text>
-                        <text name="text modify warning">
-                                必须选择一个完整的对象�设置许��
-                        </text>
+                                �:
+                        </text>
+                        
+                        <string name="text modify info 1">
+                                你�以修改这件物�。
+                        </string>
+                        <string name="text modify info 2">
+                                你�以修改这些物�。
+                        </string>
+                        <string name="text modify info 3">
+                                你�能修改这个物�。
+                        </string>
+                        <string name="text modify info 4">
+                                你�能修改这些物�。
+                        </string>
+                        <string name="text modify warning">
+                                必须选择一个完整的物体�设置许�。
+                        </string>
+                        <string name="Cost Default">
+                        ä»·æ ¼:      L$
+                        </string>
+                        <string
+                                 name="Cost Total">
+                        总价格:     L$
+                        </string>
+                        <string name="Cost Per Unit">
+                        �个的价格:  L$
+                        </string>
+                        <string
+                                 name="Cost Mixed">
+                        混�价格 <!--XXX-->
+                        </string>
+                        <string name="Sale Mixed">
+                        混�销售 <!--XXX-->
+                        </string>
+
                 </panel>
-                <panel label="东东" name="Object">
+                
+<!-- Object sub-tab/物体�标签 -->
+                
+                <panel label="物体" name="Object">
                         <text name="select_single">
-                                �能选择一个许��编辑�数。
+                                一次�能编辑一个元件的�数。请选择�个元件。
                         </text>
                         <text name="edit_object">
-                                编辑东东�数:
+                                编辑物体�数:
                         </text>
                         <check_box label="�定" name="checkbox locked"
-                             tool_tip="使东东��被移动或删除。此项通常被使用在建筑过程中用以��计划外的修改。" />
+                             tool_tip="使物体��被移动或删除。此项通常被使用在建造过程中用以���外的修改。" />
                         <check_box label="物�的" name="Physical Checkbox Ctrl"
-                             tool_tip="�许物体��力影�。" />
+                             tool_tip="�许物体被推动以���力影�。" />
                         <check_box label="暂时的" name="Temporary Checkbox Ctrl"
-                             tool_tip="使东东在被创建�1分钟被删除" />
+                             tool_tip="使物体在被创建� 1 分钟被删除" />
                         <check_box label="幻影" name="Phantom Checkbox Ctrl"
-                             tool_tip="使东东�与其它东东或你在游�中的化身�生冲�" />
+                             tool_tip="使物体�与其它物体或化身碰撞" />
                         <text name="label position">
                                 �置 (米)
                         </text>
@@ -269,21 +353,21 @@
                                         木头
                                 </combo_item>
                                 <combo_item name="Flesh">
-                                        人体
+                                        肉体
                                 </combo_item>
                                 <combo_item name="Plastic">
-                                        塑料的
+                                        å¡‘æ–™
                                 </combo_item>
                                 <combo_item name="Rubber">
-                                        橡胶的
+                                        橡胶
                                 </combo_item>
                         </combo_box>
                         <text name="label basetype">
-                                创建阻�类型
+                                基础形状
                         </text>
                         <combo_box name="comboBaseType">
                                 <combo_item name="Box">
-                                        Box
+                                        立方体
                                 </combo_item>
                                 <combo_item name="Cylinder">
                                         圆柱体
@@ -298,14 +382,14 @@
                                         圆环形
                                 </combo_item>
                                 <combo_item name="Tube">
-                                        试管形
+                                        管形
                                 </combo_item>
                                 <combo_item name="Ring">
                                         环形
                                 </combo_item>
                         </combo_box>
                         <text name="text cut">
-                                路径剪贴开始和结�
+                                路径截断开始和结�
                         </text>
                         <spinner label="B" name="cut begin" />
                         <spinner label="E" name="cut end" />
@@ -313,7 +397,7 @@
                                 窟窿
                         </text>
                         <text name="text skew">
-                                倾斜的
+                                倾斜
                         </text>
                         <text name="Hollow Shape">
                                 窟窿的形状
@@ -323,7 +407,7 @@
                                         默认
                                 </combo_item>
                                 <combo_item name="Circle">
-                                        圆圈
+                                        圆
                                 </combo_item>
                                 <combo_item name="Square">
                                         正方形
@@ -346,15 +430,15 @@
                         <spinner label="X" name="Taper Scale X" />
                         <spinner label="Y" name="Taper Scale Y" />
                         <text name="text topshear">
-                                首�剪贴
+                                顶�倾斜
                         </text>
                         <spinner label="X" name="Shear X" />
                         <spinner label="Y" name="Shear Y" />
                         <text name="advanced_cut">
-                                档案文件剪贴开始和结�
+                                剖�截断开始和结�
                         </text>
                         <text name="advanced_dimple">
-                                起�开始和结�
+                                凹陷开始和结�
                         </text>
                         <spinner label="B" name="Path Limit Begin" />
                         <spinner label="E" name="Path Limit End" />
@@ -364,80 +448,132 @@
                         <spinner label="X" name="Taper X" />
                         <spinner label="Y" name="Taper Y" />
                         <text name="text radius delta">
-                                �径三角洲
+                                �径�化
                         </text>
                         <text name="text revolutions">
-                                ��
-                        </text>
+                                旋转次数
+                        </text>
+                        <texture_picker
+                                 label="雕塑�质"
+                                 name="sculpt texture control"
+                                 tool_tip="点这里选择图片"
+                         />
+                        <check_box
+                                 label="镜�"
+                                 name="sculpt mirror control"
+                                 tool_tip="将雕塑元件沿�X轴翻转。" />
+                        <check_box
+                                 label="里�外"
+                                 name="sculpt invert control"
+                                 tool_tip="�转雕塑元件的法��，使其看上去�是从里�被翻出�了一样。" />
+
+                        <text
+                                 align="left"
+                                 name="label sculpt type"
+                                 visible="false">
+                                ��类型
+                        </text>
+                                                <combo_box
+                                 allow_text_entry="false"
+                                 max_chars="20"
+                                 name="sculpt type control"
+                                 visible="false">
+                          <combo_item
+                                         name="None">
+                            (æ— )
+                          </combo_item>
+                          <combo_item
+                                         name="Sphere">
+                            �体
+                          </combo_item>
+                          <combo_item
+                                         name="Torus">
+                            圆环
+                          </combo_item>
+                          <combo_item
+                                         name="Plane">
+                            平�
+                          </combo_item>
+                          <combo_item
+                                         name="Cylinder">
+                            Cylinder
+                          </combo_item>
+                        </combo_box>
+                
+                <!-- Features sub-tab -->
+                
                 </panel>
-                <panel label="Features" name="Features">
+                <panel label="特�" name="Features">
                         <text name="select_single">
-                                �能选择一个许��编辑性质。
+                                一次�能编辑一个元件的�数。请选择�个元件。
                         </text>
                         <text name="edit_object">
-                                编辑东东属性:
+                                编辑物体特�:
                         </text>
-                        <check_box label="�形�路" name="Flexible1D Checkbox Ctrl"
-                             tool_tip="�许物体沿Z-轴活动（�在顾客方�用）" />
-                        <spinner label="柔软" name="FlexNumSections" />
+                        <check_box label="活动路径" name="Flexible1D Checkbox Ctrl"
+                             tool_tip="�许物体沿Z-轴活动（仅客户端有效）" />
+                        <spinner label="柔软度" name="FlexNumSections" />
                         <spinner label="�力" name="FlexGravity" />
-                        <spinner label="拖至" name="FlexFriction" />
-                        <spinner label="风格" name="FlexWind" />
-                        <spinner label="紧张" name="FlexTension" />
+                        <spinner label="阻力" name="FlexFriction" />
+                        <spinner label="风力" name="FlexWind" />
+                        <spinner label="应力" name="FlexTension" />
                         <spinner label="X方�施力" name="FlexForceX" />
                         <spinner label="Y方�施力" name="FlexForceY" />
                         <spinner label="Z方�施力" name="FlexForceZ" />
-                        <check_box label="光线" name="Light Checkbox Ctrl" tool_tip="使东东�射出光线" />
+                        
+                        <check_box label="光�" name="Light Checkbox Ctrl" tool_tip="使物体�射出光线" />
                         <text name="label color">
                                 颜色
                         </text>
                         <color_swatch label="" name="colorswatch" tool_tip="点击这里�打开色彩选择器" />
-                        <spinner label="强烈" name="Light Intensity" />
+                        <spinner label="强度" name="Light Intensity" />
                         <spinner label="�径" name="Light Radius" />
-                        <spinner label="下�" name="Light Falloff" />
+                        <spinner label="衰�" name="Light Falloff" />
                 </panel>
+                
                 <panel label="�质" name="Texture">
-                        <texture_picker label="�质" name="texture control" tool_tip="点击这里�选择图片" />
+                        <texture_picker label="�质" name="texture control" 
+                                tool_tip="点击这里�选择图片" />
                         <color_swatch label="颜色" name="colorswatch"
-                             tool_tip="点击这里�打开色彩选择器" />
+                             tool_tip="打开色彩选择器" />
                         <text name="color trans">
                                 �明度 %
                         </text>
                         <check_box label="最亮状�" name="checkbox fullbright" />
                         <text name="tex gen">
-                                绘制地图
+                                �质映射
                         </text>
                         <combo_box name="combobox texgen">
                                 <combo_item name="Default">
                                         默认
                                 </combo_item>
                                 <combo_item name="Planar">
-                                        平�的
+                                        平�
                                 </combo_item>
                         </combo_box>
                         <text name="label shininess">
-                                亮度
+                                光泽
                         </text>
                         <combo_box name="combobox shininess">
                                 <combo_item name="None">
-                                        都�
+                                        æ— 
                                 </combo_item>
                                 <combo_item name="Low">
                                         低
                                 </combo_item>
                                 <combo_item name="Medium">
-                                        中型的
+                                        中
                                 </combo_item>
                                 <combo_item name="High">
                                         高
                                 </combo_item>
                         </combo_box>
                         <text name="label bumpiness">
-                                崎岖�平的
+                                凹凸
                         </text>
                         <combo_box name="combobox bumpiness">
                                 <combo_item name="None">
-                                        都�
+                                        æ— 
                                 </combo_item>
                                 <combo_item name="Brightness">
                                         亮度
@@ -485,50 +621,55 @@
                                         石�泥
                                 </combo_item>
                                 <combo_item name="suction">
-                                        �力
+                                        �盘
                                 </combo_item>
                                 <combo_item name="weave">
                                         编织
                                 </combo_item>
                         </combo_box>
                         <text name="tex scale">
-                                一张脸一张脸的��
+                                ����次数
                         </text>
-                        <spinner label="地平线(U)" name="TexScaleU" />
-                        <check_box label="弹跳" name="checkbox flip s" />
-                        <spinner label="åž‚ç›´çš„ (V)" name="TexScaleV" />
-                        <check_box label="弹跳" name="checkbox flip t" />
+                        <spinner label="æ°´å¹³(U)" name="TexScaleU" />
+                        <check_box label="翻转" name="checkbox flip s" />
+                        <spinner label="åž‚ç›´ (V)" name="TexScaleV" />
+                        <check_box label="翻转" name="checkbox flip t" />
                         <text name="tex rotate">
-                                旋转 (角度)
+                                旋转 (度)
                         </text>
-                        <text name="string repeats per meter">
-                                一米一米的��
+                        <text
+                                 name="string repeats per meter">
+                                �米��次数
                         </text>
-                        <text name="string repeats per face">
-                                一张脸一张脸的��
+                        <text
+                                 name="string repeats per face">
+                                ����次数
                         </text>
-                        <text name="rpt">
-                                一米一米的��
+                        <text
+                                 name="rpt">
+                                �米��次数
                         </text>
+
                         <button label="应用" label_selected="应用" name="button apply" />
                         <text name="tex offset">
-                                跳出
+                                �移
                         </text>
-                        <spinner label="地平线(U)" name="TexOffsetU" />
-                        <spinner label="åž‚ç›´çš„ (V)" name="TexOffsetV" />
+                        <spinner label="æ°´å¹³(U)" name="TexOffsetU" />
+                        <spinner label="åž‚ç›´(V)" name="TexOffsetV" />
                         <text name="textbox autofix">
-                                排列媒体资�
+                                对�媒体�质
 (必须首先上传)
                         </text>
-                        <button label="排列�行" label_selected="排列�行" name="button align" />
+                        <button label="对�" label_selected="对�" name="button align" />
                 </panel>
                 <panel label="内容" name="Contents">
                         <button label="新脚本..." label_selected="新脚本..." name="button new script" />
                 </panel>
         </tab_container>
+        <!-- Land Info sub-tab -->
         <panel name="land info panel">
                 <text name="label_area_price">
-                        价格: L$[PRICE]共 [AREA]平方米.
+                        价格: L$[PRICE] � [AREA]平方米.
                 </text>
                 <text name="label_area">
                         �积: [AREA] 平方米.
@@ -542,4 +683,18 @@
                 <button label="关于土地..." label_selected="关于土地..."
                      name="button about land" />
         </panel>
+        <text name="status_rotate">拖动彩带�旋转物体</text>
+        <text name="status_scale">点击并拖动�拉伸选中�</text>
+        <text name="status_move">拖动�移动物体，按� Shift 拖动��制</text>
+        <text name="status_modifyland">点击并拖动以修改土地</text>
+        <text name="status_camera">点击并拖动�更改视角</text>
+        <text name="status_grab">拖动以移动，按� Ctrl 抬起，Ctrl+Shift 旋转</text>
+        <text name="status_place">在世界中点击以创建，按� Shift 点击�选择</text>
+        <text name="status_selectland">点击并拖动以选择土地</text>
+        <text name="grid_screen_text">�幕</text>
+        <text name="grid_local_text">本地</text>
+        <text name="grid_world_text">世界</text>
+        <text name="grid_reference_text">�考物</text>
+        <text name="grid_attachment_text">附件</text>
 </floater>
+<!-- Translated for Second Life 1.19.0 (80267) -->
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml
index ad333a3..4230e0d 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_top_objects.xml
@@ -4,47 +4,47 @@
                 请等待...
         </text>
         <scroll_list name="objects_list">
-                <column label="Score" name="score" />
-                <column label="Name" name="name" />
-                <column label="Owner" name="owner" />
-                <column label="Location" name="location" />
+                <column label="得分" name="score" />
+                <column label="�称" name="name" />
+                <column label="拥有者" name="owner" />
+                <column label="�置" name="location" />
         </scroll_list>
         <text name="id_text">
-                东东ID:
+                物体 ID:
         </text>
-        <button label="显示��" name="show_beacon_btn" />
+        <button label="显示信标" name="show_beacon_btn" />
         <text name="obj_name_text">
-                东东�称:
+                物体�称:
         </text>
         <button label="过滤" name="filter_object_btn" />
         <text name="owner_name_text">
-                主人的姓�:
+                主人姓�:
         </text>
         <button label="过滤" name="filter_owner_btn" />
-        <button label="归还已选东东" name="return_selected_btn" />
+        <button label="归还所选项" name="return_selected_btn" />
         <button label="全部归还" name="return_all_btn" />
-        <button label="无效选择" name="disable_selected_btn" />
-        <button label="全部无效" name="disable_all_btn" />
-        <button label="æ›´æ–°" name="refresh_btn" />
+        <button label="�用所选项" name="disable_selected_btn" />
+        <button label="全部�用" name="disable_all_btn" />
+        <button label="刷新" name="refresh_btn" />
         <text name="top_scripts_title">
                 首�脚本
         </text>
         <text name="top_scripts_text">
-                [COUNT]脚本��了总时间为[TIME]毫秒
+                [COUNT] 个脚本共�用 [TIME] 毫秒
         </text>
         <text name="scripts_score_label">
                 时间
         </text>
         <text name="top_colliders_title">
-                首�冲击�
+                首�碰撞�
         </text>
         <text name="top_colliders_text">
-                首�[COUNT]的东东存在很多潜在的冲�
+                首� [COUNT] 个物体存在很多潜在的冲�
         </text>
         <text name="colliders_score_label">
                 得分
         </text>
         <text name="none_descriptor">
-                没有找到任何目标
+                什么也没找到
         </text>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
index 6395465..ed16075 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -2,25 +2,16 @@
 <floater name="modal container" title=" ">
         <button label="继续" label_selected="继续" name="Continue" />
         <button label="�消" label_selected="�消" name="Cancel" />
-        <radio_group name="tos_agreement">
-                <radio_item name="radio_disagree">
-                        I Disagree with the Terms of Service
-                </radio_item>
-                <radio_item name="radio_agree">
-                        I Agree to the Terms of Service
-                </radio_item>
-        </radio_group>
+        <check_box
+                 label="我接��务�款。"
+                 name="agree_chk" />
         <text name="tos_title">
-                �务�款��
+                �务�款�议
         </text>
         <text name="tos_heading">
-                登陆第二人生�请仔细阅读下列�务�款。继续登录到第二人生，
-你必须接�该��。
-        </text>
-        <text_editor name="tos_text">
-                TOS_TEXT
-        </text_editor>
-        <text name="real_url">
-                http://secondlife.com/app/tos/
+                登陆第二人生�请仔细阅读下列�务�款。�继续登录到第二人生，
+您必须接�该�议。
         </text>
+        <web_browser name="tos_html"/>
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml b/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml
new file mode 100644
index 0000000..4e3bcc4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         name="url_entry"

+         title="">

+        <text

+                 name="media_label">

+                媒体 URL:

+        </text>

+        <combo_box

+                 allow_text_entry="true"

+                 name="media_entry" />

+        <button

+                 label="确定"

+                 name="ok_btn" />

+        <button

+                 label="�消"

+                 name="cancel_btn" />

+        <button

+                 label="清除"

+                 name="clear_btn" />

+        <text

+                 name="loading_label"

+                 visible="false">

+                请�候...

+        </text>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml b/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
new file mode 100644
index 0000000..6b6df68
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         can_resize="false"

+         can_minimize="true"

+         name="floater_voice_wizard"

+         title="语音设置">

+     <tab_container

+                 name="wizard_tabs"

+                 hide_tabs="true"

+                 top="-20"

+                 right="-2"

+                 tab_position="bottom">

+        <panel

+                         filename="panel_voice_enable.xml"

+                         right="0" />

+        <panel

+                         filename="panel_voice_options.xml"

+                         right="0" />

+        <panel

+                         name="device_settings"

+                         filename="panel_audio_device.xml"

+                         right="0" />

+     </tab_container>

+     <panel

+                 name="content_panel">

+       <!--<button

+                         label="Help"

+                         name="help_btn" />-->

+       <button

+                         label="返回"

+                         name="back_btn" />

+       <button

+                         label="继续"

+                         name="next_btn" />

+       <button

+                         label="完�"

+                         name="ok_btn" />

+       <button

+                         label="�消"

+                         name="cancel_btn" />

+     </panel>

+</floater>

+

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_water.xml b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
new file mode 100644
index 0000000..fef29f7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_water.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+         min_height="200"
+         min_width="400"
+         name="Water Floater"
+         title="Advanced Water Editor">
+        <text
+                 name="KeyFramePresetsText">
+                水预设:
+        </text>
+        <combo_box
+                 allow_text_entry="false"
+                 max_chars="20"
+                 name="WaterPresetsCombo" />
+        <button
+                 label="新建"
+                 label_selected="新建"
+                 name="WaterNewPreset" />
+        <button
+                 label="�存"
+                 label_selected="�存"
+                 name="WaterSavePreset" />
+        <button
+                 label="删除"
+                 label_selected="Delete"
+                 name="WaterDeletePreset" />
+        <tab_container
+                 name="Water Tabs"
+                 tab_position="top">
+                <panel
+                         label="设置"
+                         name="Settings">
+                        <text
+                                 name="BHText">
+                                水雾颜色
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterFogColorHelp" />
+                        <color_swatch
+                                 label=""
+                                 name="WaterFogColor"
+                                 tool_tip="点击打开颜色选择器" />
+                        <text
+                                 name="WaterFogDensText">
+                                水雾浓度指数
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterFogDensityHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterFogDensity"
+                                 value="1.0" />
+                        <text
+                                 name="WaterUnderWaterFogModText">
+                                水下雾浓度修正
+                        </text>
+                        <text
+                                 name="BDensText">
+                                �射�波大�
+                        </text>
+                        <text
+                                 name="HDText">
+                                �涅尔尺度
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterFresnelScaleHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterFresnelScale"
+                                 value="1.0" />
+                        <text
+                                 name="FresnelOffsetText">
+                                �涅尔�移
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterFresnelOffsetHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterFresnelOffset"
+                                 value="1.0" />
+                        <text
+                                 name="DensMultText">
+                                水上折射�
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterScaleAboveHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterScaleAbove"
+                                 value="1.0" />
+                        <text
+                                 name="WaterScaleBelowText">
+                                水下折射�
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterScaleBelowHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterScaleBelow"
+                                 value="0.0" />
+                        <text
+                                 name="MaxAltText">
+                                模糊因数
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterBlurMultiplierHelp" />
+                        <slider
+                                 label=""
+                                 name="WaterBlurMult"
+                                 value="0" />
+                </panel>
+                <panel
+                         label="图�"
+                         name="Waves">
+                        <text
+                                 name="BHText">
+                                大波方�
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterWave1Help" />
+                        <text
+                                 name="WaterWave1DirXText">
+                                X
+                        </text>
+                        <text
+                                 name="WaterWave1DirYText">
+                                Y
+                        </text>
+                        <slider
+                                 label=""
+                                 name="WaterWave1DirX"
+                                 value="0.7" />
+                        <slider
+                                 label=""
+                                 name="WaterWave1DirY"
+                                 value="0.7" />
+                        <text
+                                 name="BHText2">
+                                �波方�
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterWave2Help" />
+                        <text
+                                 name="WaterWave2DirXText">
+                                X
+                        </text>
+                        <text
+                                 name="WaterWave2DirYText">
+                                Y
+                        </text>
+                        <slider
+                                 label=""
+                                 name="WaterWave2DirX"
+                                 value="0.7" />
+                        <slider
+                                 label=""
+                                 name="WaterWave2DirY"
+                                 value="0.7" />
+                        <text
+                                 name="BHText3">
+                                法�图
+                        </text>
+                        <button
+                                 label="?"
+                                 name="WaterNormalMapHelp" />
+                        <texture_picker
+                                 label=""
+                                 name="WaterNormalMap" />
+                </panel>
+        </tab_container>
+        <string
+                 name="WLDefaultWaterNames">
+                Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+        </string>
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml b/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
index 11db09a..8c8769b 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_wearable_save_as.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="modal container" title=" ">
-        <button label="存储" label_selected="存储" name="Save" />
+        <button label="�存" label_selected="�存" name="Save" />
         <button label="�消" label_selected="�消" name="Cancel" />
         <text type="string" length="1" name="Save item as:">
                 �存物�为:
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
new file mode 100644
index 0000000..69e3eb7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<floater

+         min_height="180"

+         min_width="400"

+         name="WindLight floater"

+         title="高级天空编辑器">

+        <text

+                 name="KeyFramePresetsText">

+                天空预设:

+        </text>

+

+        <button

+                 label="新建"

+                 label_selected="新建"

+                 name="WLNewPreset" />

+        <button

+                 label="�存"

+                 label_selected="�存"

+                 name="WLSavePreset" />

+        <button

+                 label="删除"

+                 label_selected="删除"

+                 name="WLDeletePreset" />

+        <button

+                 label="日夜循环编辑器"

+                 label_selected="日夜循环编辑器"

+                 name="WLDayCycleMenuButton" />

+        <tab_container

+                 name="WindLight Tabs"

+                 tab_position="top">

+                <panel

+                         label="大气"

+                         name="Atmosphere">

+                        <text

+                                 name="BHText">

+                                �色地平

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLBlueHorizonHelp" />

+                        <text

+                                 name="BHText2" width="14">

+                                红

+                        </text>

+                        <text

+                                 name="BHText3" width="14">

+                                绿

+                        </text>

+                        <text

+                                 name="BHText4" width="14">

+                                �

+                        </text>

+                        <text

+                                 name="BHText5" width="14">

+                                亮

+                        </text>

+                        <text

+                                 name="BDensText">

+                        云雾地平

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLHazeHorizonHelp" />

+                        <text

+                                 name="BDensText2">

+                                �色浓度

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLBlueDensityHelp" />

+                        <text

+                                 name="BHText6" width="14">

+                                红

+                        </text>

+                        <text

+                                 name="BHText7" width="14">

+                                绿

+                        </text>

+                        <text

+                                 name="BHText8" width="14">

+                                �

+                        </text>

+                        <text

+                                 name="BHText9" width="14">

+                                亮

+                        </text>

+                        <text

+                                 name="HDText">

+                                云雾浓度

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLHazeDensityHelp" />

+                        <text

+                                 name="DensMultText">

+                                浓度乘数

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLDensityMultHelp" />

+                        <slider

+                                 label=""

+                                 name="WLDensityMult"

+                                 value="1.0" />

+                        <text

+                                 name="WLDistanceMultText">

+                                �离乘数

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLDistanceMultHelp" />

+                        <slider

+                                 label=""

+                                 name="WLDistanceMult"

+                                 value="0.0" />

+                        <text

+                                 name="MaxAltText">

+                                        最大高度

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLMaxAltitudeHelp" />

+                        <slider

+                                 label=""

+                                 name="WLMaxAltitude"

+                                 value="4000" />

+                </panel>

+                <panel

+                         label="光照"

+                         name="Lighting">

+                        <text

+                                 name="SLCText">

+                                日月颜色

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLSunlightColorHelp" />

+                        <text

+                                 name="BHText" width="14">

+                                红

+                        </text>

+                        <text

+                                 name="BHText2" width="14">

+                                绿

+                        </text>

+                        <text

+                                 name="BHText3" width="14">

+                                �

+                        </text>

+                        <text

+                                 name="BHText4" width="14">

+                                亮

+                        </text>

+                        <text

+                                 name="TODText">

+                                日月�置

+                        </text>

+                        <text

+                                 name="WLAmbientText">

+                                环境

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLAmbientHelp" />

+                        <text

+                                 name="BHText5" width="14">

+                                红

+                        </text>

+                        <text

+                                 name="BHText6" width="14">

+                                绿

+                        </text>

+                        <text

+                                 name="BHText7" width="14">

+                                �

+                        </text>

+                        <text

+                                 name="BHText8" width="14">

+                                亮

+                        </text>

+                        <text

+                                 name="WLEastAngleText">

+                                东�角度

+                        </text>

+                        <text

+                                 name="SunGlowText">

+                                太阳辉光

+                        </text>

+                        <slider

+                                 label="�焦"

+                                 name="WLGlowB"

+                                 value="1.0" />

+                        <slider

+                                 label="尺寸"

+                                 name="WLGlowR"

+                                 value="1.0" />

+                        <text

+                                 name="SceneGammaText">

+                                场景γ

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLSceneGammaHelp" />

+                        <slider

+                                 label=""

+                                 name="WLGamma"

+                                 value="2.0" />

+                        <text

+                                 name="WLStarText">

+                                星空亮度

+                        </text>

+                </panel>

+                <panel

+                         label="云层"

+                         name="Clouds">

+                        <text

+                                 name="WLCloudColorText">

+                                云层颜色

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLCloudColorHelp" />

+                        <text

+                                 name="BHText" width="14">

+                                红

+                        </text>

+                        <text

+                                 name="BHText2" width="14">

+                                绿

+                        </text>

+                        <text

+                                 name="BHText3" width="14">

+                                �

+                        </text>

+                        <text

+                                 name="BHText4" width="14">

+                                亮

+                        </text>

+                        <text

+                                 name="WLCloudColorText2">

+                                云层 XY/密度

+                        </text>

+                        <text

+                                 name="BHText5">

+                                X

+                        </text>

+                        <text

+                                 name="BHText6">

+                                Y

+                        </text>

+                        <text

+                                 name="BHText7">

+                                D

+                        </text>

+                        <text

+                                 name="WLCloudCoverageText">

+                                云层覆盖

+                        </text>

+                        <text

+                                 name="WLCloudScaleText">

+                                云层尺寸

+                        </text>

+                        <text

+                                 name="WLCloudDetailText">

+                                云层细节 (XY/密度)

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLCloudDetailHelp" />

+                        <text

+                                 name="BHText8">

+                                X

+                        </text>

+                        <text

+                                 name="BHText9">

+                                Y

+                        </text>

+                        <text

+                                 name="BHText10">

+                                D

+                        </text>

+                        <slider

+                                 label=""

+                                 name="WLCloudDetailX"

+                                 value="0.5" />

+                        <slider

+                                 label=""

+                                 name="WLCloudDetailY"

+                                 value="0.5" />

+                        <slider

+                                 label=""

+                                 name="WLCloudDetailDensity"

+                                 value="1.0" />

+                        <text

+                                 name="WLCloudScrollXText">

+                                �动 X

+                        </text>

+                        <button

+                                 label="?"

+                                 name="WLCloudScrollXHelp" />

+                        <check_box

+                                 initial_value="false"

+                                 label="Lock"

+                                 name="WLCloudLockX" />

+                        <slider

+                                 label=""

+                                 name="WLCloudScrollX"

+                                 value="0.0" />

+                        <text

+                                 name="WLCloudScrollYText">

+                                �动 Y

+                        </text>

+                        <check_box

+                                 initial_value="false"

+                                 label="渲染旧云层"

+                                 name="DrawClassicClouds" />

+                        <button

+                                 label="?"

+                                 name="WLClassicCloudsHelp" />

+                </panel>

+        </tab_container>

+        <string

+                 name="WLDefaultSkyNames">

+                A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality

+        </string>

+</floater>

+

diff --git a/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml b/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml
index 2e177e1..aa9e9a7 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_world_map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="worldmap" title="全部地图">
+<floater name="worldmap" title="世界地图">
         <tab_container name="maptab">
-                <panel label="东东" name="objects_mapview" />
+                <panel label="物体" name="objects_mapview" />
                 <panel label="地形" name="terrain_mapview" />
         </tab_container>
         <text name="land_for_sale_label">
@@ -11,15 +11,15 @@
                 ��
         </text>
         <text name="you_label">
-                ä½ 
+                您
         </text>
         <text name="home_label">
                 家
         </text>
         <button label="回家" label_selected="回家" name="Go Home"
-             tool_tip="将你的房屋闪电传�" />
+             tool_tip="瞬间移动到你的起始�置" />
         <text name="classifieds_label">
-                分类目录
+                分类广告
         </text>
         <check_box label=" " name="class_chk" />
         <text name="person_label">
@@ -27,11 +27,11 @@
         </text>
         <check_box label=" " name="people_chk" />
         <text name="infohub_label">
-                消�中心
+                信�中心
         </text>
         <check_box label=" " name="infohub_chk" />
         <text name="telehub_label">
-                闪电传�集�地
+                瞬移枢纽
         </text>
         <check_box label=" " name="telehubchk" />
         <text name="popular_label">
@@ -43,19 +43,19 @@
         </text>
         <check_box label=" " name="land_for_sale_chk" />
         <text name="events_label">
-                事件或活动
+                事件
         </text>
         <check_box label=" " name="event_chk" />
         <text name="events_mature_label">
-                事件(M)
+                事件(�人)
         </text>
         <check_box label=" " name="event_mature_chk" />
-        <combo_box label="我的朋�" name="friend combo" tool_tip="Friend to Show on Map">
+        <combo_box label="在线好�" name="friend combo" tool_tip="�在地图上显示的好�">
                 <combo_item name="none_selected">
-                        我的朋�
+                        在线好�
                 </combo_item>
         </combo_box>
-        <combo_box label="我的地标" name="landmark combo" tool_tip="Landmark to Show on Map">
+        <combo_box label="我的地标" name="landmark combo" tool_tip="�在地图上显示的地标">
                 <combo_item name="none_selected">
                         我的地标
                 </combo_item>
@@ -63,7 +63,7 @@
         <line_editor name="location" tool_tip="键入地区的�称">
                 按地区��索
         </line_editor>
-        <button label="�索" label_selected="&gt;" name="DoSearch" tool_tip="寻找地域" />
+        <button label="�索" label_selected="&gt;" name="DoSearch" tool_tip="寻找地区" />
         <text name="search_label">
                 查询结果:
         </text>
@@ -74,17 +74,21 @@
         <text name="location_label">
                 �置:
         </text>
-        <spinner name="spin x" tool_tip="地点的X�标在地图中显示��。" />
-        <spinner name="spin y" tool_tip="地点的Y�标在地图中显示��。" />
-        <spinner name="spin z" tool_tip="地点的Z�标在地图中显示��。" />
-        <button label="闪电传�" label_selected="闪电传�" name="Teleport"
-             tool_tip="闪电传输到指定地点" />
+        <spinner name="spin x" tool_tip="地图中显示地点的X�标" />
+        <spinner name="spin y" tool_tip="地图中显示地点的Y�标" />
+        <spinner name="spin z" tool_tip="地图中显示地点的Z�标" />
+        <button label="瞬间移动" label_selected="瞬间移动" name="Teleport"
+             tool_tip="瞬间移动到指定地点" />
         <button label="显示目的地" label_selected="显示目的地"
-             name="Show Destination" tool_tip="所选地区的中心地图。" />
+             name="Show Destination" tool_tip="居中显示指定地点" />
         <button label="清除" label_selected="清除" name="Clear"
              tool_tip="�止追踪/跟踪" />
         <button label="显示我的�置" label_selected="显示我的�置"
              name="Show My Location"
-             tool_tip="你的化身所在地区的中心地图。" />
-        <slider label="Zoom" name="zoom slider" />
+             tool_tip="居中显示你的化身的�置" />
+        <button
+                 label="�制 SLURL 到剪贴�"
+                 name="copy_slurl"
+                 tool_tip="将当��置�制为 SLURL 以供网上使用" />
+        <slider label="缩放" name="zoom slider" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
index 254a793..e7edfab 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_inventory.xml
@@ -3,64 +3,71 @@
         <menu_item_call label="è´­ä¹°" name="Task Buy" />
         <menu_item_call label="打开" name="Task Open" />
         <menu_item_call label="播放" name="Task Play" />
-        <menu_item_call label="�具" name="Task Properties" />
+        <menu_item_call label="属性" name="Task Properties" />
         <menu_item_call label="�命�" name="Task Rename" />
         <menu_item_call label="删除" name="Task Remove" />
         <menu_item_call label="清空回收站" name="Empty Trash" />
-        <menu_item_call label="新的文件夹" name="New Folder" />
-        <menu_item_call label="新的脚本" name="New Script" />
-        <menu_item_call label="新的通知" name="New Note" />
-        <menu_item_call label="新的姿势" name="New Gesture" />
+        <menu_item_call
+                 label="清空失物招领" name="Empty Lost And Found"/>
+        <menu_item_call label="新建文件夹" name="New Folder" />
+        <menu_item_call label="新建脚本" name="New Script" />
+        <menu_item_call label="新建记事�" name="New Note" />
+        <menu_item_call label="新建动作" name="New Gesture" />
         <menu name="New Clothes">
-                <menu_item_call label="新的衬衫" name="New Shirt" />
-                <menu_item_call label="新的裤�" name="New Pants" />
-                <menu_item_call label="æ–°çš„éž‹å­�" name="New Shoes" />
-                <menu_item_call label="新的袜�" name="New Socks" />
-                <menu_item_call label="新的夹克" name="New Jacket" />
-                <menu_item_call label="新的短裙" name="New Skirt" />
-                <menu_item_call label="新的手套" name="New Gloves" />
-                <menu_item_call label="新的内衣" name="New Undershirt" />
-                <menu_item_call label="新的内裤" name="New Underpants" />
+                <menu_item_call label="新建衬衫" name="New Shirt" />
+                <menu_item_call label="新建裤�" name="New Pants" />
+                <menu_item_call label="新建鞋�" name="New Shoes" />
+                <menu_item_call label="新建袜�" name="New Socks" />
+                <menu_item_call label="新建夹克" name="New Jacket" />
+                <menu_item_call label="新建短裙" name="New Skirt" />
+                <menu_item_call label="新建手套" name="New Gloves" />
+                <menu_item_call label="新建内衣" name="New Undershirt" />
+                <menu_item_call label="新建内裤" name="New Underpants" />
         </menu>
         <menu name="New Body Parts">
-                <menu_item_call label="新的身�" name="New Shape" />
-                <menu_item_call label="新的皮肤" name="New Skin" />
-                <menu_item_call label="新的头�" name="New Hair" />
-                <menu_item_call label="新的眼�" name="New Eyes" />
+                <menu_item_call label="新建体型" name="New Shape" />
+                <menu_item_call label="新建皮肤" name="New Skin" />
+                <menu_item_call label="新建头�" name="New Hair" />
+                <menu_item_call label="新建眼�" name="New Eyes" />
         </menu>
-        <menu_item_call label="打开" name="Landmark Open" />
+        <menu_item_call label="瞬间移动" name="Landmark Open" />
         <menu_item_call label="打开" name="Animation Open" />
         <menu_item_call label="打开" name="Sound Open" />
-        <menu_item_call label="清空物��" name="Purge Item" />
-        <menu_item_call label="�新设置物��" name="Restore Item" />
+        <menu_item_call label="清除物体" name="Purge Item" />
+        <menu_item_call label="��物体" name="Restore Item" />
         <menu_item_call label="打开" name="Open" />
-        <menu_item_call label="�具" name="Properties" />
+        <menu_item_call label="属性" name="Properties" />
         <menu_item_call label="�命�" name="Rename" />
         <menu_item_call label="�制资产UUID" name="Copy Asset UUID" />
         <menu_item_call label="�制" name="Copy" />
         <menu_item_call label="粘贴" name="Paste" />
         <menu_item_call label="删除" name="Delete" />
-        <menu_item_call label="添加至装备" name="Add To Outfit" />
-        <menu_item_call label="替�装备" name="Replace Outfit" />
-        <menu_item_call label="更�物�" name="Take Off Items" />
-        <menu_item_call label="IM的�现�系人�系方�存在文件夹内"
+        <menu_item_call label="添加至装�" name="Add To Outfit" />
+        <menu_item_call label="替�装�" name="Replace Outfit" />
+        <menu_item_call label="脱下物�" name="Take Off Items" />
+        <menu_item_call
+                 label="开始会�"
+                 name="Conference Chat Folder" />
+        <menu_item_call label="与文件夹内在线的�系人�时�天"
              name="IM Online Contacts In Folder" />
-        <menu_item_call label="IM的所有�系方�存在文件夹内"
+        <menu_item_call label="与文件夹内所有�系人�时�天"
              name="IM All Contacts In Folder" />
         <menu_item_call label="播放" name="Sound Play" />
-        <menu_item_call label="闪电传�至地标" name="Teleport To Landmark" />
-        <menu_item_call label="在全世界播放" name="Animation Play" />
+        <menu_item_call
+                 label="关于地标"
+                 name="Teleport To Landmark" />
+        <menu_item_call label="在世界中播放" name="Animation Play" />
         <menu_item_call label="本地播放" name="Animation Audition" />
         <menu_item_call label="���时消�" name="Send Instant Message" />
-        <menu_item_call label="�供闪电传�..." name="Offer Teleport..." />
+        <menu_item_call label="邀请瞬间移动..." name="Offer Teleport..." />
         <menu_item_call label="激活" name="Activate" />
         <menu_item_call label="解除激活" name="Deactivate" />
-        <menu_item_call label="从自己分开" name="Detach From Yourself" />
+        <menu_item_call label="从自己身上�下" name="Detach From Yourself" />
         <menu_item_call label="穿上" name="Object Wear" />
-        <menu label="粘贴至" name="Attach To" />
-        <menu label="粘贴至HUD" name="Attach To HUD" />
+        <menu label="装备至" name="Attach To" />
+        <menu label="装备到HUD" name="Attach To HUD" />
         <menu_item_call label="穿上" name="Wearable Wear" />
         <menu_item_call label="编辑" name="Wearable Edit" />
         <menu_item_call label="脱掉" name="Take Off" />
-        <menu_item_call label="--no options--" name="--no options--" />
+        <menu_item_call label="--无�用选项--" name="--no options--" />
 </menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_login.xml b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
new file mode 100644
index 0000000..a00ae90
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar
+         name="Login Menu">
+        <menu
+                 label="文件"
+                 name="File">
+                <menu_item_call
+                         label="退出"
+                         name="Quit">
+                        <on_click />
+                </menu_item_call>
+        </menu>
+        <menu
+                 label="编辑"
+                 name="Edit">
+                <menu_item_call
+                         label="首选项..."
+                         name="Preferences...">
+                        <on_click />
+                </menu_item_call>
+        </menu>
+        <menu
+                 label="帮助"
+                 name="Help">
+                <menu_item_call
+                         label="第二人生帮助"
+                         name="Second Life Help">
+                        <on_click />
+                </menu_item_call>
+                <menu_item_call
+                         label="关于第二人生..."
+                         name="About Second Life...">
+                        <on_click />
+                </menu_item_call>
+        </menu>
+</menu_bar>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
index df61372..174d69a 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Attachment Pie">
-        <menu_item_call label="下�" name="Drop" />
-        <menu_item_call label="分开" name="Detach" />
+        <menu_item_call label="丢下" name="Drop" />
+        <menu_item_call label="�下" name="Detach" />
         <menu_item_call label="编辑" name="Edit" />
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
index e727656..9131180 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
@@ -2,14 +2,17 @@
 <pie_menu name="Avatar Pie">
         <menu_item_call label="档案..." name="Profile..." />
         <menu_item_call label="�蔽" name="Avatar Mute" />
+        <!--TODO-->
         <menu_item_call label="去往" name="Go To" />
-        <menu_item_call label="添加朋�" name="Add Friend" />
+        <menu_item_call label="添加好�..." name="Add Friend" />
         <menu_item_call label="付款..." name="Pay..." />
-        <pie_menu label="多于 &gt;" name="More &gt;">
+        <pie_menu label="更多 &gt;" name="More &gt;">
                 <menu_item_call label="冻结..." name="Freeze..." />
-                <menu_item_call label="赠��片" name="Give Card" />
+                <menu_item_call label="赠与�片" name="Give Card" />
+                <menu_item_call label="社团邀请..." name="Invite..." />
                 <menu_item_call label="驱�..." name="Eject..." />
-                <menu_item_call label="Debug..." name="Debug..." />
+                <menu_item_call label="调试..." name="Debug..." />
+                <menu_item_call label="审查" name="Object Inspect"/>
         </pie_menu>
-        <menu_item_call label="���时消�..." name="Send IM..." />
+        <menu_item_call label="��消�..." name="Send IM..." />
 </pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index 43ca1d4..c1c7163 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Land Pie">
         <menu_item_call label="关于土地..." name="About Land..." />
-        <menu_item_call label="创造" name="Create" />
+        <menu_item_call label="创建" name="Create" />
         <menu_item_call label="去这里" name="Go Here" />
         <menu_item_call label="�在这里" name="Sit Here" />
-        <menu_item_call label="通过…购买" name="Land Buy Pass" />
+        <menu_item_call label="购买通行�" name="Land Buy Pass" />
         <menu_item_call label="编辑地形" name="Edit Terrain" />
         <menu_item_call label="购买土地..." name="Land Buy" />
 </pie_menu>
+<!-- Translated for Second Life 1.19.0 (80267) -->
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index 8b397bb..1d6835e 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -6,15 +6,15 @@
         <menu_item_call label="�在这里" name="Object Sit" />
         <menu_item_call label="æ‹¿èµ°" name="Pie Object Take" />
         <menu_item_call label="付款..." name="Pay..." />
-        <pie_menu label="多于 &gt;" name="More &gt;">
+        <pie_menu label="更多 &gt;" name="More &gt;">
                 <menu_item_call label="删除" name="Delete" />
                 <menu_item_call label="穿上" name="Wear" />
                 <menu_item_call label="拿走副本" name="Take Copy" />
-                <pie_menu label="粘贴HUD &gt;" name="Object Attach HUD" />
-                <pie_menu label="粘贴&gt;" name="Object Attach" />
+                <pie_menu label="装上到HUD &gt;" name="Object Attach HUD" />
+                <pie_menu label="装备到&gt;" name="Object Attach" />
                 <menu_item_call label="归还..." name="Return..." />
-                <pie_menu label="多于 &gt;" name="Rate Menu">
-                        <menu_item_call label="报告辱骂..." name="Report Abuse..." />
+                <pie_menu label="更多 &gt;" name="Rate Menu">
+                        <menu_item_call label="报告�良行为..." name="Report Abuse..." />
                         <menu_item_call label="�蔽" name="Object Mute" />
                 </pie_menu>
                 <menu_item_call label="è´­ä¹°..." name="Buy..." />
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
index 031c164..2b79bf2 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
@@ -6,15 +6,15 @@
         <menu_item_call label="起身" name="Stand Up" />
         <menu_item_call label="朋�..." name="Friends..." />
         <menu_item_call label="动作..." name="Gestures..." />
-        <pie_menu label="更� &gt;" name="Take Off &gt;">
-                <pie_menu label="�饰&gt;" name="Clothes &gt;">
+        <pie_menu label="脱下 &gt;" name="Take Off &gt;">
+                <pie_menu label="�饰 &gt;" name="Clothes &gt;">
                         <menu_item_call label="衬衣" name="Shirt" />
                         <menu_item_call label="裤�" name="Pants" />
                         <menu_item_call label="éž‹å­�" name="Shoes" />
                         <menu_item_call label="袜�" name="Socks" />
                         <menu_item_call label="夹克" name="Jacket" />
                         <menu_item_call label="手套" name="Gloves" />
-                        <pie_menu label="多于 &gt;" name="More &gt;">
+                        <pie_menu label="更多 &gt;" name="More &gt;">
                                 <menu_item_call label="内衣" name="Self Undershirt" />
                                 <menu_item_call label="所有�饰" name="All Clothes" />
                                 <menu_item_call label="内裤" name="Self Underpants" />
@@ -22,7 +22,7 @@
                         <menu_item_call label="裙�" name="Skirt" />
                 </pie_menu>
                 <pie_menu label="HUD &gt;" name="Object Detach HUD" />
-                <pie_menu label="分开 &gt;" name="Object Detach" />
+                <pie_menu label="�下 &gt;" name="Object Detach" />
                 <menu_item_call label="分开全部" name="Detach All" />
         </pie_menu>
         <menu_item_call label="外观..." name="Appearance..." />
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 8bfac2f..7580a9b 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar name="Main Menu">
-        <menu label="File" name="File">
+        <menu label="文件" name="File">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="上传图� (L$[COST])..." name="Upload Image" />
                 <menu_item_call label="上传声音 (L$[COST])..." name="Upload Sound" />
@@ -8,13 +8,17 @@
                 <menu_item_call label="大宗文件上传(�个文件需L$[COST])..." name="Bulk Upload" />
                 <menu_item_separator label="-----------" name="separator" />
                 <menu_item_call label="关闭窗�" name="Close Window" />
+                <menu_item_call
+                         label="关闭所有窗�"
+                         name="Close All Windows" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="�存质地为..." name="Save Texture As..." />
+                <menu_item_call label="�存�质为..." name="Save Texture As..." />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="�摄快照" name="Take Snapshot" />
-                <menu_item_call label="快照存至电脑硬盘" name="Snapshot to Disk" />
+                <menu_item_call label="快照存至硬盘" name="Snapshot to Disk" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Set Window Size" name="Set Window Size">
+                <menu_item_call label="播放/暂��存影片到硬盘" name="Start/Stop Movie to Disk" />
+                <menu label="设置窗�大�" name="Set Window Size">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="320x240" name="320x240" />
                         <menu_item_call label="640x480" name="640x480" />
@@ -29,7 +33,7 @@
         <menu label="编辑" name="Edit">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="撤销" name="Undo" />
-                <menu_item_call label="�置" name="Redo" />
+                <menu_item_call label="��" name="Redo" />
                 <menu_item_separator label="-----------" name="separator" />
                 <menu_item_call label="剪贴" name="Cut" />
                 <menu_item_call label="�制" name="Copy" />
@@ -41,11 +45,11 @@
                 <menu_item_call label="全选" name="Select All" />
                 <menu_item_call label="�消选定" name="Deselect" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="副本" name="Duplicate" />
+                <menu_item_call label="创建副本" name="Duplicate" />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu label="Attach Object" name="Attach Object" />
-                <menu label="Detach Object" name="Detach Object" />
-                <menu label="Take Off Clothing" name="Take Off Clothing">
+                <menu label="穿上物体" name="Attach Object" />
+                <menu label="�下物体" name="Detach Object" />
+                <menu label="脱下衣�" name="Take Off Clothing">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="衬衣" name="Shirt" />
                         <menu_item_call label="裤�" name="Pants" />
@@ -66,97 +70,114 @@
                 <menu_item_check label="朋�..." name="Friends..." />
                 <menu_item_call label="社团..." name="Groups..." />
                 <menu_item_separator label="-----------" name="separator8" />
-                <menu_item_call label="�数选择..." name="Preferences..." />
+                <menu_item_call label="�数设置..." name="Preferences..." />
         </menu>
-        <menu label="View" name="View">
+        <menu label="查看" name="View">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="第一人称视角" name="Mouselook" />
                 <menu_item_check label="建造" name="Build" />
-                <menu_item_call label="�新设置察看" name="Reset View" />
-                <menu_item_call label="察看上一次�天纪录" name="Look at Last Chatter" />
+                <menu_item_call label="�新设置视角" name="Reset View" />
+                <menu_item_call label="查看最�一次�天者" name="Look at Last Chatter" />
                 <menu_item_separator label="-----------" name="separator" />
                 <menu_item_check label="工具�" name="Toolbar" />
                 <menu_item_check label="�天记录" name="Chat History" />
-                <menu_item_check label="�时消�通" name="Instant Message" />
+                <menu_item_check label="�时消�" name="Instant Message" />
                 <menu_item_call label="库存" name="Inventory" />
+                <menu_item_check
+                         label="活跃的说�人"
+                         name="Active Speakers" />
                 <menu_item_check label="�蔽��" name="Mute List" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="摄�头控制�数" name="Camera Controls" />
-                <menu_item_check label="�动控制" name="Movement Controls" />
-                <menu_item_check label="全部地图" name="World Map" />
+                <menu_item_check label="摄�头控制" name="Camera Controls" />
+                <menu_item_check label="移动控制" name="Movement Controls" />
+                <menu_item_check label="世界地图" name="World Map" />
                 <menu_item_check label="迷你地图" name="Mini-Map" />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_check label="统计�" name="Statistics Bar" />
-                <menu_item_check label="财产清�" name="Property Lines" />
-                <menu_item_check label="地主" name="Land Owners" />
+                <menu_item_check label="地�边线" name="Property Lines" />
+                <menu_item_check label="土地所有者" name="Land Owners" />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu label="Hover Tips" name="Hover Tips">
+                <menu label="悬��示" name="Hover Tips">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="显示�贴士" name="Show Tips" />
+                        <menu_item_check label="显示�示" name="Show Tips" />
                         <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="土地�贴士" name="Land Tips" />
-                        <menu_item_check label="所有东东的�贴士" name="Tips On All Objects" />
+                        <menu_item_check label="关于土地的�示" name="Land Tips" />
+                        <menu_item_check label="所有物体的�示" name="Tips On All Objects" />
                 </menu>
                 <menu_item_check label="Alt键显示物�" name="Alt Shows Physical" />
-                <menu_item_check label="�出明显部分" name="Highlight Transparent" />
-                <menu label="Beacons" name="Beacons">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_check label="编辑东东脚本" name="Scripted Objects" />
-                        <menu_item_check label="物�东东" name="Physical Objects" />
-                        <menu_item_check label="声音资�" name="Sound Sources" />
-                        <menu_item_check label="质点资�" name="Particle Sources" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_check label="��微�点" name="Hide Particles" />
-                </menu>
-                <menu_item_check label="显示顶端显示附件" name="Show HUD Attachments" />
+                <menu_item_check label="高亮�明物体" name="Highlight Transparent" />
+                <menu_item_check label="ä¿¡æ ‡" name="beacons"/>
+                <menu_item_check label="��粒�" name="Hide Particles"/>
+                <menu_item_check label="显示界�附件" name="Show HUD Attachments" />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="缩�" name="Zoom In" />
-                <menu_item_call label="缩放默认" name="Zoom Default" />
+                <menu_item_call label="默认缩放" name="Zoom Default" />
                 <menu_item_call label="放大" name="Zoom Out" />
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu label="More" name="More">
-                        <menu_item_call label="�定全�状�" name="Toggle Fullscreen" />
-                        <menu_item_call label="设置UI尺寸为默认值" name="Set UI Size to Default" />
-                </menu>
+                <menu_item_call label="切�全�状�" name="Toggle Fullscreen" />
+                        <menu_item_call label="设置用户界�尺寸为默认值" name="Set UI Size to Default" />
         </menu>
         <menu label="世界" name="World">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="�天" name="Chat" />
                 <menu_item_call label="开始动作" name="Start Gesture" />
-                <menu_item_check label="�许奔跑" name="Always Run" />
+                <menu_item_check label="总是奔跑" name="Always Run" />
                 <menu_item_check label="飞翔" name="Fly" />
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="在这里传建地标" name="Create Landmark Here" />
-                <menu_item_call label="在这里建家" name="Set Home to Here" />
+                <menu_item_call label="在这里创建地标" name="Create Landmark Here" />
+                <menu_item_call label="将家设置到这里" name="Set Home to Here" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="闪电传�回家" name="Teleport Home" />
+                <menu_item_call label="瞬间移动回家" name="Teleport Home" />
                 <menu_item_separator label="-----------" name="separator3" />
                 <menu_item_call label="设�离开状�" name="Set Away" />
-                <menu_item_call label="设��忙模�" name="Set Busy" />
-                <menu_item_call label="�止所有动画" name="Stop All Animations" />
+                <menu_item_call label="设��忙状�" name="Set Busy" />
+                <menu_item_call
+                         label="释放按键"
+                         name="Release Keys">
+                        <on_click />
+                        <on_enable />
+                </menu_item_call>
                 <menu_item_separator label="-----------" name="separator4" />
                 <menu_item_call label="�户历�纪录..." name="Account History..." />
                 <menu_item_call label="管�我的�户..." name="Manage My Account..." />
-                <menu_item_call label="Buy L$..." name="Buy and Sell L$..." />
+                <menu_item_call label="è´­ä¹° L$..." name="Buy and Sell L$..." />
                 <menu_item_separator label="-----------" name="separator5" />
                 <menu_item_call label="我的土地..." name="My Land..." />
                 <menu_item_call label="关于土地..." name="About Land..." />
                 <menu_item_call label="购买土地..." name="Buy Land..." />
                 <menu_item_call label="地区/地产..." name="Region/Estate..." />
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu label="Force Sun" name="Force Sun">
-                        <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                        <menu_item_call label="日出" name="Sunrise" />
-                        <menu_item_call label="中�" name="Noon" />
-                        <menu_item_call label="日�" name="Sunset" />
-                        <menu_item_call label="�夜" name="Midnight" />
-                        <menu_item_separator label="-----------" name="separator" />
-                        <menu_item_call label="��地区默认值" name="Revert to Region Default" />
+                <menu
+                         label="环境设置"
+                         name="Environment Settings">
+                        <menu_item_call
+                                 label="日出"
+                                 name="Sunrise" />
+                        <menu_item_call
+                                 label="中�"
+                                 name="Noon" />
+                        <menu_item_call
+                                 label="日�"
+                                 name="Sunset"
+                                 shortcut="control|shift|N" />
+                        <menu_item_call
+                                 label="�夜"
+                                 name="Midnight" />
+                        <menu_item_call
+                                 label="��地区默认值"
+                                 name="Revert to Region Default" />     
+                        <menu_item_call
+                                 label="环境编辑器"
+                                 name="Environment Editor" />
+                </menu>
+
+<!--            <menu label="强制太阳�置" name="Force Sun">
                 </menu>
+-->
         </menu>
-        <menu label="Tools" name="Tools">
+        <menu label="工具" name="Tools">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-                <menu label="Select Tool" name="Select Tool">
+                <menu label="选择工具" name="Select Tool">
                         <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                         <menu_item_call label="焦点" name="Focus" />
                         <menu_item_call label="移动" name="Move" />
@@ -165,56 +186,123 @@
                         <menu_item_call label="土地" name="Land" />
                 </menu>
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_check label="�选择我的东东" name="Select Only My Objects" />
-                <menu_item_check label="�选择�移动的东东" name="Select Only Movable Objects" />
-                <menu_item_check label="根�周围选择" name="Select By Surrounding" />
-                <menu_item_check label="显示��的选项" name="Show Hidden Selection" />
-                <menu_item_check label="显示选项的亮圈" name="Show Light Radius for Selection" />
-                <menu_item_check label="显示选择�" name="Show Selection Beam" />
+                <menu_item_check label="�选择我的物体" name="Select Only My Objects" />
+                <menu_item_check label="�选择�移动的物体" name="Select Only Movable Objects" />
+                <menu_item_check label="选中包围区域" name="Select By Surrounding" />
+                <menu_item_check label="显示��的选中项" name="Show Hidden Selection" />
+                <menu_item_check label="显示选择项的光照�径" name="Show Light Radius for Selection" />
+                <menu_item_check label="显示选择导引" name="Show Selection Beam" />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_check label="�摄�方格快照" name="Snap to Grid" />
-                <menu_item_call label="为东东XY�摄�方格快照" name="Snap Object XY to Grid" />
-                <menu_item_call label="使用�方格选项" name="Use Selection for Grid" />
-                <menu_item_call label="方格选项..." name="Grid Options..." />
+                <menu_item_check label="对�到网格" name="Snap to Grid" />
+                <menu_item_call label="在 XY �上对�网格" name="Snap Object XY to Grid" />
+                <menu_item_call label="以选项作为网格" name="Use Selection for Grid" />
+                <menu_item_call label="网格选项..." name="Grid Options..." />
                 <menu_item_separator label="-----------" name="separator3" />
+                <!--Is left uncorrected because I feel it looks nicer-->
+                <menu_item_check
+                         label="编辑链接部件"
+                         name="Edit Linked Parts"
+                         shortcut="">
+                </menu_item_check>
                 <menu_item_call label="链接" name="Link" />
                 <menu_item_call label="解除链接" name="Unlink" />
                 <menu_item_separator label="-----------" name="separator4" />
+                <menu_item_call label="�止所有动画" name="Stop All Animations" />
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="�焦于选择" name="Focus on Selection" />
-                <menu_item_call label="按所选比例缩放" name="Zoom to Selection" />
-                <menu_item_call label="购买东东" name="Menu Object Take" />
+                <menu_item_call label="�焦于所选物体" name="Focus on Selection" />
+                <menu_item_call label="缩放到所选物体" name="Zoom to Selection" />
+                <menu_item_call label="购买物体" name="Menu Object Take" />
                 <menu_item_call label="拿走副本" name="Take Copy" />
-                <menu_item_call label="�存东东至我的库存" name="Save Object Back to My Inventory" />
-                <menu_item_call label="�存东东至东东目录" name="Save Object Back to Object Contents" />
+                <menu_item_call label="将物体存回至我的库存" name="Save Object Back to My Inventory" />
+                <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents" />
                 <menu_item_separator label="-----------" name="separator6" />
-                <menu_item_call label="显示警告/错误窗�" name="Show Script Warning/Error Window" />
-                <menu_item_call label="编辑选项脚本" name="Recompile Scripts in Selection" />
-                <menu_item_call label="�新设置选项中的脚本" name="Reset Scripts in Selection" />
-                <menu_item_call label="设置��行选择的脚本"
+                <menu_item_call label="显示脚本警告/错误窗�" name="Show Script Warning/Error Window" />
+                <menu label="�新编译所选项中脚本为" name="Recompile Scripts in Selection" />
+                <menu_item_call label="�置所选项中脚本" name="Reset Scripts in Selection" />
+                <menu_item_call label="设置所选项中脚本�行"
                      name="Set Scripts to Running in Selection" />
-                <menu_item_call label="设置���行选择的脚本"
+                <menu_item_call label="设置所选项中脚本��行"
                      name="Set Scripts to Not Running in Selection" />
+                <menu_item_separator
+                         label="-----------"
+                         name="separator7" />
+                         
+
         </menu>
         <menu label="帮助" name="Help">
                 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
                 <menu_item_call label="第二人生帮助" name="Second Life Help" />
-                <menu_item_call label="基础信�..." name="Knowledge Base..." />
-                <menu_item_call label="演示帮助..." name="Live Help..." />
+                <!--TODO-->
+                <menu_item_call
+                         label="世界中帮助"
+                         name="In-World Help" />
+                <menu_item_call
+                         label="教程"
+                         name="Tutorial">
+                        <on_click />
+                </menu_item_call>
+                <menu_item_call
+                         label="�外帮助"
+                         name="Additional Help" />
+<!--            <menu_item_call label="基础信�..." name="Knowledge Base..." />
+                <menu_item_call label="演示帮助..." name="Live Help..." />-->
                 <menu_item_separator label="-----------" name="separator" />
-                <menu_item_call label="官网林登�客..." name="Official Linden Blog..." />
+                <menu_item_call label="官方林登�客..." name="Official Linden Blog..." />
                 <menu_item_separator label="-----------" name="separator2" />
-                <menu_item_call label="编辑�导脚本..." name="Scripting Guide..." />
-                <menu_item_call label="编辑维基脚本..." name="Scripting Wiki..." />
+                <menu_item_call
+                         label="脚本 Wiki 门户..."
+                         name="Scripting Portal..." />
+                <!--<menu_item_call label="编辑维基脚本..." name="Scripting Wiki..." />-->
                 <menu_item_separator label="-----------" name="separator3" />
-                <menu_item_call label="消�所属天数..." name="Message of the Day..." />
+                <!--TODO-->
+                <menu_item_call label="今日消�..." name="Message of the Day..." />
                 <menu_item_separator label="-----------" name="separator4" />
-                <menu_item_call label="报告辱骂..." name="Report Abuse..." />
+                <menu_item_call label="报告�良行为..." name="Report Abuse..." />
                 <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp;amp; Hits..." />
+                <menu_item_call
+                         label="延迟计�器"
+                         name="Lag Meter" />
+                <menu
+                         drop_shadow="true"
+                         label="错误汇报"
+                         name="Bug Reporting"
+                         opaque="true"
+                         tear_off="true"
+                         create_jump_keys="true">
+                        <!--TODO-->
+                        <menu_item_call
+                                 label="公开 Issue Tracker..."
+                                 name="Public Issue Tracker...">
+                        <on_click />
+                        </menu_item_call>
+                        <menu_item_call
+                                 label="公开 Issue Tracker 帮助..."
+                                 name="Publc Issue Tracker Help..." />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator7" />
+                        <menu_item_call
+                                 label="错误回报基础..."
+                                 name="Bug Reporting 101..." />
+                        <menu_item_call
+                                 label="安全问题..."
+                                 name="Security Issues..." />
+                        <menu_item_call
+                                 label="质��� Wiki..."
+                                 name="QA Wiki..." />
+                        <menu_item_separator
+                                 label="-----------"
+                                 name="separator7" />
+                        <menu_item_call
+                                 label="汇报错误..."
+                                 name="Report Bug...">
+                        <on_click />
+                        </menu_item_call>
+                </menu>
                 <menu_item_separator label="-----------" name="separator5" />
-                <menu_item_call label="报告�洞..." name="Report Bug..." />
-                <menu_item_call label="释放消�..." name="Release Notes..." />
+                <menu_item_call label="�行说明..." name="Release Notes..." />
                 <menu_item_separator label="-----------" name="separator6" />
                 <menu_item_call label="关于第二人生..." name="About Second Life..." />
         </menu>
 </menu_bar>
+<!--Translated for Second Life 1.19.0 (79185)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/mime_types.xml b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
new file mode 100644
index 0000000..089597d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/mime_types.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<mimetypes name="default">

+        <defaultlabel>

+                (未知)

+        </defaultlabel>

+        <defaultwidget>

+                æ— 

+        </defaultwidget>

+        <defaultimpl>

+                LLMediaImplLLMozLib

+        </defaultimpl>

+        <widgetset name="web">

+                <label name="web_label">

+                        网页内容

+                </label>

+                <tooltip name="web_tooltip">

+                        该区域有网页内容

+                </tooltip>

+                <playtip name="web_playtip">

+                        显示网页内容

+                </playtip>

+        </widgetset>

+        <widgetset name="movie">

+                <label name="movie_label">

+                        影片

+                </label>

+                <tooltip name="movie_tooltip">

+                        这里�以播放影片

+                </tooltip>

+                <playtip name="movie_playtip">

+                        播放影片

+                </playtip>

+        </widgetset>

+        <widgetset name="none">

+                <label name="none_label">

+                        无内容

+                </label>

+                <tooltip name="none_tooltip">

+                        这里没有媒体

+                </tooltip>

+                <playtip name="none_playtip" />

+        </widgetset>

+        <widgetset name="image">

+                <label name="image_label">

+                        图�

+                </label>

+                <tooltip name="image_tooltip">

+                        这里有图�

+                </tooltip>

+                <playtip name="image_playtip">

+                        显示该�置的图�

+                </playtip>

+        </widgetset>

+        <widgetset name="audio">

+                <label name="audio_label">

+                        音频

+                </label>

+                        audio/*

+                <tooltip name="audio_tooltip">

+                        这里�以播放音频

+                </tooltip>

+                <playtip name="audio_playtip">

+                        播放该�置的音频

+                </playtip>

+        </widgetset>

+        <scheme name="rtsp">

+                <label name="rtsp_label">

+                        实时�媒体 (RTSP)

+                </label>

+        </scheme>

+        <mimetype name="blank">

+                <label name="blank_label">

+                        - æ—  -

+                </label>

+        </mimetype>

+        <mimetype name="none/none">

+                <label name="none/none_label">

+                        - æ—  -

+                </label>

+        </mimetype>

+        <mimetype name="audio/*">

+                <label name="audio2_label">

+                        音频

+                </label>

+        </mimetype>

+        <mimetype name="video/*">

+                <label name="video2_label">

+                        视频

+                </label>

+        </mimetype>

+        <mimetype name="image/*">

+                <label name="image2_label">

+                        图�

+                </label>

+        </mimetype>

+        <mimetype name="video/vnd.secondlife.qt.legacy">

+                <label name="vnd.secondlife.qt.legacy_label">

+                        影片 (QuickTime)

+                </label>

+        </mimetype>

+        <mimetype name="application/javascript">

+                <label name="application/javascript_label">

+                        Javascript

+                </label>

+        </mimetype>

+        <mimetype name="application/ogg">

+                <label name="application/ogg_label">

+                        Ogg 音频/视频

+                </label>

+        </mimetype>

+        <mimetype name="application/pdf">

+                <label name="application/pdf_label">

+                        PDF 文档

+                </label>

+        </mimetype>

+        <mimetype name="application/postscript">

+                <label name="application/postscript_label">

+                        Postscript 文档

+                </label>

+        </mimetype>

+        <mimetype name="application/rtf">

+                <label name="application/rtf_label">

+                        带格�化的文本 (RTF)

+                </label>

+                <widgettype>

+                        image

+                </widgettype>

+        </mimetype>

+        <mimetype name="application/smil">

+                <label name="application/smil_label">

+                    �步多媒体集�语言 (SMIL)

+                </label>

+                <widgettype>

+                        movie

+                </widgettype>

+        </mimetype>

+        <mimetype name="application/xhtml+xml">

+                <label name="application/xhtml+xml_label">

+                        网页 (XHTML)

+                </label>

+        </mimetype>

+        <mimetype name="application/x-director">

+                <label name="application/x-director_label">

+                        Macromedia Director

+                </label>

+                <widgettype>

+                        image

+                </widgettype>

+        </mimetype>

+        <mimetype name="application/x-shockwave-flash">

+                <label name="application/x-shockwave-flash_label">

+                        Flash

+                </label>

+        </mimetype>

+        <mimetype name="audio/mid">

+                <label name="audio/mid_label">

+                        音频 (MIDI)

+                </label>

+        </mimetype>

+        <mimetype name="audio/mpeg">

+                <label name="audio/mpeg_label">

+                        音频 (MP3)

+                </label>

+        </mimetype>

+        <mimetype name="audio/x-aiff">

+                <label name="audio/x-aiff_label">

+                        音频 (AIFF)

+                </label>

+        </mimetype>

+        <mimetype name="audio/x-wav">

+                <label name="audio/x-wav_label">

+                        音频 (WAV)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="image/bmp">

+                <label name="image/bmp_label">

+                        图� (BMP)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="image/gif">

+                <label name="image/gif_label">

+                        图� (GIF)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="image/jpeg">

+                <label name="image/jpeg_label">

+                        图� (JPEG)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="image/png">

+                <label name="image/png_label">

+                        图� (PNG)

+                </label>

+        </mimetype>

+        <mimetype name="image/svg+xml">

+                <label name="image/svg+xml_label">

+                        图� (SVG)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="image/tiff">

+                <label name="image/tiff_label">

+                        图� (TIFF)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="text/html">

+                <label name="text/html_label">

+                        网页

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="text/plain">

+                <label name="text/plain_label">

+                        文本

+                </label>

+        </mimetype>

+        <mimetype name="text/xml">

+                <label name="text/xml_label">

+                        XML

+                </label>

+                <widgettype>

+                        text

+                </widgettype>

+                <impl>

+                        LLMediaImplLLMozLib

+                </impl>

+        </mimetype>

+        <mimetype menu="1" name="video/mpeg">

+                <label name="video/mpeg_label">

+                        影片 (MPEG)

+                </label>

+        </mimetype>

+        <mimetype name="video/mp4">

+                <label name="video/mp4_label">

+                        影片 (MP4)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="video/quicktime">

+                <label name="video/quicktime_label">

+                        影片 (QuickTime)

+                </label>

+                <widgettype>

+                        movie

+                </widgettype>

+                <impl>

+                        LLMediaImplQuickTime

+                </impl>

+        </mimetype>

+        <mimetype name="video/x-ms-asf">

+                <label name="video/x-ms-asf_label">

+                        影片 (Windows Media ASF)

+                </label>

+        </mimetype>

+        <mimetype name="video/x-ms-wmv">

+                <label name="video/x-ms-wmv_label">

+                        影片 (Windows Media WMV)

+                </label>

+        </mimetype>

+        <mimetype menu="1" name="video/x-msvideo">

+                <label name="video/x-msvideo_label">

+                        影片 (AVI)

+                </label>

+        </mimetype>

+</mimetypes>

diff --git a/linden/indra/newview/skins/default/xui/zh/notify.xml b/linden/indra/newview/skins/default/xui/zh/notify.xml
index ad3940d..a1532a6 100644
--- a/linden/indra/newview/skins/default/xui/zh/notify.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notify.xml
@@ -7,79 +7,89 @@
         </notify>
         <notify name="Cancelled">
                 <message name="message">
-                        �消�
+                        已�消
                 </message>
         </notify>
         <notify name="CancelledSit">
                 <message name="message">
-                        �消�下
+                        已�消�下
                 </message>
         </notify>
         <notify name="CancelledAttach">
                 <message name="message">
-                        �消连接
+                        已�消装备
                 </message>
         </notify>
         <notify name="ReplacedMissingWearable">
                 <message name="message">
-                        替��失的衣�/身体组�为默认状�。
+                        将�失的衣�/身体部�替�为默认。
                 </message>
         </notify>
         <notify name="FriendOnline">
                 <message name="message">
-                        [FIRST] [LAST]在线
+                [FIRST] [LAST]上线了。
                 </message>
         </notify>
         <notify name="FriendOffline">
                 <message name="message">
-                        [FIRST] [LAST]�在线
+                        [FIRST] [LAST]下线了。
+                </message>
+        </notify>
+        <notify name="AddSelfFriend" tip="true">
+                <message name="message">
+                        您无法将自己添加为好�。
                 </message>
         </notify>
         <notify name="UploadingAuctionSnapshot">
                 <message name="message">
-                        正在上传快照至游�内部和网页...
-(这个过程�能会�续大约1分钟.)
+                正在�世界中和网站上传快照...
+(大概� 5 分钟)
+                </message>
+        </notify>
+        <notify name="UploadPayment" tip="false">
+                <message name="message">
+                        您为了上传付出了 L$[AMOUNT]。
                 </message>
         </notify>
         <notify name="UploadingSnapshot">
                 <message name="message">
-                        上传快照至游�内部...
+                        上传快照至世界中...
 (这个过程�能会�续大约一分钟.)
                 </message>
         </notify>
         <notify name="UploadWebSnapshotDone">
                 <message name="message">
-                        快照已�被上传至网页.
+                        快照已�被上传至网页。
                 </message>
         </notify>
         <notify name="UploadSnapshotDone">
                 <message name="message">
-                        上传快照至游�已�完�。
+                        快照已�被上传至世界中。
                 </message>
         </notify>
         <notify name="TerrainDownloaded">
                 <message name="message">
-                        Terrain.raw下载完�
+                        Terrain.raw 下载完�
                 </message>
         </notify>
         <notify name="InMaxGroups">
                 <message name="message">
-                        你加入过的社团已�达到了最大值。你将需�离开一些社团，然�你��以创建新的社团。
+                        您加入的社团已�达到了最大值。您需�离开一个社团，然���以创建新的社团。
                 </message>
         </notify>
         <notify name="GestureMissing">
                 <message name="message">
-                        动作已从数�库中�失.
+                        动作 [NAME] 已从数�库中�失。
                 </message>
         </notify>
         <notify name="UnableToLoadGesture">
                 <message name="message">
-                        无法载入动作.请��试一次.
+                        无法载入动作 [NAME]。请��试一次.
                 </message>
         </notify>
         <notify name="InventoryLoaded">
                 <message name="message">
-                        Your inventory is loaded.
+                        您的库存已读�完�。
                 </message>
         </notify>
         <notify name="LandmarkMissing">
@@ -89,116 +99,124 @@
         </notify>
         <notify name="UnableToLoadLandmark">
                 <message name="message">
-                        无法载入地标.请�试一次.
+                        无法载入地标。请�试一次。
                 </message>
         </notify>
         <notify name="CapsKeyOn">
                 <message name="message">
-                        你的大写字��定已�开�。
-所有的这些将影�你输入的密�。你一定想�观点大写字��定。
+                        大写�定处于开�状�。
+因为这会影�您键入的密�，
+也许您会想把它关掉。
                 </message>
         </notify>
         <notify name="NotecardMissing">
                 <message name="message">
-                        注释�从数�库中�失.
+                        记事�从数�库中�失。
                 </message>
         </notify>
         <notify name="NotecardNoPermissions">
                 <message name="message">
-                        缺�许��，��许查看注释�。
+                        缺�许�，�能查看记事�。
+                </message>
+        </notify>
+        <notify name="RezItemNoPermissions" tip="true">
+                <message name="message">
+                        缺�许�，�能创建物体。
                 </message>
         </notify>
         <notify name="UnableToLoadNotecard">
                 <message name="message">
-                        无法载入注释�.
-请��试一次.
+                        无法载入记事�。
+请��试一次。
                 </message>
         </notify>
         <notify name="ScriptMissing">
                 <message name="message">
-                        脚本从数�库中�失.
+                        脚本从数�库中�失。
                 </message>
         </notify>
         <notify name="ScriptNoPermissions">
                 <message name="message">
-                        缺�许��，��许查看脚本.
+                        缺�许�，��许查看脚本。
                 </message>
         </notify>
         <notify name="UnableToLoadScript">
                 <message name="message">
-                        无法载入脚本.请��试一次.
+                        无法载入脚本。请��试一次。
                 </message>
         </notify>
         <notify name="IncompleteInventory">
                 <message name="message">
-                        你�供的完整内容尚�能本地有效。请在几分钟��新�供这些内容。
+                        你�供的完整内容在本地尚��用。请在几分钟�
+�试�新�供这些内容。
                 </message>
         </notify>
         <notify name="CannotModifyProtectedCategories">
                 <message name="message">
-                        你�能修改被�护的分组。
+                        你�能修改被�护的分类。
                 </message>
         </notify>
         <notify name="CannotRemoveProtectedCategories">
                 <message name="message">
-                        你�能移除被�护的分组。
+                        你�能移除被�护的分类。
                 </message>
         </notify>
         <notify name="OfferedCard">
                 <message name="message">
-                        你已�给[FIRST] [LAST]�供了一个通��。
+                        你给 [FIRST] [LAST] �供了�片。
                 </message>
         </notify>
         <notify name="OfferedFriendship">
                 <message name="message">
-                        你已�给[FIRST] [LAST]�供了�情�。
+                        你邀请了 [FIRST] [LAST] �为你的好�。
                 </message>
         </notify>
         <notify name="UnableToBuyWhileDownloading">
                 <message name="message">
-                        无法在下载东东数�时购买.
-请��试一次.
+                        下载物体数�时无法购买。
+请��试一次。
                 </message>
         </notify>
         <notify name="UnableToLinkWhileDownloading">
                 <message name="message">
-                        当下载东东数�时,�能连接东东.请��试一次.
+                        下载物体数�时无法链接。
+请��试一次。
                 </message>
         </notify>
         <notify name="CannotBuyObjectsFromDifferentOwners">
                 <message name="message">
-                        无法�时从��主人处购买东东.
-请选择�独东东并购买.
+                        无法�时从��主人处购买物体。
+请选择�个物体。
                 </message>
         </notify>
         <notify name="ObjectNotForSale">
                 <message name="message">
-                        东东�是待售状�.
+                        物体��是处在出售状�。
                 </message>
         </notify>
         <notify name="EnteringGodMode">
                 <message name="message">
-                        进入神仙模�,水平[LEVEL]
+                        进入神明模�，等级[LEVEL]
                 </message>
         </notify>
         <notify name="LeavingGodMode">
                 <message name="message">
-                        离开神仙模�，水平[LEVEL]
+                        离开神明模�，等级[LEVEL]
                 </message>
         </notify>
         <notify name="CopyFailed">
                 <message name="message">
-                        �制失败，因为你没有�制许��。
+                        �制失败，因为你没有�制�利。
                 </message>
         </notify>
         <notify name="InventoryAccepted">
                 <message name="message">
-                        [NAME]已�接�了你�供的库存.
+                        [NAME] 接�了你�供的物�。
                 </message>
         </notify>
         <notify name="InventoryDeclined">
                 <message name="message">
-                        [NAME]拒�了你�供的库存.
+                        [NAME] 拒�了你�供的物�。
                 </message>
         </notify>
         <notify name="ObjectMessage">
@@ -208,24 +226,26 @@
         </notify>
         <notify name="CallingCardAccepted">
                 <message name="message">
-                        你的通��已�被接�
+                        你的�片已�被接�
                 </message>
         </notify>
         <notify name="CallingCardDeclined">
                 <message name="message">
-                        你的通��被拒�。
+                        你的�片被拒�。
                 </message>
         </notify>
         <notify name="TeleportToLandmark">
                 <message name="message">
-                        现在你已�到达大陆,你�以闪电传�自己至 &apos;[NAME]&apos;地点，通过点击你�幕下端�侧的库存按钮,然�选择地标文件夹.
-�击地标�以闪电传�自己到达该处.
+                        既然现在您已�到达大陆，您�以瞬间移动到例如‘[NAME]’的地方，��点击
+�幕�下角的库存按钮，然�选择 Landmark 文件夹。
+�击地标，然�点击瞬间移动�移动到那儿。
                 </message>
         </notify>
         <notify name="TeleportToPerson">
                 <message name="message">
-                        现在你已�到达了大陆, 现在你�以�系居民 &apos;[NAME]&apos;，通过点击你�幕下端�侧的库存按钮,然��选择通��文件夹。 
-�击通��，点击�时消�通，并键入消�.
+                        既然现在您已�到达大陆，您�以呼�例如‘[NAME]’的居民，
+��点击�幕�下角的库存按钮，然�选择 Calling Cards 文件夹。
+�击�片，点击�时消�，然�键入您的消�。
                 </message>
         </notify>
         <notify name="CantSelectLandFromMultipleRegions">
@@ -240,11 +260,11 @@
         </notify>
         <notify name="GroupVote">
                 <message name="message">
-                        [NAME]�议投票给:
+                        [NAME]�议投票讨论:
 [MESSAGE]
                 </message>
                 <option name="VoteNow">
-                        现在投票表决
+                        现在投票
                 </option>
                 <option name="Later">
                         ��
@@ -256,7 +276,7 @@
 [MESSAGE]
                 </message>
                 <option name="VoteNow">
-                        现在投票表决
+                        现在投票
                 </option>
                 <option name="Later">
                         ��
@@ -269,13 +289,13 @@
         </notify>
         <notify name="EventNotification">
                 <message name="message">
-                        Event Notification:
+                        事件�醒:
  
 [NAME]
 [DATE]
                 </message>
                 <option name="Teleport">
-                        闪电传�
+                        瞬间移动
                 </option>
                 <option name="Description">
                         �述
@@ -286,7 +306,9 @@
         </notify>
         <notify name="TransferObjectsHighlighted">
                 <message name="message">
-                        此处所有将�土地一起转让给业主的东东将由高亮�显示强调
+                        此处所有将�土地一起转让给购买者的物体已�高亮显示。
+
+* 将传�的树木和绿化�会高亮显示。
                 </message>
                 <option name="Done">
                         完�
@@ -294,112 +316,118 @@
         </notify>
         <notify name="DeactivatedGesturesTrigger">
                 <message name="message">
-                        Deactivated gestures with same trigger:
+                        �消激活了触�器相�的动作:
 [NAMES]
                 </message>
         </notify>
         <notify name="InventoryNetworkCorruption">
                 <message name="message">
-                        由于网络故障，无法载入库存信�。出现此问题的原因是网络连接性能�稳定。
+                        由于网络故障，无法载入库存信�。这�味�网络连接有问题。
                 </message>
         </notify>
         <notify name="NoQuickTime">
                 <message name="message">
-                        苹果公�的QuickTime没有安装在你的�作系统中。如果你希望观看在游�中播放的媒体�，则需�从以下页�下载
-QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
+                        Apple 公�的 QuickTime 没有安装在你的�作系统中。如果你希望观看在支�的地�中播放的媒体�，则需�从
+QuickTime网站 (http://www.apple.com/quicktime) 安装 QuickTime Player.
                 </message>
         </notify>
         <notify name="OwnedObjectsReturned">
                 <message name="message">
-                        在所选土地上你所拥有的东东已�被归还至你的库存中。
+                        在所选地�上你所拥有的物体已�被归还至你的库存中。
                 </message>
         </notify>
         <notify name="OtherObjectsReturned">
                 <message name="message">
-                        在所选的，归[FIRST] [LAST]所拥有的东东已�被归还至本人的库存中。
+                        在所选的地�上归[FIRST] [LAST]所拥有的物体
+已�被返还至其库存中。
                 </message>
         </notify>
         <notify name="OtherObjectsReturned2">
                 <message name="message">
-                        在所选土地上归居民&apos;[NAME]&apos;所有的土地已�被归还至它的主人处。
+                        在所选的地�上归居民 ‘[NAME]’ 所拥有的物体
+已�被返还至其主人处。
                 </message>
         </notify>
         <notify name="GroupObjectsReturned">
                 <message name="message">
-                        在所选土地上，由社团[GROUPNAME]分享的东东已�被归还至它们的主人的库存里。
-�交�的被转让东东已�被归还至它们先�主人处。
-��交�的被转让东东将被删除。
+                        在所选地�上，与社团 [GROUPNAME] 分享的物体已�被归还至它们的主人的库存里。
+�转让的转让到社团的物体已�被归还至它们先�主人处。
+��转让的转让到社团的物体已�删除。
                 </message>
         </notify>
         <notify name="UnOwnedObjectsReturned">
                 <message name="message">
-                        在这�土地上，�属于你的东东已�被归还至它们的主人处。
+                        在选择的地�上，*�*属于你的物体已�被归还至它们的主人处。
                 </message>
         </notify>
         <notify name="NotSafe">
                 <message name="message">
-                        这�土地有�险因素 (&apos;�安全&apos;).
-你在这里�能会�伤。如果你死了，你将会被闪电传�自你自己家的�置。
+                        这�土地打开了伤害选项 (‘�安全’).
+您在这里�能会�伤。如果您死了，您将会被瞬间移动至您的家�置。
                 </message>
         </notify>
         <notify name="NoFly">
                 <message name="message">
-                        在这�土地上起飞无效(&apos;�能飞行&apos;).
-你在这里�能飞行.
+                        这�土地关闭了飞行 (‘�能飞行’).
+您�能在这里飞行。
                 </message>
         </notify>
         <notify name="PushRestricted">
                 <message name="message">
-                        这�土地是&apos;�制11推动东东&apos;.
-你�能推动这里的任何东东，除�你是这里的主人.
+                        这�土地 ‘��许推动’。
+您�能推动这里的任何物体，除�您拥有这�土地。
+                </message>
+        </notify>
+        <notify name="NoVoice" tip="false" unique="true">
+                <message name="message">
+                        这�土地�用了语音。
                 </message>
         </notify>
         <notify name="NoBuild">
                 <message name="message">
-                        这�土地上无法建造(&apos;�能建造&apos;).
-你�能在此建造东东。.
+                        这�土地上关闭了建造 (‘�能建造’).
+您�能在此创建物体。
                 </message>
         </notify>
         <notify name="ScriptsStopped">
                 <message name="message">
-                        游�管�员暂时�止了该地区的脚本�行。
+                        管�员暂时�止了该地区的脚本�行。
                 </message>
         </notify>
         <notify name="ScriptsNotRunning">
                 <message name="message">
-                        这个区域内没有�行任何脚本文件。
+                        该地区没有�行任何脚本。
                 </message>
         </notify>
         <notify name="NoOutsideScripts">
                 <message name="message">
-                        在这�土地上外部脚本无效
-(&apos;没有外部脚本&apos;).
-除了属于土地主人的脚本，任何外部脚本在这里都无法�行.
+                        这�土地关闭了外部脚本 (‘没有外部脚本’)。
+除了属于土地主人的脚本，任何脚本在这里都�会�行。
                 </message>
         </notify>
         <notify name="ApproveURL">
                 <message name="message">
-                        这件东东想在自己表�展示如下网页:
+                        这件物体希望在它的表�显示网页:
 [URL]
                 </message>
                 <option name="LoadPage">
                         载入页�
                 </option>
                 <option name="Don&apos;tLoad">
-                        ��载入
+                        ��载入
                 </option>
         </notify>
         <notify name="ClaimPublicLand">
                 <message name="message">
-                        �能�求在你所在区域的公共土地上。
+                        �能对您所在的公共土地上申请产�。
                 </message>
         </notify>
         <notify name="ObjectGiveItem">
                 <message name="message">
-                        主人为[FIRST] [LAST]的东东[OBJECTFROMNAME] 赠与你了�为 &apos;[OBJECTNAME]&apos;的 [OBJECTTYPE].
+                        [FIRST] [LAST] 拥有的物体 [OBJECTFROMNAME] 赠与您了�为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
                 </message>
                 <option name="Keep">
-                        ��
+                        �留
                 </option>
                 <option name="Discard">
                         放弃
@@ -410,10 +438,10 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
         </notify>
         <notify name="ObjectGiveItemUnknownUser">
                 <message name="message">
-                        主人为(未知用户)的东东[OBJECTFROMNAME] 赠与你了�为 &apos;[OBJECTNAME]&apos;的 [OBJECTTYPE].
+                        (��未知用户) 拥有的物体 [OBJECTFROMNAME] 赠与您了�为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
                 </message>
                 <option name="Keep">
-                        ��
+                        �留
                 </option>
                 <option name="Discard">
                         放弃
@@ -424,10 +452,10 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
         </notify>
         <notify name="UserGiveItem">
                 <message name="message">
-                        [NAME]赠�给你了一件[OBJECTTYPE]�为&apos;[OBJECTNAME]&apos;.
+                        [NAME] 给了您一件�为 ‘[OBJECTNAME]’ 的[OBJECTTYPE]。
                 </message>
                 <option name="Keep">
-                        ��
+                        �留
                 </option>
                 <option name="Discard">
                         放弃
@@ -452,10 +480,13 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
                 <option name="Decline">
                         谢�
                 </option>
+                <option name="Info">
+                        信�
+                </option>
         </notify>
         <notify name="JoinGroupOfficerNoFee">
                 <message name="message">
-                        [NAME]已�邀请你加入他们的社团，并�为社团官员。
+                        [NAME]已�邀请您加入他们的社团，并�为社团官员。
 加入这个社团无需交纳任何费用。
  
 [MESSAGE]
@@ -466,11 +497,14 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
                 <option name="Decline">
                         谢�
                 </option>
+                <option name="Info">
+                        信�
+                </option>
         </notify>
         <notify name="JoinGroupMember">
                 <message name="message">
-                        [NAME]已�邀请你加入他们的社团�为会员。
-�加入这个社团, 你付�交纳注册费L$[COST]
+                        [NAME]已�邀请您加入他们的社团�为会员。
+�加入这个社团，您需�交纳注册费L$[COST]。
  
 [MESSAGE]
                 </message>
@@ -480,6 +514,9 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
                 <option name="Decline">
                         谢�
                 </option>
+                <option name="Info">
+                        信�
+                </option>
         </notify>
         <notify name="JoinGroupMemberNoFee">
                 <message name="message">
@@ -494,16 +531,18 @@ QuickTime(http://www.apple.com/quicktime)并安装QuickTime Player.
                 <option name="Decline">
                         谢�
                 </option>
+                <option name="Info">
+                        信�
+                </option>
         </notify>
         <notify name="OfferTeleport">
                 <message name="message">
-                        [NAME] has offered to teleport you
-to his or her location:
+                        [NAME] 邀请您瞬间移动到他/她的�置:
  
 [MESSAGE]
                 </message>
                 <option name="Teleport">
-                        闪电传�
+                        瞬间移动
                 </option>
                 <option name="Cancel">
                         �消
@@ -523,9 +562,23 @@ to his or her location:
         </notify>
         <notify name="OfferFriendship">
                 <message name="message">
-                        [NAME]正在��好�邀请.
- 
-你�以通过地图追踪彼此，并将收到好�在线状�更新。
+                        [NAME] 邀请您�为好�。
+
+[MESSAGE] 
+
+(默认状�下，你们将�以互相看到对方的在线状况。)
+                </message>
+                <option name="Accept">
+                        接�
+                </option>
+                <option name="Decline">
+                        谢�
+                </option>
+        </notify>
+        <notify name="OfferFriendshipNoMessage">
+                <message name="message">
+                        [NAME] 邀请您�为好�。
+(默认状�下，你们将�以互相看到对方的在线状况。)
                 </message>
                 <option name="Accept">
                         接�
@@ -536,17 +589,17 @@ to his or her location:
         </notify>
         <notify name="FriendshipAccepted">
                 <message name="message">
-                        [NAME]已�接�了你��的好�邀请.
+                        [NAME] 接�了您的好�邀请。
                 </message>
         </notify>
         <notify name="FriendshipDeclined">
                 <message name="message">
-                        [NAME]拒�了你��的好�邀请.
+                        [NAME] 谢�了您的好�邀请。
                 </message>
         </notify>
         <notify name="OfferCallingCard">
                 <message name="message">
-                        [FIRST] [LAST]正�供他们的通��。这将在你的库存中添加一个书签，这样你就�以快速的通过�时消��系�为居民。
+                        [FIRST] [LAST] �给你他的通��。这将在你的库存中添加一个书签，这样你就�以快速的通过�时消��系这�居民。
                 </message>
                 <option name="Accept">
                         接�
@@ -557,14 +610,14 @@ to his or her location:
         </notify>
         <notify name="RegionRestartMinutes">
                 <message name="message">
-                        区域将在 [MINUTES]分钟���。
-如果�留在此区域内将会退出游�.
+                        地区将在 [MINUTES]分钟��新�动。
+如果�留在此地区内，您将会被登出。
                 </message>
         </notify>
         <notify name="RegionRestartSeconds">
                 <message name="message">
-                        区域将在 [MINUTES]秒���。
-如果�留在此区域内将会退出游�.
+                        区域将在 [MINUTES]秒��新�动。
+如果�留在此地区内，您将会被登出。
                 </message>
         </notify>
         <notify name="LoadWebPage">
@@ -573,10 +626,10 @@ to his or her location:
  
 [MESSAGE]
  
-�自东东: [OBJECTNAME],主人 : [NAME]?
+�自物体: [OBJECTNAME], 主人: [NAME]?
                 </message>
                 <option name="Gotopage">
-                        回主页
+                        打开网页
                 </option>
                 <option name="Cancel">
                         �消
@@ -584,98 +637,142 @@ to his or her location:
         </notify>
         <notify name="FailedToLoadWearableUnnamed">
                 <message name="message">
-                        载入[TYPE]失败.
-请注明您从哪��主处购得此项物�。
+                        哎呀�
+您刚刚�试穿上的 [TYPE] 没能够加载。
+
+别紧张。
+�微等一下�试一次，看看事情会�会好一些。
                 </message>
         </notify>
         <notify name="FailedToLoadWearable">
                 <message name="message">
-                        载入�为[DESC]的[TYPE]失败.
-请注明你从哪��主处购得此项物�。
+                        哎呀�
+您刚刚�试穿上的�� [NAME] 的 [TYPE] 没能够加载。
+
+别紧张。
+�微等一下�试一次，看看事情会�会好一些。
                 </message>
         </notify>
         <notify name="FailedToFindWearableUnnamed">
                 <message name="message">
-                        在数�库中查找[TYPE]失败。
+                        在数�库中没能找到[TYPE]。
                 </message>
         </notify>
         <notify name="FailedToFindWearable">
                 <message name="message">
-                        在数�库中查找�为[DESC]的[TYPE]失败。
+                        在数�库中没能找到�为 [DESC] 的[TYPE]。
                 </message>
         </notify>
+        <!--a script want to... / 脚本想�... -->
         <notify name="ScriptTakeMoney">
                 <message name="message">
-                        Take Linden dollars (L$) from you
+                        从您那里�走林登�(L$)
                 </message>
         </notify>
         <notify name="ActOnControlInputs">
                 <message name="message">
-                        执行你输入的命令
+                        对您的控制输入�出�应
                 </message>
         </notify>
         <notify name="RemapControlInputs">
                 <message name="message">
-                        �新布置你的控制按钮
+                        �新布置你的控制按键
                 </message>
         </notify>
         <notify name="AnimateYourAvatar">
                 <message name="message">
-                        Animate your avatar
+                        在您的化身上播放动画
                 </message>
         </notify>
         <notify name="AttachToYourAvatar">
                 <message name="message">
-                        和你的化身绑定起�
+                        装备到您的身上
                 </message>
         </notify>
         <notify name="ReleaseOwnership">
                 <message name="message">
-                        放弃主人�利并�新�为百姓
+                        放弃主人�利并�为公众物�
                 </message>
         </notify>
         <notify name="LinkAndDelink">
                 <message name="message">
-                        建立或�消和该东东的连接
+                        建立或解除与其他物�的链接
                 </message>
         </notify>
         <notify name="AddAndRemoveJoints">
                 <message name="message">
-                        添加或移走两个东东之间的连接点
+                        添加或移除与其他物体之间的连接点
                 </message>
         </notify>
         <notify name="ChangePermissions">
                 <message name="message">
-                        更改此处的许��
+                        更改其许��利
                 </message>
         </notify>
         <notify name="TrackYourCamera">
                 <message name="message">
-                        追踪你的摄�头
+                        追踪您的视角
                 </message>
         </notify>
         <notify name="ControlYourCamera">
                 <message name="message">
-                        调节你的摄�头
+                        控制您的视角
                 </message>
         </notify>
         <notify name="ScriptQuestion">
                 <message name="message">
-                        &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+                        ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想�:
  
 [QUESTIONS]
-Is this OK?
+这样�以�?
                 </message>
                 <option name="Yes">
-                        是
+                        �许
                 </option>
                 <option name="No">
-                        �
+                        拒�
+                </option>
+                <option name="Mute">
+                        �蔽
+                </option>
+        </notify>
+        <notify name="ScriptQuestionCautionChatGranted" tip="false">
+                <message name="message">
+                        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, �于 [REGIONNAME] 地区  [REGIONPOS], 已被授予以下�利: [PERMISSIONS]。
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCautionChatDenied" tip="false">
+                <message name="message">
+                        ‘[OBJECTNAME]’, 主人为 ‘[OWNERNAME]’ 的物体, �于 [REGIONNAME] 地区  [REGIONPOS], 已被拒�以下�利: [PERMISSIONS]。
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCautionWarn" tip="false">
+                <message name="message">
+                        有物体希望您�许它从您的�户中��林登�(L$)。
+                </message>
+        </notify>
+        <notify caution="true" name="ScriptQuestionCaution" tip="false">
+                <message name="message">
+                        ‘[OBJECTNAME]’, 一件 ‘[NAME]’ 拥有的物体, 想�:
+ 
+[QUESTIONS]
+如果您�信任该物体和它的创建者，您应该拒�这请求。点击细节按钮察看详细资料。
+
+是�授予许�？
+                </message>
+                <option name="Grant">
+                        授予
+                </option>
+                <option default="true" name="Deny">
+                        谢�
+                </option>
+                <option name="Details">
+                        细节...
                 </option>
         </notify>
         <notify name="ScriptDialog">
                 <message name="message">
-                        [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+                        [FIRST] [LAST] 的 ‘[TITLE]’
 [MESSAGE]
                 </message>
                 <option name="Ignore">
@@ -684,7 +781,7 @@ Is this OK?
         </notify>
         <notify name="ScriptDialogGroup">
                 <message name="message">
-                        [GROUPNAME]&apos;s &apos;[TITLE]&apos;
+                        [GROUPNAME] 的 ‘[TITLE]’
 [MESSAGE]
                 </message>
                 <option name="Ignore">
@@ -693,86 +790,259 @@ Is this OK?
         </notify>
         <notify name="FirstBalanceIncrease">
                 <message name="message">
-                        You just received L$[AMOUNT].
-Objects and other users may give you L$.
-Your balance is shown in the
-upper-right corner of the screen.
+                        您刚收到了 L$[AMOUNT]。
+物体和其他用户�以�您支付L$。
+您的�户余�显示在�幕的�上角。
                 </message>
         </notify>
         <notify name="FirstBalanceDecrease">
                 <message name="message">
-                        你刚支付了 L$[AMOUNT].
-你的�户结余在�幕的�上角显示。
+                        您刚支付了 L$[AMOUNT]。
+您的�户余�显示在�幕的�上角。
                 </message>
         </notify>
         <notify name="FirstSit">
                 <message name="message">
-                        你正在��.
-使用方�键(或者AWSD)�改�视角.
-点击&apos;站起�&apos;按钮起身。
+                        您正在��。
+使用方�键 (或者AWSD) �改�视角。
+点击 ‘站起�’ 按钮起身。
                 </message>
         </notify>
         <notify name="FirstMap">
                 <message name="message">
-                        点击并拖拉地图以查看地图全景.
-�击该地�，�以闪电传�至该处.
-使用�边的控制键查找信�，并显示��的背景.
+                        点击并拖动地图以查看全景。
+�击以瞬间移动。
+使用�边的控件查找信�，并显示��的背景.
                 </message>
         </notify>
         <notify name="FirstBuild">
                 <message name="message">
-                        你�以在[SECOND_LIFE]中的�些区域内创建新东东。
-使用左上角的工具创建新东东，并按�Ctrl或者Alt键以迅速的更改工具。
-按Esc键�止创建东东。
+                        您�以在 [SECOND_LIFE] 的�些区域中创建新物体。
+使用左上角的工具建造，也试一试按下 Ctrl 或者 Alt 键快速地切�工具。
+按 Esc 键�止建造。
                 </message>
         </notify>
         <notify name="FirstLeftClickNoHit">
                 <message name="message">
-                        点击左键会和一些特殊东东相互干扰。 
-如果鼠标箭头指�手, 你�能被东东干扰。
-点击�键显示��。
+                        点击左键�以与特殊的物体互动。
+如果鼠标指针�为手型，您就�以与该物体互动。
+点击�键总是会显示您�以�的事的��。
                 </message>
         </notify>
         <notify name="FirstTeleport">
                 <message name="message">
-                        你刚刚进行了闪电传�. 
-
-你现在在离你目的地最近的信�结点上。你的目的地由一个红亮点标出。
+这个地区��许点对点瞬间移动，所以您被移动到了最近的瞬移枢纽上。
+您的目的地由一个高的信标标出。
+跟�红色箭头�往信标�置，或者点击箭头关闭信标。
                 </message>
         </notify>
         <notify name="FirstOverrideKeys">
                 <message name="message">
-                        Your movement keys are now being handled by an object.  
-Try the arrow keys or AWSD to see what they do.  
-Some objects (like guns) require you to go into mouselook  to use them. 
-Press &apos;M&apos; to do this.
+                        您的动作控制按键现在被一件物体控制。
+�试一下箭头键或 AWSD 看看它们的作用。
+�些物体 (例如枪) 需�您进入鼠标视角�能使用。 
+按 ‘M’ 键进入鼠标视角。
                 </message>
         </notify>
         <notify name="FirstAppearance">
                 <message name="message">
-                        你正在编辑你的外表。�旋转并放大查看，请使用箭头键。当你结�的时候，点击 &apos;全部�存&apos;按钮，��存你的外形并退出。你�以尽你喜欢的频�编辑你的外形，
+                        您正在编辑您的外观。�旋转或者缩放视角，使用箭头键。编辑完了的时候，点击  ‘全部�存’ 按钮，��存您的外观并退出。您在任何时候都�以��编辑外观。
                 </message>
         </notify>
         <notify name="FirstInventory">
                 <message name="message">
-                        这是你的库存, 包�东东, 注释�, �饰, 和其他你所拥有的东东.
-* �穿上衣�或者�用装备, 拖拽对象至身体.
-* �把对象带入游�世界, 拖拽对象至地�.
-* �阅读注释�, �击注释�.
+                        这是您的库存，是存放物体�记事��衣�和您拥有的其他东西的地方。
+* �穿上物体或装备文件夹，将它拖动到您自己身上。
+* �将物体带入世界中，将它拖动到地上。
+* �阅读记事�，�击它。
                 </message>
         </notify>
         <notify name="FirstSandbox">
                 <message name="message">
                         这是一�沙盒区域。
-在这里创建的东东将在其离开这里�被删除，且此区域将�[HOURS]�时抹去一次所创建东东，始于太平洋时间早上[TIME].
+在这里创建的物体在您离开��能会删除。沙盒区域会被定期清空，请�照�幕上方区域�称�边的信�。
  
 沙盒区域并�常�, 并会有特殊标识标出。
                 </message>
         </notify>
         <notify name="FirstFlexible">
                 <message name="message">
-                        这个东东是活动的. 
-活动的东东�能�具备物�特质，并一定是幻影，除�活动性选择�没有被选定。
+                        该物体是活动的。
+活动物体�能�时为物�的，并且必须为幻影，除��消其活动性。
+                </message>
+        </notify>
+        <notify name="FirstDebugMenus" tip="false">
+                <message name="message">
+                        您已�用了高级��。
+该��包�对调试第二人生的开�者有用的功能。
+�切�该��，在 Windows 中按 Ctrl-Alt-D. 在 Mac 中按 Cmd-Opt-Shift-D.
+                </message>
+        </notify>
+        <notify name="FirstSculptedPrim" tip="false">
+                <message name="message">
+                        您正在编辑 sculpted 元件。 
+Sculpted 元件需�特殊的�质�指定其形状。 
+您�以在库存库中找到示范 sculpted �质。
+                </message>
+        </notify>
+        <notify name="FirstMedia" tip="false">
+                <message name="message">
+                        您已�开始播放媒体。媒体�以在�数设置的音频和视频一�中设置为自动播放。请注�这对于您�信任的媒体站点�能会有安全�患。
+                </message>
+        </notify>
+        <notify name="MaxListSelectMessage" tip="true">
+                <message name="message">
+                        您从该列表中最多�能选择[MAX_SELECT] 个项目。
+                </message>
+        </notify>
+        <notify name="VoiceInviteP2P" tip="false" unique="true">
+                <message name="message">
+                        [NAME] 正在邀请您加入语音�天。
+点击接��加入对�或按谢��拒�邀请。点击�蔽��蔽该呼�者。
+                </message>
+                <option name="Accept">
+                        接�
+                </option>
+                <option name="Decline">
+                        谢�
+                </option>
+                <option name="Mute">
+                        �蔽
+                </option>
+        </notify>
+        <notify name="AutoUnmuteByIM" tip="false">
+                <message name="message">
+                        您� [FIRST] [LAST] ��了一��时消�，所以他已�被自动解除�蔽。
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney" tip="false">
+                <message name="message">
+                        您� [FIRST] [LAST] 付款，所以他已�被自动解除�蔽。
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory" tip="false">
+                <message name="message">
+                        您正给与 [FIRST] [LAST] 库存物�，所以他已�被自动解除�蔽。
+                </message>
+        </notify>
+        <notify name="VoiceInviteGroup" tip="false" unique="true">
+                <message name="message">
+                        [NAME] 加入了与 [GROUP] 社团的语音�天 . 
+点击接��加入对�或按谢��拒�邀请。点击�蔽��蔽该呼�者。
+                </message>
+                <option name="Accept">
+                        接�
+                </option>
+                <option name="Decline">
+                        谢�
+                </option>
+                <option name="Mute">
+                        �蔽
+                </option>
+        </notify>
+        <notify name="VoiceInviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] 加入了一个语音�天会议。 
+点击接��加入对�或按谢��拒�邀请。点击�蔽��蔽该呼�者。
+                </message>
+                <option name="Accept">
+                        接�
+                </option>
+                <option name="Decline">
+                        谢�
+                </option>
+                <option name="Mute">
+                        �蔽
+                </option>
+        </notify>
+        <notify name="InviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] 正在邀请您加入语音�天会议。
+点击接��加入对�或按谢��拒�邀请。点击�蔽��蔽该呼�者。
+                </message>
+                <option name="Accept">
+                        接�
+                </option>
+                <option name="Decline">
+                        谢�
+                </option>
+                <option name="Mute">
+                        �蔽
+                </option>
+        </notify>
+        <notify name="VoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        您�试加入的语音呼�， [VOICE_CHANNEL_NAME], 已�达到最大�员数。请�候�试。
+                </message>
+        </notify>
+        <notify name="ProximalVoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        我们很抱歉。该区域已�达到语音交�的最大�员数。请�试在其他区域使用语音�天。
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnected" tip="true" unique="true">
+                <message name="message">
+                        您已�从 [VOICE_CHANNEL_NAME] 断开连接。 您现在将会被�新连接到空间语音�天。
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnectedP2P" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] 已�结�呼�。您现在将会被�新连接到空间语音�天。
+                </message>
+        </notify>
+        <notify name="P2PCallDeclined" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] 谢�了您的呼�。您现在将会被�新连接到空间语音�天。
+                </message>
+        </notify>
+        <notify name="P2PCallNoAnswer" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] 暂时�能接�您的呼�。您现在将会被�新连接到空间语音�天。
+                </message>
+        </notify>
+        <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
+                <message name="message">
+                        连接到 [VOICE_CHANNEL_NAME] 失败，请�候�试。您现在将会被�新连接到空间语音�天。
+                </message>
+        </notify>
+        <notify duration="10" name="VoiceLoginRetry" tip="true" unique="true">
+                <message name="message">
+                        我们正在为您创建语音�天频�。最多会需�一分钟。
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not a group member" tip="true">
+                <message name="message">
+                        无法进入地�，您�是�适的社团的会员。
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: banned" tip="true">
+                <message name="message">
+                        无法进入地�，您已被�止进入。
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not on access list" tip="true">
+                <message name="message">
+                        无法进入地�，您�在�许��上。
+                </message>
+        </notify>
+        <notify name="VoiceNotAllowed" tip="true" unique="true">
+                <message name="message">
+                        您没有连接到 [VOICE_CHANNEL_NAME] 的语音�天的许�。
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError" tip="true" unique="true">
+                <message name="message">
+                        �试连接到 [VOICE_CHANNEL_NAME] 时�生错误。 请�候�试。
+                </message>
+        </notify>
+        <notify caution="true" duration="10" name="ServerVersionChanged" tip="true">
+                <message name="message">
+                        您刚进入的区域正在�行��的模拟器版本。点击该消�察看详细资料。
+                </message>
+        </notify>
+        <notify caution="true" name="UnableToOpenCommandURL" tip="true">
+                <message name="message">
+                        您点击的URL�能从该�览器中打开。
                 </message>
         </notify>
 </notifications>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
new file mode 100644
index 0000000..f2ec305
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<panel 

+         label="音�"

+     name="Media panel">

+        <check_box 

+             label="�音" 

+                 name="disable audio" />

+

+        <slider name="System Volume" 

+             label="总体" />

+        <slider name="Music Volume" 

+             label="音�" />

+        <slider 

+             name="Media Volume" 

+             label="媒体" />

+        <slider 

+             name="Voice Volume" 

+             label="语音" />

+

+        <slider 

+                 name="SFX Volume" 

+             label="音效" />

+        <slider 

+                 name="Wind Volume" 

+             label="环境"  />

+        <slider name="UI Volume"

+             label="界�" />

+                 

+</panel>

+<!--Translated by Geneko Nemeth for Second Life 1.19.0 (79185)-->

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml b/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml
new file mode 100644
index 0000000..457e63f
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel

+         name="device_settings">

+        <text

+                 name="Audio Devices">

+                音频设备

+        </text>

+

+                <text

+                 name="Input device (microphone):">

+                        输入设备( 麦克风) :

+                </text>

+

+                <text

+                 name="Output device (speakers):">

+                        输出设备 (扬声器):

+                </text>

+                <combo_box

+                 allow_text_entry="false"

+                 max_chars="128"

+                 name="voice_output_device" />

+                 

+        <text

+                 name="Input level:">

+                输入音�

+        </text>

+

+                <text_editor

+                 name="voice_intro_text1">调节滑��控制你说的�的音�。  �测试输入音�的�，��对�你的麦克风说�就�以了。</text_editor>

+

+        <volume_slider

+                 name="mic_volume_slider"

+                 tool_tip="用这个滑�调节音�。" />

+

+        <text

+                 name="wait_text">

+                请�候

+        </text>

+        

+

+        <text

+                 name="default_text" >"默认"</text>

+

+        </panel>

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
index 1abfa1f..8f8d8d7 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Panel Avatar">
         <tab_container name="tab">
-                <panel label="2nd Life" name="2nd Life">
+                <panel label="第二人生" name="2nd Life">
                         <text name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
+[AGEVERIFICATION]
                         </text>
                         <text name="AcctTypeResident">
                                 å±…æ°‘
                         </text>
                         <text name="AcctTypeTrial">
-                                试用
+                                试用者
                         </text>
                         <text name="AcctTypeCharterMember">
                                 宪章制定委员会�员
@@ -19,38 +20,51 @@
                                 林登实验室雇员
                         </text>
                         <text name="PaymentInfoUsed">
-                                使用的支付信�
+                                支付信�已使用
                         </text>
                         <text name="PaymentInfoOnFile">
-                                文件中的支付信�
+                                支付信�在案
                         </text>
                         <text name="NoPaymentInfoOnFile">
-                                文件中没有新用户的支付信�
+                                无支付信�
+                        </text>
+                        <text
+                                 name="AgeVerified" >
+                                年龄已验�
+                        </text>
+                        <text
+                                 name="NotAgeVerified" >
+                                年龄未验�
                         </text>
                         <text name="Name:">
                                 �字:
                         </text>
                         <text name="online_yes">
-                                是�在线: 是
+                                当�在线
                         </text>
                         <text name="online_no">
-                                是�在线: �
+                                �在线
                         </text>
                         <text name="online_unknown">
-                                是�在线: 未知
+                                在线状�未知
                         </text>
                         <text name="label">
-                                天生的:
+                                出生:
                         </text>
                         <text name="label2">
                                 账户:
                         </text>
                         <text name="partner_label"
-                             tool_tip="第二人生�作者. �获�更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
+                             tool_tip="第二人生�档。�获�更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
                                 �档:
                         </text>
+                        <button
+                                 label="i"
+                                 label_selected="i"
+                                 name="partner_info"
+                                 tool_tip="点击打开�档的档案" />
                         <line_editor name="partner_edit"
-                             tool_tip="第二人生�作者. �获�更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
+                             tool_tip="第二人生�档。�获�更多关于如何设置此项功能， 请登陆www.secondlife.com/partner">
                                 [FIRST] [LAST]
                         </line_editor>
                         <text name="Photo:">
@@ -70,47 +84,63 @@
                                 (500 个字)
                         </text>
                         <text name="Give item:">
-                                �供项目:
+                                给与物�:
                         </text>
                         <text name="Give inventory"
-                             tool_tip="将库存内的物�放于此地并给与此人。">
-                                放置目录内容于此.
+                             tool_tip="�把库存中的物体赠与这个人，将其拖动到这里。">
+                                放置库存物�于此。
                         </text>
-                        <check_box label="在网上公布" name="allow_publish"
-                             tool_tip="将你个人的简介�布到网上." />
+                        <check_box label="在�索结果中显示" name="allow_publish"
+                             tool_tip="在�索中显示�外信�，例如�述和照片。" />
                         <button label="?" label_selected="?" name="?" />
+                        <!-- <button label="在地图中显示" label_selected="在地图中显示"
+                             name="Show on Map" /> -->
                         <button label="在地图中显示" label_selected="在地图中显示"
-                             name="Show on Map" />
-                        <button label="�供闪电传�..." label_selected="�供闪电传�..."
+                             name="Find on Map" />
+                                 
+                        <button label="邀请瞬间移动..." label_selected="邀请瞬间移动..."
                              name="Offer Teleport..." />
-                        <button label="比率..." label_selected="比率..." name="Rate..." />
+                        <button
+                                 label="添加为好�..."
+                                 label_selected="添加为好�..."
+                                 name="Add Friend..." />
+
+                        <!-- <button label="评分..." label_selected="评分..." name="Rate..." /> -->
                         <button label="付款..." label_selected="付款..." name="Pay..." />
                         <button label="�时消�..." label_selected="�时消�..."
                              name="Instant Message..." />
                         <button label="�蔽" label_selected="�蔽" name="Mute" />
                 </panel>
-                <panel label="网络" name="WebProfile">
-                        <button label="家" label_selected="家" name="home" />
-                        <button label="Load" label_selected="Load" name="load"
-                             tool_tip="Load this profile page with embedded web browser." />
-                        <button label="Open..." label_selected="Open..." name="open"
-                             tool_tip="Open this profile page in your default external web browser." />
+                <panel label="Web" name="WebProfile">
+                        <line_editor
+                                 is_unicode="false"
+                                 name="url_edit" />
+                        <flyout_button
+                                 label="加载"
+                                 label_selected="加载"
+                                 name="load"
+                                 tool_tip="用内部�览器打开这个档案页�。">
+                                <flyout_button_item
+                                        value="open">
+                                        在外部�览器中打开</flyout_button_item>
+                                <flyout_button_item
+                                        value="home">返回原�页�</flyout_button_item>
+                        </flyout_button>
                         <button label="?" label_selected="?" name="web_profile_help" />
-                        <check_box label="Automatically load web profiles" name="auto_load"
-                             tool_tip="Automatically load ALL profile webpages without asking first." />
+                        <check_box label="自动加载网络档案" name="auto_load"
+                             tool_tip="�询问就自动加载 *所有* 网络档案。" />
                         <text name="status_text">
-                                完�
                         </text>
                 </panel>
-                <panel label="Interests" name="Interests">
+                <panel label="兴趣" name="Interests">
                         <text name="I Want To:">
                                 我想�:
                         </text>
                         <check_box label="建造" name="chk0" />
-                        <check_box label="开�" name="chk1" />
-                        <check_box label="相会" name="chk2" />
+                        <check_box label="探索" name="chk1" />
+                        <check_box label="�会" name="chk2" />
                         <check_box label="�雇" name="chk6" />
-                        <check_box label="社团&quot;" name="chk3" />
+                        <check_box label="组团" name="chk3" />
                         <check_box label="è´­ä¹°" name="chk4" />
                         <check_box label="出售" name="chk5" />
                         <check_box label="雇佣" name="chk7" />
@@ -119,29 +149,29 @@
                         </text>
                         <check_box label="�质" name="schk0" />
                         <check_box label="建筑" name="schk1" />
-                        <check_box label="事件计划" name="schk2" />
+                        <check_box label="计划事件" name="schk2" />
                         <check_box label="建模" name="schk3" />
                         <check_box label="编辑脚本" name="schk4" />
-                        <check_box label="习惯的特性" name="schk5" />
+                        <check_box label="个性化人物" name="schk5" />
                         <text name="Languages:">
-                                Languages:
+                                语言:
                         </text>
                 </panel>
-                <panel label="Picks" name="Picks">
+                <panel label="收�" name="Picks">
                         <text name="Tell everyone about your favorite places in Second Life.">
-                                告诉�个人你在第二人生中最喜欢的地点
+                                告诉大家你在第二人生中最喜欢的地点。
                         </text>
-                        <button label="æ–°çš„..." label_selected="æ–°çš„..." name="New..." />
+                        <button label="新建..." label_selected="新建..." name="New..." />
                         <button label="删除..." label_selected="删除..." name="Delete..." />
                 </panel>
-                <panel label="分类的" name="Classified">
+                <panel label="分类广告" name="Classified">
                         <text name="Place an ad in Second Life&apos;s classified listings.">
                                 在第二人生的分类�中刊登广告。
                         </text>
-                        <button label="æ–°çš„..." label_selected="æ–°çš„..." name="New..." />
+                        <button label="新建..." label_selected="新建..." name="New..." />
                         <button label="删除..." label_selected="删除..." name="Delete..." />
                 </panel>
-                <panel label="1st Life" name="1st Life">
+                <panel label="第一人生" name="1st Life">
                         <text name="Photo:">
                                 照片：
                         </text>
@@ -153,10 +183,10 @@
                                 (250个字)
                         </text>
                 </panel>
-                <panel label="My Notes" name="My Notes">
+                <panel label="我的备注" name="My Notes">
                         <text name="label">
-                                使用这�空间�记录你关于这个人的笔迹。 继续追踪
-交易过程, �作的项目,等等。�有你�以看�这些笔记。
+                                使用这�空间�记录你关于这个人的笔记。 追踪交易
+进展，�作的项目，等等。�有你�以看�这些笔记。
 你观察的人看��，其他人也看��。
                         </text>
                 </panel>
@@ -165,29 +195,30 @@
         <button label="�消" label_selected="�消" name="Cancel" />
         <button label="踢人" label_selected="踢人" name="Kick" />
         <button label="�定" label_selected="�定" name="Freeze"
-             tool_tip="�止此居民的现有动作并与其交谈." />
-        <button label="解�定" label_selected="解�定" name="Unfreeze"
+             tool_tip="�止此居民的现有动作和对�。" />
+        <button label="解�" label_selected="解�" name="Unfreeze"
              tool_tip="解除冻结的居民。" />
         <button label="CSR" label_selected="CSR" name="csr_btn"
-             tool_tip="对此为居民开�顾客�务工具。" />
+             tool_tip="对此�居民开�顾客�务工具。" />
         <text name="ShowOnMapNonFriend">
-                在地图上显示的�置.
+                在地图上显示�置。
 由于你和它们之间没有�谊关系，所以刚�的�作无效。
         </text>
         <text name="ShowOnMapFriendOffline">
-                在地图上显示的�置.
+                在地图上显示�置。
 由于对方�在线，刚�的�作无效。
         </text>
         <text name="ShowOnMapFriendOnline">
-                在地图上显示的�置.
+                在地图上显示�置。
         </text>
         <text name="TeleportGod">
-                加强闪电传�至你所在�置的效果.
+                强制瞬间移动到你的�置。
         </text>
         <text name="TeleportPrelude">
-                �供一个闪电传�至你所在的�置。但当你离开方�岛时，此项功能��用。
+                邀请瞬间移动到你所在的�置。但当你离开方�岛时，此项功能��用。
         </text>
         <text name="TeleportNormal">
-                �供一个闪电传�至你所在的�置。
+                邀请瞬间移动到你所在的�置。
         </text>
 </panel>
+<!--Translated for Second Life 1.19.0 (80044)-->
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
index b9d6407..3e35524 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_classified.xml
@@ -3,22 +3,28 @@
         <line_editor name="given_name_editor"
              tool_tip="�字必须以字�或数字开始，��用标点。" />
         <line_editor name="location_editor"
-             tool_tip="设置这�分类广告相对于你所在�置的�置。" />
-        <button label="调节�置" name="set_location_btn" />
-        <button label="闪电传�" name="classified_teleport_btn" />
-        <button label="地图" name="classified_map_btn" />
+             tool_tip="设置分类广告的�置到你当�的�置。" />
+        <button label="调节�置" name="set_location_btn" width="80" left="10"/>
+        <button label="瞬间移动" name="classified_teleport_btn" width="80" left_delta="90"/>
+        <button label="在地图中显示" name="classified_map_btn" width="110" left_delta="90"/>
+
         <combo_box label="" name="classified_category_combo" />
         <check_box label="�人" name="classified_mature_check" />
         <text name="classified_info_text"
              tool_tip="你选择为你的广告付费越多, 您的广告在广告�里出现的�置就会越高.">
-                广告�置: 暂时�能�布
+                广告�布: 还没有�布
         </text>
         <text name="click_through_text" tool_tip="分类广告�布�的点击数.">
-                Clicks:
+                点击数:
         </text>
-        <button label="公布..." name="classified_update_btn" />
+        <button label="�布..." name="classified_update_btn" />
         <check_box label="�周自动更新" name="auto_renew_check" />
         <text name="ad_placed_paid">
-                Ad placed: [DATE], Paid L$[AMT] for listing.
-        </text>
+                广告�布: [DATE]，为此付出了 L$[AMT]。
+        </text> 
+        <text
+                 name="update_txt" >æ›´æ–°</text>
+        <text
+                 name="publish_txt" >�布...</text>
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml b/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
index d769eaf..dfd490e 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_avatar_pick.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Pick" title="拣起">
-        <button label="调节�置" name="set_location_btn" />
-        <button label="闪电传�" name="pick_teleport_btn" />
-        <button label="在地图中显示" name="pick_map_btn" />
+<panel name="Pick" title="收�">
+        <button label="瞬间移动" name="pick_teleport_btn" width="80" left="10"/>
+        <button label="在地图中显示" name="pick_map_btn" width="110" left="100"/>
+        <button label="调节�置" name="set_location_btn" width="80" left="220"/>
         <text name="sort_order_text">
                 �类:
         </text>
-        <check_box label="Enabled" name="enabled_check" />
+        <check_box label="�用" name="enabled_check" />
 </panel>
+<!--Translated for Second Life 1.19.0 (80044)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
index 8bf05df..542a6b9 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_chat_bar.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="chat_bar">
+        <button label="Local Chat" name="历�"
+             tool_tip="点击这里看周围的人刚�说了些什么" />
         <button label="历�" label_selected="历�" name="History" />
-        <line_editor name="Chat Editor" tool_tip="按Enter�输入语音，Ctrl-Enter ��声" />
-        <button label="说" label_selected="说" name="Say" />
-        <button label="咆哮" label_selected="咆哮" name="Shout" />
+        <line_editor label="点击这里开始�天。" name="Chat Editor"
+             tool_tip="按 Enter ��天，Ctrl-Enter �喊�" />
+        <flyout_button label="说" name="Say" tool_tip="(回车)" >
+                <flyout_button_item name="say_item">说</flyout_button_item>
+                <flyout_button_item name="shout_item">喊�</flyout_button_item>
+                <flyout_button_item name="whisper_item">�声说</flyout_button_item>
+        </flyout_button>
         <combo_box label="动作" name="Gesture">
                 <combo_item name="Gestures">
                         动作
                 </combo_item>
         </combo_box>
+        <string name="gesture_label">
+                动作
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
index c03a7cc..7237948 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_classified.xml
@@ -3,9 +3,9 @@
         <line_editor name="given_name_editor"
              tool_tip="�字必须以字�或数字开始，��用标点。" />
         <line_editor name="location_editor"
-             tool_tip="设置这�分类广告相对于你所在�置的�置。" />
-        <button label="调节" name="set_location_btn" />
-        <button label="闪电传�" name="classified_teleport_btn" />
+             tool_tip="设置分类广告的�置到你当�的�置。" />
+        <button label="调节�置" name="set_location_btn" />
+        <button label="瞬间移动" name="classified_teleport_btn" />
         <button label="在地图中显示" name="classified_map_btn" />
         <button label="档案" name="classified_profile_btn" />
         <check_box label="�人" name="classified_mature_check" />
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_event.xml b/linden/indra/newview/skins/default/xui/zh/panel_event.xml
index 0d0f836..3d7e65e 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_event.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_event.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Event" title="事件">
         <text name="event_name_label">
-                �字:
+                �称:
         </text>
         <text name="event_name">
                 (æ— )
         </text>
         <text name="event_category_label">
-                类型：
+                类别：
         </text>
         <text name="event_category">
                 (æ— )
@@ -18,6 +18,16 @@
         <text name="event_mature">
                 (未知)
         </text>
+        <text
+                 name="event_mature_yes"
+                 visible="false">
+                是
+        </text>
+        <text
+                 name="event_mature_no"
+                 visible="false">
+                �
+        </text>
         <text name="event_date_label">
                 日期:
         </text>
@@ -25,13 +35,13 @@
                 (æ— )
         </text>
         <text name="event_duration_label">
-                活动�续时间:
+                �续时间:
         </text>
         <text name="event_duration">
                 (æ— )
         </text>
         <text name="event_runby_label">
-                �行为:
+                组织者:
         </text>
         <text name="event_runby">
                 (æ— )
@@ -51,8 +61,14 @@
         <text name="event_desc_label">
                 �述:
         </text>
-        <button label="闪电传�" name="teleport_btn" />
+        <button label="瞬间移动" name="teleport_btn" />
         <button label="在地图中显示" name="map_btn" />
-        <button label="通报" name="notify_btn" />
-        <button label="创造事件..." name="create_event_btn" />
+        <button label="�醒" name="notify_btn" />
+        <button label="创建事件..." name="create_event_btn" />
+        <string name="notify">
+                �醒
+        </string>
+        <string name="dont_notify">
+                ���醒
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_friends.xml b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
new file mode 100644
index 0000000..74d29a4
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_friends.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="friends">

+        <scroll_list name="friend_list"

+             tool_tip="点击时按� shift 或 control 键�选择多个好�">

+                <column name="icon_online_status" tool_tip="在线状�" />

+                <column label="�字" name="friend_name" tool_tip="�称" />

+                <column name="icon_visible_online" tool_tip="好��以看�你是�在线" />

+                <column name="icon_visible_map" tool_tip="好��以在地图上找到你" />

+                <column name="icon_edit_mine" tool_tip="好��以编辑你的物体" />

+                <column name="icon_edit_theirs" tool_tip="你�以编辑这�好�的物体" />

+        </scroll_list>

+        <button label="�天/呼�" name="im_btn" tool_tip="打开�时通信会�" />

+        <button label="档案" name="profile_btn"

+             tool_tip="显示图片�社团和其他信�" />

+        <button label="瞬间移动..." name="offer_teleport_btn"

+             tool_tip="邀请该好�瞬间移动到你的当��置" />

+        <button label="付款..." name="pay_btn" tool_tip="给这�好�林登� (L$)" />

+        <button label="移除..." name="remove_btn"

+             tool_tip="将这个人从你的好�列表中去除" />

+        <button label="添加..." name="add_btn"

+             tool_tip="邀请其他居民�为你的好�" />

+</panel>

+<!--Translated for Second Life 1.19.0 (79185)-->

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group.xml b/linden/indra/newview/skins/default/xui/zh/panel_group.xml
index 1c296a4..6f68e21 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="GroupInfo" title="社团信�">
         <text name="default_needs_apply_text">
-                在目�的亚桌�上有没有应用的更改。
+                在目�的标签页上有还没有应用的更改。
         </text>
         <text name="want_apply_text">
-                你是�愿�现在就应用这些更改?
+                您是�愿�现在就应用这些更改?
         </text>
         <button label="应用" label_selected="应用" name="btn_apply" />
         <button label="�消" label_selected="�消" name="btn_cancel" />
         <button label="OK" label_selected="OK" name="btn_ok" />
-        <button label="从�务器处更新" label_selected="从�务器处更新"
+        <button label="刷新" label_selected="刷新"
              name="btn_refresh" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
index 805c232..b0dd9cf 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="GroupInfoFinder" title="社团信�查找器">
         <text name="default_needs_apply_text">
-                在目�的亚桌�上有没有应用的更改。
+                在目�的标签页上有还没有应用的更改。
         </text>
         <text name="want_apply_text">
-                你是�愿�现在就应用这些更改?
+                您是�愿�现在就应用这些更改?
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
index 107b854..72ac8b2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="General" name="general_tab">
+<panel label="一般" name="general_tab">
         <text name="help_text">
-                普通桌�包括关于社团的一般信�，主人和�视的会员的��，一般社团�好和会员选项。
+一般标签页包�关于社团的一般信�，社团拥有者和��会员的��，一般的社团�好设定和会员选项。
 
-用你的鼠标�留在选项上获�更多帮助。
+鼠标�留在选项上获�更多帮助。
         </text>
+        <string
+                 name="group_info_unchanged">
+                社团一般信�已�改�。
+        </string>
         <button label="?" label_selected="?" name="help_button" />
         <line_editor name="group_name_editor">
                 在此键入你的新社团�称
@@ -13,10 +17,10 @@
                 在此键入你的新社团�称
         </text>
         <text name="prepend_founded_by">
-                创建由
+                创始人
         </text>
         <text name="founder_name">
-                (等待)
+                (等待中)
         </text>
         <text name="group_charter_label">
                 社团宪章
@@ -26,17 +30,17 @@
                 社团宪章
         </text_editor>
         <button label="加入(L$0)" label_selected="加入(L$0)" name="join_button" />
-        <button label="详细察看" label_selected="详细察看" name="info_button" />
-        <text>
-                主人和��的会员
+        <button label="详细视图" label_selected="详细察看" name="info_button" />
+        <text name="text_owners_and_visible_members">
+                拥有者和��的会员
         </text>
-        <text>
-                (主人的�字以大写字�标注)
+        <text name="text_owners_are_shown_in_bold">
+                (拥有者的�字以粗体标注)
         </text>
         <name_list name="visible_members">
-                <column label="Member Name" name="name" />
-                <column label="Title" name="title" />
-                <column label="Last Login" name="online" />
+                <column label="会员�称" name="name" />
+                <column label="头衔" name="title" />
+                <column label="最�登入" name="online" />
         </name_list>
         <text name="incomplete_member_data_str">
                 �新获�会员信�
@@ -44,31 +48,61 @@
         <text name="confirm_group_create_str">
                 创建这个社团将花费L$100. 
 你真的，真的，真----的----确定�花费L$100�创建这个社团�?
+请注�如果没有别人在48�时内加入该社团，它将会被解散，并且这个社团�字将�将�能使用。
         </text>
-        <text>
-                社团�好
+        <text name="text_group_preferences">
+                社团�好设定
         </text>
         <panel name="preferences_container">
-                <check_box label="在社团��中显示" name="show_in_group_list"
-                     tool_tip="Sets whether this group shows up in the Search Groups   window and in member profiles." />
-                <check_box label="在网上公布" name="publish_on_web"
-                     tool_tip="设定是�将此社团的信��布到网络上" />
-                <check_box label="打开注册" name="open_enrollement"
-                     tool_tip="Sets whether this group allows new members to join   without being invited." />
+                <check_box
+                         label="在�索中显示"
+                         name="show_in_group_list"
+                         tool_tip="让别人在�索结果中看到这个社团。" />
+                <check_box label="公开注册" name="open_enrollement"
+                     tool_tip="设置该社团是��许新会员加入而�需�被邀请。" />
                 <check_box label="注册费用: L$" name="check_enrollment_fee"
-                     tool_tip="设定是�收将�社团入会费." />
+                     tool_tip="设定是�收将�社团入会费。" />
                 <spinner name="spin_enrollment_fee"
-                     tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked." />
+                     tool_tip="如果选择了注册费用的�，新会员加入社团时必须付出这笔费用。" />
                 <check_box label="�人" name="mature"
                      tool_tip="设定你所在社团的信�是�为�人内容" />
+                <combo_box
+                         allow_text_entry="false"
+                         max_chars="20"
+                         name="group_mature_check"
+                         tool_tip="设定你所在社团的信�是�为�人内容">
+                        <combo_item
+                                 name="select_mature"
+                                 value="Select">
+                        - 选择分级 -
+                        </combo_item>
+                        <combo_item
+                                 name="mature"
+                                 value="Mature">
+                        �人内容
+                        </combo_item>
+                        <combo_item
+                                 name="not_mature"
+                                 value="Not Mature">
+                        ��人内容
+                        </combo_item>
+                </combo_box>
                 <panel name="title_container">
                         <text name="active_title_label">
                                 我的头衔
                         </text>
                         <combo_box name="active_title"
-                             tool_tip="Sets the title that appears in your avatar&apos;s name tag   when this group is active." />
+                             tool_tip="设置当该社团激活时，在化身姓�标签中显示的头衔。" />
                 </panel>
                 <check_box label="接�社团通知" name="receive_notices"
-                     tool_tip="Sets whether you want to receive Notices from this group.   Uncheck this box if this group is spamming you." />
+                     tool_tip="设置您是�想�从该社团接�通知。如果这个社团�您乱�垃圾信�，那就�消选择这项。" />
+                <check_box
+                         label="在我的档案中列出该社团"
+                         name="list_groups_in_profile"
+                         tool_tip="设置您是�想�在档案中列出该社团" />
         </panel>
+        <string
+                 name="incomplete_member_data_str">
+                获�团员信�中
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
index 528281f..06b7a0c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Invite a Member" name="invite_panel">
+<panel label="邀请会员" name="invite_panel">
         <text>
-                你�以选择多个居民，邀请他们�如你的社团。点击‘打开任务选择器’开始邀请。
+                您�以选择多个居民，邀请他们加入您的社团。点击 ‘打开人物选择器’ 开始邀请。
         </text>
-        <button label="打开个人选举人" name="add_button" tool_tip="" />
+        <button label="打开人物选择器" name="add_button" tool_tip="" />
         <name_list name="invitee_list"
-             tool_tip="Hold the Ctrl key and click resident names  to multi-select." />
+             tool_tip="按�Ctrl键然�点击居民�字�选择多个项目。" />
         <button label="从��中移除所选项" name="remove_button"
-             tool_tip="将此�户从你的邀请�中列表中清除." />
+             tool_tip="将此居民从您的邀请列表中清除。" />
         <text>
                 选择哪个角色分�给他们：
         </text>
         <combo_box name="role_name"
-             tool_tip="Choose from the list of Roles you  are allowed to assign members to." />
-        <button label="��邀请函" name="ok_button" />
+             tool_tip="从这个列表中选择你�以为会员分�的角色。" />
+        <button label="��邀请" name="ok_button" />
         <button label="�消" name="cancel_button" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
index 85ec812..439252a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Land &amp; L$" name="land_money_tab">
+<panel label="土地和 L$" name="land_money_tab">
         <text name="help_text">
-                由社团所拥有的土地已�被列出了其所作贡献的细节。如果在使用中的总的土地�于或者等于总土地贡献，系统会�出警告。在计划，细节和销售桌�中会�供关于社团资产情况的信�。
+                以下列出的是社团所�有的土地以�贡献细节。如果“使用中总的土地��于或者等于“总土地贡献�，系统会�出警告。在计划，细节和销售标签页中会�供关于社团资产情况的信�。
         </text>
         <button label="?" name="help_button" />
         <text name="cant_view_group_land_text">
-                你没有查看这个社团所拥有土地的许��。
+                你没有查看这个社团所拥有土地的��。
         </text>
         <text name="cant_view_group_accounting_text">
-                你没有查看这个社团账户信�的许��。
+                你没有查看这个社团账户信�的��。
         </text>
         <text name="group_land_heading">
-                社团所有土地
+                社团所�有土地
         </text>
         <scroll_list name="group_parcel_list">
-                <column label="Parcel Name" name="name" />
-                <column label="Region" name="location" />
-                <column label="Area" name="area" />
+                <column label="地��称" name="name" />
+                <column label="区域" name="location" />
+                <column label="�积" name="area" />
                 <column label="" name="hidden" />
         </scroll_list>
         <button label="在地图中显示" label_selected="在地图中显示"
@@ -25,19 +25,19 @@
                 总贡献�:
         </text>
         <text name="total_contributed_land_value">
-                0 平方米
+                [AREA] 平方米
         </text>
         <text name="total_land_in_use_label">
-                使用中的全部土地:
+                使用中的土地�积:
         </text>
         <text name="total_land_in_use_value">
-                0 平方米
+                [AREA] 平方米
         </text>
         <text name="land_available_label">
-                �售土地:
+                �用土地:
         </text>
         <text name="land_available_value">
-                0 平方米
+                [AREA] 平方米
         </text>
         <text name="your_contribution_label">
                 你的贡献:
@@ -46,7 +46,7 @@
                 平方米
         </text>
         <text name="your_contribution_max_value">
-                (等待)
+                平方米 (最多[AMOUNT] )
         </text>
         <text name="group_over_limit_text">
                 社团�员必须贡献更多的土地�度，�支�土地的使用。
@@ -55,27 +55,27 @@
                 社团资产 L$
         </text>
         <tab_container name="group_money_tab_container">
-                <panel label="Planning" name="group_money_planning_tab">
+                <panel label="计划" name="group_money_planning_tab">
                         <text_editor name="group_money_planning_text">
                                 计算中...
                         </text_editor>
                 </panel>
-                <panel label="Details" name="group_money_details_tab">
+                <panel label="细节" name="group_money_details_tab">
                         <text_editor name="group_money_details_text">
                                 计算中...
                         </text_editor>
                         <button label="&lt;较早" label_selected="&lt;较早" name="earlier_details_button"
                              tool_tip="时间返回" />
-                        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_details_button"
+                        <button label="较近 &gt;" label_selected="较近 &gt;" name="later_details_button"
                              tool_tip="时间�进" />
                 </panel>
-                <panel label="Sales" name="group_money_sales_tab">
+                <panel label="销售" name="group_money_sales_tab">
                         <text_editor name="group_money_sales_text">
                                 计算中...
                         </text_editor>
                         <button label="&lt;较早" label_selected="&lt;较早" name="earlier_sales_button"
                              tool_tip="时间返回" />
-                        <button label="延迟 &gt;" label_selected="延迟 &gt;" name="later_sales_button"
+                        <button label="较近 &gt;" label_selected="较近 &gt;" name="later_sales_button"
                              tool_tip="时间�进" />
                 </panel>
         </tab_container>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
index 18d62aa..099c34e 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="通知" name="notices_tab">
         <text name="help_text">
-                通知是一个�组之间快速交��系的方法，通知通过广播消�和���选择的粘贴性�目，��给用户。通知仅会到达社团内部中被授予接�信�能力的角色中的会员那里。你�以在一般控制桌�上关掉通知。
+                通知是社团中快速交��系的方法。通知会�社团中�布一�消�，并且�以附加一�物�。通知仅会到达社团中被授予具有接�通知能力角色的会员那里。你�以在一般控制桌�上关掉通知。
         </text>
         <text name="no_notices_text">
-                这里没有过去的通知.
+                这里没有过去的通知。
         </text>
         <button label="?" label_selected="?" name="help_button" />
         <text name="lbl">
-                社团通知归档
+                社团通知存档
         </text>
         <text name="lbl2">
-                通知�会被�留14日。点击下�你想查看的通知。如果新的通知已被接�到，请点击“刷新���按钮。
+                通知�会被�留 14 日。点击下�你想查看的通知。选择“刷新�按钮检查是�
+有新的通知。通知�天�社团��� 200 �。
         </text>
         <scroll_list name="notice_list">
                 <column label="" name="icon" />
-                <column label="Subject" name="subject" />
-                <column label="From" name="from" />
-                <column label="Date" name="date" />
+                <column label="主题" name="subject" />
+                <column label="�自" name="from" />
+                <column label="日期" name="date" />
         </scroll_list>
         <text name="notice_list_none_found">
-                没有找到任何目标
+                没有找到。
         </text>
-        <button label="创建新的布告" label_selected="创建新的布告"
+        <button label="创建新的通知" label_selected="创建新的通知"
              name="create_new_notice" />
-        <button label="更新��" label_selected="更新��" name="refresh_notices" />
-        <panel label="创建新的布告" name="panel_create_new_notice">
+        <button label="刷新" label_selected="刷新" name="refresh_notices" />
+        <panel label="创建新的通知" name="panel_create_new_notice">
                 <text name="lbl">
                         创建一�通知
                 </text>
                 <text name="lbl2">
-                        你必须输入��通知的对象。你�以从你的库存中拖拽一个�目至控制��上，这样�以添加给通知一个�目。附加的�目必须是��制的或�转移的，但是你�能��一个文件夹。
+                        您必须键入主题�能��通知。您�以将�个库存�目拖动到
+该��上�附加这个�目。附件必须�以�制以�转让，
+并且您�能��文件夹。
                 </text>
                 <text name="lbl3">
                         主题:
@@ -39,25 +42,25 @@
                         信�:
                 </text>
                 <text name="lbl5">
-                        附属:
+                        附件:
                 </text>
-                <button label="移走附件" label_selected="移走附件" name="remove_attachment" />
+                <button label="移除附件" label_selected="移除附件" name="remove_attachment" />
                 <button label="��通知" label_selected="��通知" name="send_notice" />
                 <panel name="drop_target2"
-                     tool_tip="Drag an inventory item onto the message box to send it with the notice. You must have permission to copy and transfer the object to send it with the notice." />
+                     tool_tip="将库存�目拖动到消�框上和通知一起�出去。�将物体和通知一起�出，您必须有�制和转让物体的��。" />
         </panel>
-        <panel label="View Past Notice" name="panel_view_past_notice">
+        <panel label="查看过去的通知" name="panel_view_past_notice">
                 <text name="lbl">
                         存档的通知
                 </text>
                 <text name="lbl2">
-                        ��一�新的通知，请点击上�的‘创建新的通知’按钮。
+                        ���新的通知，请点击上�的‘创建新的通知’按钮。
                 </text>
                 <text name="lbl3">
                         主题:
                 </text>
                 <text name="lbl4">
-                        信�:
+                        消�:
                 </text>
                 <button label="打开附件" label_selected="打开附件" name="open_attachment" />
         </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
index 4eef445..ae27b8e 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="会员和角色" name="roles_tab">
         <text name="default_needs_apply_text">
-                在目�的亚桌�上有没有应用的更改。
+                在目�的标签页上有尚未应用的更改。
         </text>
         <text name="want_apply_text">
-                你是�愿�现在就应用这些更改?
+                您是�愿�现在就应用这些更改?
         </text>
         <text name="cant_delete_role">
-                普通人&apos;和 &apos;主人&apos;角色属于特殊角色，�能被删除。
+                ‘普通人’ 和 ‘团长’ 角色属于特殊角色，�能被删除。
         </text>
         <button label="?" name="help_button" />
         <panel name="members_header">
                 <text name="static">
-                        会员和角色
+                        �员和角色
                 </text>
                 <text name="static2">
-                        社团�员�照��能力和本领，被分�以��的角色。这些设置�以轻�的被制定，并�许更大�度的组织性和�活性。
+                        社团�员被分�以��的角色和能力。
+角色和能力的分��以简�地修改，以便�活地组织社团。
                 </text>
         </panel>
         <panel name="roles_header">
@@ -23,13 +24,13 @@
                         角色
                 </text>
                 <text name="role_properties_modifiable">
-                        选择下�的一个角色.  你�以修改角色的�称，�述和会员的头衔。
+                        选择下�的一个角色。你�以修改角色的�称��述和会员头衔。
                 </text>
                 <text name="role_properties_not_modifiable">
-                        选择下�的角色，察看它的性质，�员和所�许的能力。
+                        选择下�的角色，察看它的属性�具有这个角色的�员和其所�许的能力。
                 </text>
                 <text name="role_actions_modifiable">
-                        你也�以对角色分�能力.
+                        你也�以对角色分�能力。
                 </text>
                 <text name="role_actions_not_modifiable">
                         你�以查看，但�能修改，或者分�这些能力。
@@ -40,47 +41,47 @@
                         能力
                 </text>
                 <text name="static2">
-                        你�以查看�项能力的具体�述，以�哪个角色和会员正在执行此项能力。
+                        你�以查看�项能力的具体�述，以�哪些角色和会员�以执行此项能力。
                 </text>
         </panel>
         <tab_container name="roles_tab_container">
-                <panel label="Members" name="members_sub_tab" tool_tip="Members">
+                <panel label="会员" name="members_sub_tab" tool_tip="Members">
                         <button label="�索" name="search_button" />
                         <button label="显示全部" name="show_all_button" />
                         <name_list name="member_list">
-                                <column label="Member Name" name="name" />
-                                <column label="Donated Tier" name="donated" />
-                                <column label="Last Login" name="online" />
+                                <column label="会员�字" name="name" />
+                                <column label="�献的土地�度" name="donated" />
+                                <column label="最�登入" name="online" />
                         </name_list>
                         <button label="邀请一个新人 ..." name="member_invite" />
                         <button label="从社团中驱�" name="member_eject" />
                         <text name="help_text">
-                                你�以添加或移除分�给会员的角色，或者通过按�控制键，并点击会员的�字，选择多个会员。
+                                你�以添加或移除分�给会员的角色。按�控制键并点击会员的�字，选择多个会员。
                         </text>
                 </panel>
                 <panel label="角色" name="roles_sub_tab">
                         <button label="�索" name="search_button" />
                         <button label="显示全部" name="show_all_button" />
                         <scroll_list name="role_list">
-                                <column label="Role Name" name="name" />
-                                <column label="Title" name="title" />
-                                <column label="Members" name="members" />
+                                <column label="角色�字" name="name" />
+                                <column label="头衔" name="title" />
+                                <column label="会员数" name="members" />
                         </scroll_list>
                         <button label="创建新的角色 ..." name="role_create" />
                         <button label="删除角色" name="role_delete" />
                         <text name="help_text">
-                                角色都有一个头衔，并且�许列出�个�员能够行使的能力。�员们�以属于一个或多个角色。一个社团最多有10个角色，包括普通人和主人角色。
+                                角色都有一个头衔，以�一组这个角色�以执行的能力。团员们�以属于一个或多个角色。一个社团最多有 10 个角色，包括‘普通人’和‘团长’这两个角色。
                         </text>
                 </panel>
                 <panel label="能力" name="actions_sub_tab">
                         <button label="�索" name="search_button" />
                         <button label="显示全部" name="show_all_button" />
-                        <scroll_list name="action_list" tool_tip="Select an Ability to view more details.">
+                        <scroll_list name="action_list" tool_tip="选择一个角色查看详细内容。">
                                 <column label="" name="icon" />
                                 <column label="" name="action" />
                         </scroll_list>
                         <text name="help_text">
-                                这些能力�许角色里的会员在社团里�一些特殊的事情。关于能力的�类范畴很宽。
+                                能力�许�有角色的团员在社团中�特定的事项。能力有很多�。
                         </text>
                 </panel>
         </tab_container>
@@ -89,14 +90,14 @@
                         分�的角色
                 </text>
                 <text name="static2">
-                        �许能力
+                        �许的能力
                 </text>
                 <scroll_list name="member_assigned_roles">
                         <column label="" name="checkbox" />
                         <column label="" name="role" />
                 </scroll_list>
                 <scroll_list name="member_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
+                     tool_tip="�个能力的详细资料请��能力标签。">
                         <column label="" name="icon" />
                         <column label="" name="action" />
                 </scroll_list>
@@ -108,17 +109,17 @@
                 <text name="static2">
                         �述
                 </text>
-                <line_editor name="role_name">
+                <line_editor name="role_name"><!--placeholder-->
                         雇员
                 </line_editor>
                 <text name="static3">
                         头衔
                 </text>
                 <line_editor name="role_title">
-                        (等待)
+                        (等待中)
                 </line_editor>
                 <text_editor name="role_description">
-                        (等待)
+                        (等待中)
                 </text_editor>
                 <text name="static4">
                         分�的�员
@@ -128,9 +129,9 @@
                         �许能力
                 </text>
                 <check_box label="组员��" name="role_visible_in_list"
-                     tool_tip="Sets whether members of this role are visible in the General tab   to people outside of the group." />
+                     tool_tip="设定该角色的�员对社团外的人是�在一般标签页中��。" /><!--So long...-->
                 <scroll_list name="role_allowed_actions"
-                     tool_tip="For Details of each Allowed Ability see the Abilities tab.">
+                     tool_tip="�个能力的详细资料请��能力标签。">
                         <column label="" name="icon" />
                         <column label="" name="checkbox" />
                         <column label="" name="action" />
@@ -140,14 +141,14 @@
                 <text name="static">
                         �述
                 </text>
-                <text_editor name="action_description">
-                        这项能力是‘从社团中驱�会员’。�有主人能够驱��一个主人。
+                <text_editor name="action_description"><!--Placeholder again-->
+                        这项能力是 ‘从社团中驱�会员’。�有团长能够驱��一个团长。
                 </text_editor>
                 <text name="static2">
-                        有能力的角色
+                        有该能力的角色
                 </text>
                 <text name="static3">
-                        有能力的会员
+                        有该能力的会员
                 </text>
         </panel>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
index 9d44191..f6aa9ad 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
@@ -1,65 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="议案" name="voting_tab">
+<panel label="�议" name="voting_tab">
         <text name="help_text">
-                社团�议并�能视为是社团���的事，或者是社团度�些事情的看法。如果你有�适的�利，你就�以创建�议，投票表决开放性�议，并查看旧的�议。
+社团�议�以用�了解社团想��的事，或者是社团对�些事情的看法。如果你有�适的�力，你就�以创建�议�投票表决开放的�议，以�查看旧的�议。
         </text>
-        <button label="?" name="help_button" />
         <text name="proposal_header">
-                打开社团�议
+                开放的社团�议
+        </text> 
+        <text name="proposal_instructions">
+                �击你愿�投票的决议，点击创建决议， 以创建一个新的决议。
+        </text>
+        <text name="proposal_lbl">
+                �议�述
+        </text>
+        <text
+                 name="proposal_voting_lbl"
+                 visible="true">
+                 �议                                                                投票结�                        已�投票？
         </text>
+        <button label="创建�议" label_selected="创建�议" name="btn_proposal" />
+        <button label="查看�议" label_selected="查看�议" name="btn_view_proposal_item" />
+        <button label="查看��" label_selected="查看��" name="btn_view_proposal_list" />
         <text name="proposals_header_view_txt">
-                打开社团�议
+                开放的社团�议
         </text>
         <text name="proposals_header_create_txt">
-                创造�议
+                创建�议
         </text>
         <text name="proposals_header_vote_txt">
-                议案的投票表决
+                对�议投票
         </text>
         <text name="empty_proposal_txt">
-                你正在�试创建的�案是空的。请在创建之�填好你的�案。
-        </text>
-        <text name="proposal_instructions">
-                �击你愿�投票的决议，点击创建决议， 以创建一个新的决议。
-        </text>
-        <text name="proposal_lbl">
-                建议:
+                你正在�试创建的�议是空的。请在创建之�填好你的�议。
         </text>
-        <button label="创造�议" label_selected="创造�议" name="btn_proposal" />
-        <button label="察看�议" label_selected="察看�议"
-             name="btn_view_proposal_item" />
-        <button label="查看��" label_selected="查看��"
-             name="btn_view_proposal_list" />
+
+
+
+
         <text name="quorum_lbl">
                 法定人数:
         </text>
-        <spinner name="quorum" tool_tip="# 人为选举结果有效还需�的人数。" />
+        <spinner name="quorum" tool_tip="为选举结果有效需�最少的人数。" />
         <text name="quorum_text">
-                总数为x 社团会员.
+                �团员必须投票（总共 [MEMBERS]人）
         </text>
         <text name="duration_lbl">
                 �续时间:
         </text>
-        <spinner name="duration" tool_tip="#天为选举还将�续的天数。" />
+        <spinner name="duration" tool_tip="投票�续的天数" />
         <text name="duration_text">
                 天
         </text>
-        <radio_group name="majority" tool_tip="Majority of total votes needed to win.">
+        <radio_group name="majority" tool_tip="投票�功需�的人数。">
                 简�多数
                 2/3 多数
                 全票通过
         </radio_group>
         <text name="start_lbl">
-                选举开始:
+                投票开始:
         </text>
         <text name="end_lbl">
-                选举结� :
+                投票结� :
         </text>
         <button label="�交�议" label_selected="�交�议" name="btn_submit" />
         <button label="�消" label_selected="�消" name="btn_cancel" />
         <button label="是" label_selected="是" name="btn_yes" />
         <button label="�" label_selected="�" name="btn_no" />
-        <button label="放弃" label_selected="放弃" name="btn_abstain" />
+        <button label="弃�" label_selected="弃�" name="btn_abstain" />
         <text name="txt">
                 社团选举�
         </text>
@@ -69,10 +75,50 @@
         <text name="history_list_lbl">
                 通过表决                                                        投票表决终止
         </text>
-        <button label="查看物��" label_selected="查看物��"
+        <button label="查看项目" label_selected="查看项目"
              name="btn_view_history_item" />
         <text name="vote_text_lbl">
-                选举结果:
+                投票结果:
         </text>
         <button label="查看��" label_selected="查看��" name="btn_view_history_list" />
+        <string
+                 name="proposals_header_view_inst">
+                �击你想�投票的�议，或者按‘创建�议’�创建新的�议。
+        </string>
+        <string
+                 name="proposals_header_create_inst">
+                输入新的�议的�述。您�以更改最少投票人数�时间以�需�通过投票的人数类别。
+        </string>
+        <string
+                 name="proposals_header_vote_inst">
+                按‘是’或‘�’�对�议投票，或者选择在此�议上弃�。
+        </string>
+        <string
+                 name="proposals_header_voted_inst">
+                您选择了: [VOTE]
+        </string>
+<string
+                 name="proposals_submit_yes_txt">
+                正在�交��票...
+        </string>
+        <string
+                 name="proposals_submit_no_txt">
+                正在�交�对票...
+        </string>
+        <string
+                 name="proposals_submit_abstain_txt">
+                正在�交弃�票...
+        </string>
+        <string
+                 name="proposals_submit_new_txt">
+                正在�交新的�议...
+        </string>
+        <string
+                 name="vote_recorded">
+                您的投票已�收到。
+        </string>
+        <string
+                 name="vote_previously_recorded">
+                您已�投过票了。一次�议�能投票一次。
+        </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_groups.xml b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
new file mode 100644
index 0000000..958f392
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_groups.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="groups">

+        <text name="groupdesc" >

+                您当�激活的社团以粗体表示。

+        </text>

+        <text name="groupcount" >

+                您现在属于 [COUNT] 个社团 (最大 [MAX] 个)。

+        </text>

+        <button

+                 label="�天/呼�"

+                 name="IM"

+                 tool_tip="打开�时通信会�" />

+        <button

+                 label="信�"

+                 name="Info" />

+        <button

+                 label="激活"

+                 name="Activate" />

+        <button

+                 label="离开"

+                 name="Leave" />

+        <button

+                 label="创建..."

+                 name="Create" />

+        <button

+                 label="�索..."

+                 name="Search..." />

+</panel>

+<!--Translated for Second Life 1.19.0 (79185)-->
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_login.xml b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
index dc06531..a10df47 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_login.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
         <text name="first_name_text">
-                姓:
+                �:
         </text>
         <text name="last_name_text">
-                �:
+                姓:
         </text>
         <text name="password_text">
                 密�:
         </text>
         <text name="start_location_text">
-                开始定�:
+                开始�置:
         </text>
         <combo_box name="start_location_combo">
                 <combo_item name="MyHome">
                         我的家
                 </combo_item>
                 <combo_item name="MyLastLocation">
-                        我的上个�置
+                        我最�在的�置
                 </combo_item>
-                <combo_item name="&lt;Typeregionname&gt;">
+                <combo_item name="Typeregionname">
                         &lt;输入地域�&gt;
                 </combo_item>
         </combo_box>
@@ -28,9 +28,18 @@
                 登陆�显示器会采用全�显示。
         </text>
         <button label="新�户..." label_selected="新�户..." name="new_account_btn" />
-        <button label="连接" label_selected="连接" name="connect_btn" />
+        <button label="登入" label_selected="登入" name="connect_btn" />
         <button label="�数选择..." label_selected="�数选择..." name="preferences_btn" />
         <button label="退出" label_selected="退出" name="quit_btn" />
+        <text name="forgot_password_text">
+                忘记了姓�或密��？
+        </text>
+        <text
+                 name="create_new_account_text"
+                 hover_color="50 115 185">
+                申请新�户。
+        </text>
+
         <text name="version_text">
                 1.23.4 (5)
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_media_controls.xml
new file mode 100644
index 0000000..0924596
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_media_controls.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="media_controls">
+        <icon
+                 label=""
+                 name="music_icon"
+                 tool_tip="播放或暂�音��" />
+        <button
+                 label=""
+                 name="music_play"
+                 tool_tip="播放或暂�音��" />
+  <button
+                 label=""
+                 name="music_pause"
+                 tool_tip="暂�音��" />
+  <button
+                 label=""
+                 name="music_stop"
+                 tool_tip="�止音��" />
+  <icon
+                 label=""
+                 name="media_icon"
+                 tool_tip="播放或暂�音��" />
+  <button
+                 image_disabled="flyout_btn_left_disabled.tga"
+                 label=""
+                 name="media_play"
+                 tool_tip="播放或暂�音��" />
+  <button
+                 image_disabled="flyout_btn_left_disabled.tga"
+                 label=""
+                 name="media_pause"
+                 tool_tip="暂�媒体�" />
+        <button
+                 label=""
+                 name="media_stop"
+                 tool_tip="�止媒体�" />
+        <volume_slider
+                 name="volume_slider"
+                 tool_tip="主音�" />
+        <button
+                 label=""
+                 name="mute_master"
+                 tool_tip="全部�音" />
+        <button
+                 name="expand"
+                 tool_tip="�独调节音�大�" />
+ 
+        <string
+                 name="play_label">
+                播放
+        </string>
+        <string
+                 name="stop_label">
+                �止
+        </string>
+        <string
+                 name="pause_label">
+                暂�
+        </string>
+        <string
+                 name="default_tooltip_label">
+                没有设定媒体
+        </string>
+        <string
+                 name="media_hidden_label">
+                (URL 被地�拥有者��)
+        </string>
+        <string
+                 name="media_icon_tooltip_web">
+                该地点显示 World Wide Web 上的内容。点击播放按钮显示网络内容。
+        </string>
+        <string
+                 name="media_icon_tooltip_movie">
+                该地点显示视频内容。点击播放按钮播放视频。
+        </string>
+        <string
+                 name="media_play_tooltip">
+                在该地点显示网络内容。
+        </string>
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml b/linden/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml
new file mode 100644
index 0000000..b08bbef
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+         name="media_remote"
+         use_bounding_rect="true">
+                <string
+                 name="play_label">
+                播放
+        </string>
+        <string
+                 name="stop_label">
+                �止
+        </string>
+        <string
+                 name="pause_label">
+                暂�
+        </string>
+        <string
+                 name="default_tooltip_label">
+                没有设定媒体
+        </string>
+        <string
+                 name="media_hidden_label">
+                (URL 被地�拥有者��)
+        </string>
+        <string
+                 name="media_icon_tooltip_web">
+                该地点显示 World Wide Web 上的内容。点击播放按钮显示网络内容。
+        </string>
+        <string
+                 name="media_icon_tooltip_movie">
+                该地点显示视频内容。点击播放按钮播放视频。
+        </string>
+        <string
+                 name="media_play_tooltip">
+                在该地点显示网络内容。
+        </string>
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
index 627206c..3e83ba2 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_overlaybar.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="overlay">
-        <button label="已收到�时消�" label_selected="已收到�时消�"
-             name="IM Received"
-             tool_tip="你有一个未察看的�时消�.请点击察看" />
-        <button label="设��忙状�" label_selected="设��忙状�"
-             name="Set Not Busy"
-             tool_tip="�天与�时消�模�以对你��。 点击这里�设定你�在忙碌模�下" />
-        <button label="释放键盘" label_selected="释放键盘" name="Release Keys"
-             tool_tip="脚本已�控制了你的控制键。点击这里释放控制键。" />
-        <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook"
-             tool_tip="使用鼠标控制�幕. 如果你有枪, �击枪则会自动射击." />
-        <button label="起身" label_selected="起身" name="Stand Up"
-             tool_tip="点击这里�站立" />
+        <layout_stack name="overlay_layout_panel">
+                <layout_panel name="main_panel" min_width="420">
+                        <layout_stack name="chatbar_and_buttons">
+                                <layout_panel name="state_buttons">
+                                        <button label="已收到�时消�" label_selected="已收到�时消�"
+                                             name="IM Received"
+                                             tool_tip="你有一个未察看的�时消�。请点击察看" />
+                                        <button label="�消忙碌状�" label_selected="�消忙碌状�"
+                                             name="Set Not Busy"
+                                             tool_tip="�天与�时消�模�已对你��。 点击这里�设定你�在忙碌模�下" />
+                                        <button label="释放键盘" label_selected="释放键盘" name="Release Keys"
+                                             tool_tip="一个脚本已�控制了你的控制键。点击这里释放控制键。" />
+                                        <button label="第一人称视角" label_selected="第一人称视角" name="Mouselook"
+                                             tool_tip="使用鼠标控制�幕。如果你有枪，点击则�以射击。" />
+                                        <button label="起身" label_selected="起身" name="Stand Up"
+                                             tool_tip="点击这里�站立" />
+                                </layout_panel>
+                        </layout_stack>
+                </layout_panel>
+        </layout_stack>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place.xml b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
index 133d320..68668ae 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place.xml
@@ -1,6 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Place" title="地方">
-        <button label="闪电传�" name="teleport_btn" />
-        <button label="在地图中显示" name="map_btn" />
-        <button label="投标..." name="auction_btn" />
+<panel
+         name="Place"
+         title="Place">
+        <text
+                 name="name_label">
+                �称:
+        </text>
+        <text
+                 name="description_label">
+                �述:
+        </text>
+        <text
+                 name="information_label">
+                信�:
+        </text>
+        <text
+                 name="location_label">
+                �置:
+        </text>
+        <button
+                 label="瞬间移动"
+                 name="teleport_btn" />
+        <button
+                 label="在地图上显示"
+                 name="map_btn" />
+        <button
+                 label="投标..."
+                 name="auction_btn" />
+        <string
+                 name="traffic_text">
+                ��: [TRAFFIC]
+        </string>
+        <string
+                 name="area_text">
+                �积: [AREA] 平方米
+        </string>
+        <string
+                 name="forsale_text">
+                以 L$ [PRICE] 的价格出售
+        </string>
+        <string
+                 name="auction_text">
+                �� ID [ID].
+        </string>
+        <string
+                 name="server_update_text">
+                如果�务器�更新的�，就没有地点信�。
+        </string>
+        <string
+                 name="server_error_text">
+                关于这个地点的信�现在暂时��用，请�候�试。
+        </string>
+        <string
+                 name="server_forbidden_text">
+                由于访问�制，关于这个地点的信���用。请与地�的�有人确认你的��。
+        </string>
 </panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
index 133d320..68668ae 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_place_small.xml
@@ -1,6 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Place" title="地方">
-        <button label="闪电传�" name="teleport_btn" />
-        <button label="在地图中显示" name="map_btn" />
-        <button label="投标..." name="auction_btn" />
+<panel
+         name="Place"
+         title="Place">
+        <text
+                 name="name_label">
+                �称:
+        </text>
+        <text
+                 name="description_label">
+                �述:
+        </text>
+        <text
+                 name="information_label">
+                信�:
+        </text>
+        <text
+                 name="location_label">
+                �置:
+        </text>
+        <button
+                 label="瞬间移动"
+                 name="teleport_btn" />
+        <button
+                 label="在地图上显示"
+                 name="map_btn" />
+        <button
+                 label="投标..."
+                 name="auction_btn" />
+        <string
+                 name="traffic_text">
+                ��: [TRAFFIC]
+        </string>
+        <string
+                 name="area_text">
+                �积: [AREA] 平方米
+        </string>
+        <string
+                 name="forsale_text">
+                以 L$ [PRICE] 的价格出售
+        </string>
+        <string
+                 name="auction_text">
+                �� ID [ID].
+        </string>
+        <string
+                 name="server_update_text">
+                如果�务器�更新的�，就没有地点信�。
+        </string>
+        <string
+                 name="server_error_text">
+                关于这个地点的信�现在暂时��用，请�候�试。
+        </string>
+        <string
+                 name="server_forbidden_text">
+                由于访问�制，关于这个地点的信���用。请与地�的�有人确认你的��。
+        </string>
 </panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
index 4aabe38..ef0df68 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
@@ -1,40 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Audio &amp; Video" name="Media panel">
+<panel label="音频和视频" name="Media panel">
         <text type="string" length="1" name="muting_text">
-                �蔽:
+                音�:
         </text>
         <check_box label="�蔽声音" name="disable audio" />
         <check_box label="当窗�最�化时�蔽声音" name="mute_when_minimized" />
-        <text type="string" length="1" name="streaming_text">
-                �派:
+                <text
+                 name="streaming_prefs_text">
+                �媒体首选项:
         </text>
+        <text
+                 name="audio_prefs_text">
+                音频首选项:
+        </text>
+
         <check_box label="当音��用时播放音��(会�用更多带宽)"
              name="streaming_music" />
         <check_box label="当视频�用时播放视频�(会�用更多带宽)"
              name="streaming_video" />
+        <check_box label="自动播放媒体"
+                 name="auto_streaming_video" />
+
+        <text type="string" length="1" name="streaming_text">
+                �派:
+        </text>
+
         <text type="string" length="1" name="system_volume_text">
-                声效:
+                系统声音效果:
         </text>
         <text type="string" length="1" name="wind_volume_text">
-                风�:
+                风声:
         </text>
         <text type="string" length="1" name="footsteps_volume_text">
-                脚�尺寸:
+                脚步声:
         </text>
         <text type="string" length="1" name="ui_volume_text">
-                UI体积:
-        </text>
-        <spinner label="L$ 整体改�" name="L$ Change Threshold" />
-        <spinner label="从�始更改�康状况" name="Health Change Threshold" />
-        <text type="string" length="1" name="doppler_effect_text">
-                多普勒效应:
+                界�音�:
         </text>
+        <spinner label="L$ �化阈值" name="L$ Change Threshold" />
+        <spinner label="生命值�化阈值" name="Health Change Threshold" />
+
+        <slider 
+             name="Doppler Effect" width="250"
+             label="多普勒效应" />
         <text type="string" length="1" name="distance_factor_text">
-                �离因素:
+                �离系数:
         </text>
+        <slider 
+                name="Distance Factor"
+                label="�离系数" />
+
         <text type="string" length="1" name="rolloff_factor_text">
-                翻转因素:
+                衰�系数:
         </text>
+        <slider 
+                name="Rolloff Factor"
+                label="衰�系数:" />
+        
         <text type="string" length="1" name="default_upload_bitrate_text">
                 默认上传速率:
         </text>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index 779c2e3..143821d 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -3,52 +3,70 @@
         <text type="string" length="1" name="text_box">
                 �天字体大�:
         </text>
-        <radio_group name="chat font size">
+        <radio_group name="chat_font_size">
                 <radio_item type="string" length="1" name="radio">
-                        �型的
+                        ��
                 </radio_item>
                 <radio_item type="string" length="1" name="radio2">
-                        中型的
+                        中�
                 </radio_item>
                 <radio_item type="string" length="1" name="radio3">
-                        大型的
+                        大�
                 </radio_item>
         </radio_group>
         <text type="string" length="1" name="text_box2">
                 �天颜色:
         </text>
+        <!--Geneko Nemeth: 最多�能写三个字。/Maximum 3 Chinese characters.-->
+        <color_swatch
+                 label="您"
+                 name="user" />
+        <color_swatch
+                 label="其他人"
+                 name="agent" />
+        <color_swatch
+                 label="�时"
+                 name="im" />
         <color_swatch label="系统" name="system" />
+        <color_swatch label="错误" name="script_error" />
         <color_swatch label="用户" name="users" />
-        <color_swatch label="东东" name="objects" />
-        <color_swatch label="泡沫" name="background" />
-        <color_swatch label="URLs" name="links" />
+        <color_swatch label="物体" name="objects" />
+        <color_swatch label="Owner" name="owner" />
+        <color_swatch label="气�" name="background" />
+        <color_swatch label="链接" name="links" />
         <text type="string" length="1" name="text_box3">
                 �天控制�:
         </text>
-        <spinner label="�天结��淡出" name="fade_chat_time" />
+        <spinner label="对�淡出时间" name="fade_chat_time" />
         <text type="string" length="1" name="text_box4">
                 (秒)
         </text>
         <text type="string" length="1" name="text_box5">
-                (#行)
+                (行)
         </text>
-        <slider label="��明" name="console_opacity" />
+        <slider label="��明度" name="console_opacity" />
+        <check_box
+                 label="使用全�宽度  (需���动)"
+                 name="chat_full_width_check" />
         <text type="string" length="1" name="text_box6">
                 �天选项:
         </text>
         <check_box label="用全�宽度�天 (需��)" name="chat_full_width_check" />
-        <check_box label="点击返回�关闭�天窗�" name="close_chat_on_return_check" />
-        <check_box label="；�天时�用箭头键移动你的化身"
+        <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" />
+        <check_box label="本地�天时显示时间戳" name="show_timestamps_check" />
+        <check_box
+                 label="�天时播放打字动画"
+                 name="play_typing_animation" />
         <text type="string" length="1" name="text_box7">
-                泡泡�:
+                �天气�:
         </text>
-        <check_box label="显示�天窗�" name="bubble_text_chat" />
-        <slider label="��明" name="bubble_chat_opacity" />
+        <check_box label="使用气��天" name="bubble_text_chat" />
+        <slider label="��明度" name="bubble_chat_opacity" />
         <text type="string" length="1" name="text_box8">
-                脚本出错:
+                脚本错误:
         </text>
         <check_box label="以�天形�显示脚本错误和警告" name="script_errors_as_chat" />
-        <color_swatch label="颜色" name="script_error" />
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 77460f2..c1a2e5a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -1,21 +1,71 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="General" name="general_panel">
+<panel label="一般选项" name="general_panel">
+        <radio_group
+                 draw_border="false"
+                 name="default_start_location">
+                <radio_item
+                        name="MyHome"
+                        tool_tip="默认登录到我的家。">
+                        我的家
+                </radio_item>
+                <radio_item
+                        name="MyLastLocation"
+                        tool_tip="默认登录到我最�的�置。">
+                        我最�在的�置
+                </radio_item>
+        </radio_group>
+
+        
         <check_box label="在登陆界�上显示起始�置" name="show_location_checkbox" />
+        
+        <combo_box name="fade_out_combobox" >
+                <combo_item name="Never" >
+                        从�显示
+                </combo_item>
+                <combo_item name="Show Temporarily" >
+                        暂时显示
+                </combo_item>
+                <combo_item name="Always">
+                        总是显示
+                </combo_item>
+        </combo_box>
+        
         <check_box label="在我的�幕上��我的�字" name="show_my_name_checkbox" />
+        <text
+                 name="group_titles_textbox">
+                社团头衔:
+        </text>
+
+        <check_box label="��所有社团头衔" name="show_all_title_checkbox" />
         <check_box label="��我的社团头衔" name="show_my_title_checkbox" />
-        <check_box label="�化身的�字" name="small_avatar_names_checkbox" />
+        <check_box label="化身�字使用��字体" name="small_avatar_names_checkbox" />
+        
+        <color_swatch label="" name="effect_color_swatch"
+             tool_tip="点击这里�打开色彩选择器" />
+                 
+        <!-- UI Sizing -->
+        <text name="UI Size:">
+                界�尺寸:
+        </text>          
+        <check_box bottom="-236" control_name="UIAutoScale" enabled="true" follows="left|top"
+                font="SansSerifSmall" height="16" hidden="false" initial_value="false"
+                label="使用分辨率无关尺寸" left="148" mouse_opaque="true"
+                name="ui_auto_scale" radio_style="false" width="256" />
+        
+        <spinner label="离开休�计时:" name="afk_timeout_spinner" />
+        
         <check_box label="显示在线好�通知" name="friends_online_notify_checkbox" />
         <check_box label="旋转迷你地图" name="rotate_mini_map_checkbox" />
-        <check_box label="Notify when Linden dollars (L$) spent or received"
+        <check_box label="在付出或收到林登� (L$) 时�醒我"
              name="notify_money_change_checkbox" />
         <check_box label="下次�动时自动检测图�显示硬件"
              name="probe_hardware_checkbox"
              tool_tip="第二人生会根�您的硬件�置自动对一些图�设置进行调�。 如果您安装了新的硬件， 您应该让第二人生�新调�。" />
-        <check_box label="使用色彩撷�器的默认系统模�"
+        <check_box label="使用系统默认色彩选择器"
              name="use_system_color_picker_checkbox"
              tool_tip="使用系统默认色彩撷�器，代替在第二人生中建设的色彩撷�器。" />
         <text type="string" length="1" name="start_location_textbox">
-                开始定�:
+                起始�置:
         </text>
         <text type="string" length="1" name="show_names_textbox">
                 显示�字:
@@ -27,28 +77,19 @@
                 秒
         </text>
         <text type="string" length="1" name="crash_report_textbox">
-                现金报告:
+                崩溃报告:
         </text>
         <text type="string" length="1" name="language_textbox">
                 语言:
         </text>
         <text type="string" length="1" name="language_textbox2">
-                (Requires restart for full effect)
+                (�使更改完全生效，需�新�动程�)
         </text>
-        <radio_group name="fade_out_radio">
-                <radio_item type="string" length="1" name="Never">
-                        Never
-                </radio_item>
-                <radio_item type="string" length="1" name="Temporarily">
-                        Show Temporarily
-                </radio_item>
-                <radio_item type="string" length="1" name="Always">
-                        Always
-                </radio_item>
-        </radio_group>
-        <color_swatch label="" name="effect_color_swatch"
-             tool_tip="点击这里�打开色彩选择器" />
-        <spinner label="离开休�计时:" name="afk_timeout_spinner" />
+<check_box 
+             label="在覆盖�中显示�索��"  mouse_opaque="true"
+             name="show_search_panel" 
+             tool_tip="显示嵌入的�索��。"/>
+        
         <text name="region_name_prompt">
                 &lt;输入地域�&gt;
         </text>
@@ -64,20 +105,39 @@
                 </combo_item>
         </combo_box>
         <combo_box name="language_combobox">
-                <combo_item type="string" length="1" name="English">
-                        英语
+                <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
+                        系统默认值
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="English" value="en-us">
+                        English (英语)
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Chinese" value="zh">
+                        中文 (简体)  - 测试版
+                </combo_item>
+                <combo_item length="1" name="Danish" type="string">
+                        Dansk (Danish) - 测试版
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="Deutsch(German)" value="de">
+                        Deutsch (德语) - 测试版
+                </combo_item>
+                <combo_item type="string" length="1" enabled="true" name="French" value="fr">
+                        Français (法语) - 测试版
                 </combo_item>
-                <combo_item type="string" length="1" name="Deutsch(German)">
-                        Deutsch (German) - Beta
+                <combo_item type="string" length="1" enabled="true" name="(Japanese)" value="ja">
+                        日本語 (日语) - 测试版
                 </combo_item>
-                <combo_item type="string" length="1" name="(Japanese)">
-                        日本語 (Japanese) - Beta
+                <combo_item type="string" length="1" enabled="true" name="(Korean)" value="ko">
+                        한국어 (�鲜语) - 测试版
                 </combo_item>
-                <combo_item type="string" length="1" name="(Korean)">
-                        한국어 (Korean) - Beta
+                <combo_item type="string" length="1" enabled="true" name="Portugese" value="pt">
+                        Português (葡�牙语) - 测试版
                 </combo_item>
-                <combo_item type="string" length="1" name="Chinese">
-                        中文 - Beta
+                <combo_item type="string" length="1" enabled="true" name="Spanish" value="es">
+                        Español (西�牙语) - 测试版
                 </combo_item>
         </combo_box>
+        <check_box
+                 label="与物体共享语言"
+                 name="language_is_public"
+                 tool_tip="这使得世界内的物体�以知�你�好的语言。" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index ddaabdb..d7ca24b 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,43 +1,245 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="图�" name="Display panel">
+
+        <!-- render size section -->
+        <button label="?" name="GraphicsPreferencesHelpButton" />
+
+        <text name="DisplayResLabel">
+                显示器分辨率:
+        </text>
+        <combo_box name="fullscreen combo" />
+        <check_box label="在窗�中�行" name="windowed mode" />
+                <text_editor name="FullScreenInfo">
+                若�选中，查看器在登入时将全�显示。
+        </text_editor>
+        <text
+                 name="WindowSizeLabel">
+                窗�尺寸:
+        </text>
+
+        <text name="AspectRatioLabel1">
+                全�宽高比:
+        </text>
+        <text name="AspectRatioLabel2">
+                (宽 / 高)
+        </text>
         <combo_box name="aspect_ratio">
-                <combo_item type="string" length="1" name="4:3(StandardCRT)">
+                <combo_item name="4:3(StandardCRT)" >
                         4:3 (标准显示器)
                 </combo_item>
-                <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
-                        5:4 (1280x1024液晶�)
+                <combo_item name="5:4(1280x1024LCD)" >
+                        5:4 (1280x1024 液晶显示器)
                 </combo_item>
-                <combo_item type="string" length="1" name="16:9(Widescreen)">
-                        16:9 (宽�)
+                <combo_item name="16:9(Widescreen)" >
+                        16:9 (宽�幕)
                 </combo_item>
         </combo_box>
-        <text type="string" length="1" name="text">
-                �制决议:
+        <check_box label="自动检测"
+                name="aspect_auto_detect"/>
+
+        <!-- performance/quality text-->
+        <text name="HigherText">
+                质�和
+        </text>
+        <text name="QualityText"
+                width="95">
+                性能:
+        </text>
+
+        <!-- May want to axe these explanatations for locale problems -->
+        <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"
+                left="115" mouse_opaque="true" name="FasterText" v_pad="0"
+                width="80">
+                æ›´å¿«
+        </text>
+
+        <!-- radio box names -->
+        <text name="ShadersPrefText">
+                低
+        </text>
+        <text name="ShadersPrefText2" >
+                中
+        </text>
+        <text name="ShadersPrefText3">
+                高
+        </text>
+        <text name="ShadersPrefText4">
+                最高
+        </text>
+        
+
+        <!-- May want to axe these explanatations for locale problems -->
+        <text name="HigherText2">
+                更高
+        </text>
+        <text name="QualityText2">
+                质�
+        </text>
+
+        <slider label="" name="QualityPerformanceSelection" />
+        <check_box label="自定义" name="CustomSettings" />
+
+        <!-- performance settings -->
+        <view_border name="GraphicsBorder" />
+
+        <!-- Shaders -->
+        <text name="ShadersText">
+                �色器:
+        </text>
+
+        <check_box 
+                label="凹凸贴图和光泽" 
+                name="BumpShiny" />
+        <check_box 
+                label="基本�色器"
+                name="BasicShaders" 
+                tool_tip="�用该选项也许�以防止�些显�驱动程�崩溃。"
+                width="315" />
+        <check_box 
+                label="大气�色器" 
+                name="WindLightUseAtmosShaders"/>
+        <check_box 
+                label="水��射" name="Reflections"/>
+
+        <!-- Reflection Detail -->
+        <text name="ReflectionDetailText">
+                �射细节:
+        </text>
+        <radio_group name="ReflectionDetailRadio">
+                <radio_item name="0">
+                        地�和树木
+                </radio_item>
+                <radio_item name="1">
+                        所有��物体
+                </radio_item>
+                <!--这里应�应该写�“东东�?-->
+                <radio_item name="2">
+                        所有化身和物体
+                </radio_item>
+                <radio_item name="3">
+                        一切东西
+                </radio_item>
+        </radio_group>
+
+        <!-- avatar rendering -->
+        <text name="AvatarRenderingText" width="128">
+                化身渲染:
+        </text>
+        <check_box 
+                label="化身替身" 
+                name="AvatarImpostors" width="256" />
+        <check_box 
+                label="硬件 Skinning" 
+                name="AvatarVertexProgram" width="256" />
+        <check_box 
+                label="化身衣物效果" 
+                name="AvatarCloth" width="256" />
+
+        <!-- performance sliders -->
+        <text  name="DrawDistanceMeterText1"
+            width="128">
+                m
+        </text>
+        <text name="DrawDistanceMeterText2">
+                m
+        </text>
+
+        <slider label="�绘�离:" name="DrawDistance" />
+        <slider label="最大粒�数:" name="MaxParticleCount"/>
+        <slider label="�期处�质�:" name="RenderPostProcess"/>
+
+        <text name="MeshDetailText" 
+             width="128">
+                 模型细节:
+        </text>
+
+        <slider 
+                label="  物体:" label_width="140"
+                name="ObjectMeshDetail"
+                width="223" />
+        <slider 
+                label="  活动元件:" label_width="140"
+                name="FlexibleMeshDetail"
+                width="223" />
+        <slider 
+                label="  树木:" label_width="140"
+                name="TreeMeshDetail"
+                width="223" />  
+        <slider 
+                label="  化身:" label_width="140"
+                name="AvatarMeshDetail"
+                width="223" />
+        <slider 
+                label="  地�:" 
+                name="TerrainMeshDetail"
+                width="223" />
+        <slider 
+                label="  天空:" label_width="140"
+                name="SkyMeshDetail"
+                width="223" />
+
+        <!-- Low/Mid/High boxes -->
+        <text name="PostProcessText" >
+                低
+        </text>
+        <text name="ObjectMeshDetailText" >
+                低
         </text>
-        <text type="string" length="1" name="Fullscreen Aspect Ratio:">
-                全�显示放大比率:
+        <text name="FlexibleMeshDetailText">
+                低
         </text>
-        <text type="string" length="1" name="(width / height)">
-                (宽度 /高度)
+        <text name="TreeMeshDetailText" >
+                低
         </text>
-        <text type="string" length="1" name="UI Size:">
-                UI尺寸:
+        <text name="AvatarMeshDetailText" >
+                低
+        </text> 
+        <text name="TerrainMeshDetailText">
+                低
         </text>
-        <text type="string" length="1" name="(meters, lower is faster)">
-                (米数,越低越快)
+        <text name="SkyMeshDetailText">
+                低
+        </text> 
+
+
+        <!-- Lighting detail -->
+        <text name="LightingDetailText" >
+                光照细节:
         </text>
-        <text type="string" length="1" name="text2">
-                显示设置选项:
+        <radio_group name="LightingDetailRadio">
+                <radio_item name="SunMoon">
+                        仅有日月光效
+                </radio_item>
+                <radio_item name="LocalLights" >
+                        附近的�光
+                </radio_item>
+        </radio_group>
+
+        <!-- Terrain Detail -->
+        <text name="TerrainDetailText">
+                地�细节:
         </text>
-        <check_box label="在窗�中中�行" name="windowed mode" />
-        <check_box label="自动检测" name="aspect_auto_detect" />
-        <check_box label="使用决议自由规模" name="ui_auto_scale" />
-        <check_box label="从第一视角显示玩家" name="avfp" />
-        <spinner label="拖带�离:" name="draw_distance" />
-        <text name="resolution_format">
+        <radio_group name="TerrainDetailRadio">
+                <radio_item name="0" >
+                        低
+                </radio_item>
+                <radio_item name="2" >
+                        高
+                </radio_item>
+        </radio_group>
+
+        <button label="建议设置"
+                name="Defaults" />
+
+        <button label="硬件选项"
+                name="GraphicsHardwareButton" />
+
+        <text hidden="true" name="resolution_format">
                 [RES_X] x [RES_Y]
         </text>
-        <text name="aspect_ratio_text">
+        <text hidden="true" name="aspect_ratio_text">
                 [NUM]:[DEN]
         </text>
-</panel>
+</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
index 39dd82d..f9b026c 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
@@ -1,19 +1,52 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�时通" name="im">
+<panel label="�时消�" name="im">
         <text type="string" length="1" name="text_box">
-                �时通选项:
+                我的在线状�: 
         </text>
+        <check_box
+                 initial_value="false"
+                 label="仅我的好�和社团�能看�我的在线状况"
+                 name="online_visibility" />
+
         <text name="log_in_to_change">
                 登陆�更改
         </text>
         <check_box label="���时消�至电�邮件([EMAIL])" name="send_im_to_email" />
-        <check_box label="�天记录中包��时通信�" name="include_im_in_chat_history" />
+        <check_box label="本地�天中包��时通信�" name="include_im_in_chat_history" />
         <check_box label="在�时消�中显示时间" name="show_timestamps_check" />
-        <check_box label="Log Instant Messages" name="log_instant_messages" />
-        <check_box label="Log Chat" name="log_chat" />
-        <check_box label="Show end of last IM conversation" name="log_show_history" />
-        <button label="Change Path" label_selected="Change Path" name="log_path_button" />
-        <text type="string" length="1" name="text_box2">
+    <check_box
+                 label="显示好�上线通知"
+                 name="friends_online_notify_checkbox" />
+        <check_box label="�存�时通信记录到我的电脑上" name="log_instant_messages" />
+        <check_box label="�存对�记录到我的电脑上" name="log_chat" />
+        <check_box label="显示上次�时通信的结尾" name="log_show_history" />
+        <button label="更改路径" label_selected="更改路径" name="log_path_button" />
+        <text
+                 name="text_box3">
                 忙碌模�的自动回�:
         </text>
+        <text
+                 name="text_box4">
+                �天记录选项:
+        </text>
+        <text type="string" length="1" name="text_box2">
+                �时通信选项:
+        </text>
+        <check_box
+                 label="在��中显示时间"
+                 name="log_instant_messages_timestamp" />
+        <check_box
+                 initial_value="false"
+                 label="在�天记录中显示时间"
+                 name="log_chat_timestamp" />
+        <check_box
+                 initial_value="false"
+                 label="�天记录中显示�时信�"
+                 name="log_chat_IM" />
+        <check_box
+                 initial_value="false"
+                 label="显示时间时包括日期"
+                 name="log_date_timestamp" />
+
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
index d7d1d33..74d1e61 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_input.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Input &amp; Camera" name="Input panel">
+<panel label="输入和摄�头" name="Input panel">
         <text type="string" length="1" name=" Mouselook Options:">
                 第一人称视角选项设置:
         </text>
@@ -10,15 +10,36 @@
                 自动飞翔选项:
         </text>
         <text type="string" length="1" name=" Camera Options:">
-                摄�头选项:
+                摄�机选项:
         </text>
         <text type="string" length="1" name="Camera Springiness:">
-                摄�头弹性:
-        </text>
-        <check_box label="转化鼠标�作模�" name="invert mouse" />
-        <check_box label="起飞/�陆通过键盘up/down控制" name="automatic fly" />
-        <check_box label="自动编辑摄�头移动情况" name="edit camera movement"
-             tool_tip="当进入和离开编辑模�时，选用摄�头自动定�" />
-        <check_box label="摄�头移动时自动��" name="appearance camera movement"
-             tool_tip="在编辑模�下，选用摄�头自动定�" />
+                摄�机弹性:
+        </text>
+        <text
+                 name="Camera Follow Distance:">
+                摄�机跟��离:
+        </text>
+        <text
+                 name="Camera Transition Time:">
+                摄�机转�时间:
+        </text>
+        <text
+                 name="Camera Smoothing:">
+                摄�头平滑:
+        </text>
+
+        <check_box label="�转鼠标�作模�" name="invert_mouse" />
+        <check_box label="起飞/�陆通过键盘上/下键控制" name="automatic_fly" />
+        <check_box label="编辑物体时使用自动视角" name="edit_camera_movement"
+             tool_tip="当进入和离开编辑模�时，自动移动摄�头" />
+        <check_box label="编辑外观时使用自动视角" name="appearance_camera_movement"
+             tool_tip="在编辑外观时，摄�头自动定�" />
+        <text name="text2">
+                化身显示选项:
+        </text>
+        <check_box label="第一人称视角中，显示自己的化身" name="first_person_avatar_visible" />
+        <button
+                 label="游��设置"
+                 name="joystick_setup_button" />
+
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
index 0adb918..679ec53 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_network.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="网络" name="network">
-        <text type="string" length="1" name="text_box">
+        <text  name="text_box">
                 最大带宽:
         </text>
-        <text type="string" length="1" name="text_box2">
+        <text name="text_box2">
                 kbps (�秒kb数)
         </text>
-        <text type="string" length="1" name="text_box3">
+        <text name="cache_size_label_l">
                 �盘高速缓存大�:
         </text>
-        <radio_group name="disk cache">
-                <radio_item type="string" length="1" name="radio">
-                        50 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio2">
-                        200 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio3">
-                        500 MB
-                </radio_item>
-                <radio_item type="string" length="1" name="radio4">
-                        1000 MB
-                </radio_item>
-        </radio_group>
-        <button label="清除缓存" label_selected="清除缓存" name="clear_cache" />
+
+        <button label="清除缓存" name="clear_cache" />
+        
+        <text name="cache_location_label">
+                �盘缓存�置:
+        </text>
+        <button 
+             label="设置" label_selected="设置"
+             name="set_cache"/>
+        <button 
+             label="�置" label_selected="设置" 
+             name="reset_cache" />
+        <check_box 
+                label="自定义连接端�"
+        name="connection_port_enabled" /> 
+        <spinner 
+                label="端��:"
+        name="connection_port" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
index a1cf51c..eeeaf87 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
@@ -1,14 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="弹出程�" name="popups">
-        <text type="string" length="1" name="text_box">
-                �显示弹出程�:
+<panel
+         label="弹出窗�"
+         name="popups"
+         title="弹出窗�">
+        <text name="dont_show_label">
+                �显示这些弹出窗�:
         </text>
-        <button label="Enable this popup" label_selected="Enable this popup"
-             name="enable_popup" />
-        <text type="string" length="1" name="text_box2">
-                显示弹出程�:
+        <scroll_list
+                 name="disabled_popups" />
+        <button
+                 label="�用该弹出窗�"
+                 name="enable_popup" />
+        <text name="show_label">
+                显示这些弹出窗�:
         </text>
-        <button label="�置 &apos;下次显示&apos;对�..."
-             label_selected="�置 &apos;下次显示&apos;对�..."
-             name="reset_dialogs_btn" />
+        <scroll_list
+                 name="enabled_popups" />
+        <text
+                 name="text_box2">
+                其他人给与的记事���质和地标:
+        </text>
+        <check_box
+                 label="自动接�"
+                 name="accept_new_inventory" />
+        <check_box
+                 label="接��自动打开"
+                 name="show_new_inventory" />
+        <check_box label="在库存中自动显示新接收的物体" 
+             name="show_in_inventory" />
+        <button  width="225"
+                 label="显示所有的“下次��显示�对�框..."
+                 name="reset_dialogs_btn"
+                 tool_tip="�用所有�选的弹出窗��“首次使用��示。" />
+        <button  width="225"
+                 label="��所有的“下次��显示�对�框..."
+                 name="skip_dialogs_btn"
+                 tool_tip="�用所有�选的弹出窗��“首次使用��示。" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
new file mode 100644
index 0000000..70e0bc2
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="皮肤" name="Skins panel">
+        <text name="muting_text">
+                选择皮肤 (需���动)：
+        </text>
+  <radio_group  name="skin_selection">
+    <radio_item name="default">默认</radio_item>
+    <radio_item name="silver">Silver</radio_item>
+  </radio_group>
+</panel>
+
+
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
new file mode 100644
index 0000000..faeae07
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
+     height="408" hidden="false" label="语音�天" left="102"
+     mouse_opaque="true" name="chat" width="517">
+        <text_editor name="voice_unavailable" >
+                语音�天��用。
+        </text_editor>
+        <check_box 
+                 label="�用语音�天" 
+                 name="enable_voice_check"/>
+        <radio_group name="ear_location" >
+                <radio_item name="0" >
+                        从摄�机的�置�语音�天。
+                </radio_item>
+                <radio_item name="1" >
+                        从化身的�置�语音�天。
+                </radio_item>
+        </radio_group>
+
+        <text name="push_to_talk_heading" >
+                �按�说
+        </text>
+        <text_editor name="voice_chat_description" width="465">�按�说�许你控制什么时候传�声音。在切�模�中，按下并释放�按�说键�切�麦克风开关。�在切�模�的时候，麦克风仅在�按�说键按下时�有效。</text_editor>
+        <check_box 
+                 label="在第二人生查看器�动时，使用�按�说模�"
+             name="push_to_talk_check" />
+        <check_box label="以切�模�使用�按�说"
+             name="push_to_talk_toggle_check" />
+        <text type="string" 
+             name="push_to_talk_label" >
+                �按�说切�键:
+        </text>
+
+        <line_editor name="modifier_combo" />
+
+        <button 
+                 label="设置按键" 
+             name="set_voice_hotkey_button" />
+        <button 
+                 label="使用鼠标中键" 
+              name="set_voice_middlemouse_button" width="140" />
+
+        <text 
+             name="privacy_heading">
+                ��选项
+        </text>
+        <check_box label="�接�我的朋�列表上的人的语音呼�" 
+             name="voice_call_friends_only_check" />
+        
+        <text_editor name="device_settings_text" height="48" bottom_delta="-45">
+                *注�*: �行设备选项或语音设置�导将临时将您从语音�天断开，并且所作的更改将立�生效。
+        </text_editor>
+        <button 
+                 label="设备选项..." 
+                 name="device_settings_btn" />
+        <button 
+                 label="�行语音设置�导..." 
+             name="launch_voice_wizard_button" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
new file mode 100644
index 0000000..c00c1e6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"

+     height="408" hidden="false" label="Web" left="102" mouse_opaque="true"

+     name="web" width="517">

+        <text name="cache_size_label_l">

+                �览器缓存:

+        </text>

+        <button 

+             label="现在清除"

+             name="clear_cache" />

+        <text type="string" name="cookie_label" >

+                Cookie:

+        </text>

+        <check_box label="从网站接� cookie"

+             name="cookies_enabled" /> 

+        <button 

+             label="现在清除" 

+             name="clear_cookies" />

+        <text name="proxy_label">

+                代��务器:

+        </text>

+        <check_box 

+                 label="�用网页代��务器"

+         name="web_proxy_enabled" /> 

+        <text name="proxy_text_label">

+                地�:

+        </text>

+        <line_editor 

+                 name="web_proxy_editor"

+                 tool_tip="你想使用的代��务器的�称或者 IP 地�" />

+        <spinner 

+                         label="端��:"

+             name="web_proxy_port" />

+        <radio_group name="use_external_browser">

+                 <radio_item

+                         name="external"

+                         tool_tip="使用系统默认网络�览器打开帮助�网页链接, 等等。\n若全�显示则�推�使用。">

+                        使用外部�览器(Firefox, Safari, Internet Explorer)

+                </radio_item>

+                <radio_item

+                         name="internal"

+                         tool_tip="使用内部�览器打开帮助�网页链接, 等等。这个�览器会在第二人生中打开一个新窗�。">

+                        使用内建�览器

+                </radio_item>

+        </radio_group>

+        <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" />

+        <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/default/xui/zh/panel_region_covenant.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
index b9ccbe7..5db42cb 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="契约��" name="Covenant">
         <text name="covenant_help_text">
-                对契约��的更改将出现在此��动产所有的土地上。
+                对契约��的更改将出现在此�地产所有的土地上。
         </text>
         <text name="region_name_lbl">
                 区域:
@@ -10,41 +10,41 @@
                 (未知)
         </text>
         <text name="estate_name_lbl">
-                �人领地:
+                地产:
         </text>
         <text name="estate_name_text">
                 (未知)
         </text>
         <text name="covenent_instructions">
-                拖拽注释�，以更改这��动产的契约��。
+                �更改这��动产的契约��，请将记事�拖动到这里。
         </text>
         <button label="?" name="covenant_help" />
-        <button label="�至" name="reset_covenant" />
+        <button label="�置" name="reset_covenant" />
         <text name="estate_owner_lbl">
-                �动产主人:
+                地产�有人:
         </text>
         <text name="estate_owner_text">
                 (未知)
         </text>
         <text name="resellable_clause">
-                这�区域内被购买的土地�能�以被�新出售，也�能�能被�新出售。
+                这�区域内购买的土地�能�以被�新出售，也�能�能被�新出售。
         </text>
         <text name="changeable_clause">
-                这�区域内被购买的土地�能�以被连接或划分，也�能�能被连接和划分。
+                这�区域内购买的土地�能�以被�并或划分，也�能�能被�并和划分。
         </text>
         <text_editor name="covenant_editor">
                 请等待...
         </text_editor>
         <text name="can_resell">
-                这�区域内被购买的土地�以被�新出售.
+                这�区域内购买的土地�以被�新出售。
         </text>
         <text name="can_not_resell">
-                这�区域内被购买的土地�能�能被�新出售。
+                这�区域内购买的土地�能被�新出售。
         </text>
         <text name="can_change">
-                这�区域内被购买的土地�以被连接或者被划分。
+                这�区域内购买的土地�以被�并或者被划分。
         </text>
         <text name="can_not_change">
-                这�区域内被购买的土地�能�能被�系或者被划分。
+                这�区域内购买的土地�能被�并或者被划分。
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml
index 31e0672..780f6ea 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_debug.xml
@@ -6,29 +6,62 @@
         <text name="region_text">
                 未知
         </text>
-        <check_box label="无效脚本" name="disable_scripts_check"
-             tool_tip="关闭此区域内的所有脚本文件。" />
-        <button label="?" name="disable_scripts_help" />
-        <check_box label="无效冲�" name="disable_collisions_check"
-             tool_tip="在此区域你关闭�化身的冲�模�。" />
-        <button label="?" name="disable_collisions_help" />
-        <check_box label="无效物�" name="disable_physics_check"
-             tool_tip="在此区域内关闭所有的物�模�。" />
-        <button label="?" name="disable_physics_help" />
+        <check_box label="�用脚本" name="disable_scripts_check"
+             tool_tip="关闭此区域内的所有脚本。" />
+
+        <check_box label="�用碰撞" name="disable_collisions_check"
+             tool_tip="关闭此区域除化身以外所有的碰撞。" />
+
+        <check_box label="�用物�" name="disable_physics_check"
+             tool_tip="关闭此区域内所有的物�计算。" />
         <button label="应用" name="apply_btn" />
-        <button label="选择化身..." name="choose_avatar_btn" />
+        <text
+                 name="objret_text_lbl">
+          归还物体
+        </text>
+        <text
+                 name="resident_text_lbl">
+          å±…æ°‘:
+        </text>
+        <line_editor
+                 name="target_avatar_name">
+          (æ— )
+    </line_editor>
+
+        <button label="选择..." name="choose_avatar_btn" />
+        <text
+                 name="options_text_lbl">
+        选项:
+        </text>
+
+    <check_box
+                 label="仅归还有脚本的物体"
+                 name="return_scripts"
+                 tool_tip="�归还那些包�脚本的物体。" />
+    <check_box
+                 label="仅归还在他人土地上的物体"
+                 name="return_other_land"
+                 tool_tip="�归还在属于别人土地上的物体。" />
+    <check_box
+                 label="归还该地产所有区域中的物体"
+                 name="return_estate_wide"
+                 tool_tip="在所有组�这个地产的区域中归还物体。" />
+        <button
+                 label="返还"
+                 name="return_btn" />
+
         <button label="归还化身的脚本东东至他人土地"
              name="return_scripted_other_land_btn" />
         <button label="归还化身所有的脚本东东" name="return_scripted_all_btn" />
-        <button label="得到首�冲��..." name="top_colliders_btn"
-             tool_tip="最有�能�临潜在冲�的东东的列表。" />
+        <button label="得到首�碰撞�..." name="top_colliders_btn"
+             tool_tip="存在潜在碰撞最多物体的列表。" />
         <button label="?" name="top_colliders_help" />
         <button label="得到首�脚本..." name="top_scripts_btn"
-             tool_tip="最耗时间�行脚本文档的东东的列表。" />
+             tool_tip="脚本�行最费时间物体的列表。" />
         <button label="?" name="top_scripts_help" />
-        <button label="�新进入地区" name="restart_btn"
-             tool_tip="实施2分钟倒计时，并且�新�动此区域。" />
+        <button label="�新�动区域" name="restart_btn"
+             tool_tip="2 分钟倒计时�，�新�动此区域。" />
         <button label="?" name="restart_help" />
-        <button label="�消�新�动" name="cancel_restart_btn"
-             tool_tip="撤销区域�起模�" />
+        <button label="延迟�新�动" name="cancel_restart_btn"
+             tool_tip="延迟区域�新�动一�时。" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml
index e09603b..6da1456 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_estate.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="�人领地" name="Estate">
+<panel label="地产" name="Estate">
         <text name="estate_help_text">
-                更改该桌�的设置会影�所有区域内的领地状况。
+                对该选项�中设定的更改会影�到
+地产内所有的区域。
         </text>
         <text name="estate_text">
-                �人领地:
+                地产:
         </text>
         <text name="estate_name">
                 (未知)
@@ -16,22 +17,38 @@
                 (未知)
         </text>
         <text name="estate_manager_label">
-                领地��人:
+                ��人:
         </text>
-        <button label="?" name="estate_manager_help" />
         <button label="添加..." name="add_estate_manager_btn" />
-        <button label="移除e..." name="remove_estate_manager_btn" />
+        <button label="移除..." name="remove_estate_manager_btn" />
         <check_box label="使用国际时间" name="use_global_time_check" />
-        <button label="?" name="use_global_time_help" />
         <check_box label="太阳固定" name="fixed_sun_check" />
-        <button label="?" name="fixed_sun_help" />
-        <slider label="状�" name="sun_hour_slider" />
+        <slider label="相�" name="sun_hour_slider" />
         <check_box label="从大陆�视" name="externally_visible_check" />
-        <button label="?" name="externally_visible_help" />
-        <check_box label="从此处�以看�整个大陆" name="mainland_visible_check" />
-        <button label="?" name="mainland_visible_help" />
-        <check_box label="�许直接闪电传�" name="allow_direct_teleport" />
-        <button label="?" name="allow_direct_teleport_help" />
+        <check_box label="从此处�以看�大陆" name="mainland_visible_check" />
+<text
+                 name="Only Allow">
+                �制访问到:
+        </text>
+        <check_box
+                 label="支付信�在案的居民"
+                 name="limit_payment"
+                 tool_tip="��没有验�的居民。" />
+        <check_box
+                 label="通过年龄验�的�年人"
+                 name="limit_age_verified"
+                 tool_tip="��没有验�年龄的居民。详细信�请�� support.secondlife.com 。" />
+        <check_box
+                 label="�许语音�天"
+                 name="voice_chat_check" />
+        <text
+                 name="abuse_email_text">
+                �良行为报告电�邮件地�:
+        </text>
+        <string
+                 name="email_unsupported">�支�的功能</string>
+
+        <check_box label="�许直接瞬间移动" name="allow_direct_teleport" />
         <text name="region_text_lbl">
                 拒�通往支付情况信�:
         </text>
@@ -40,23 +57,23 @@
         <check_box label="�认使用过的支付信�" name="deny_transacted" />
         <button label="应用" name="apply_btn" />
         <text name="allow_resident_label">
-                �许居民:
+                �许的居民:
         </text>
         <button label="?" name="allow_resident_help" />
         <button label="添加..." name="add_allowed_avatar_btn" />
-        <button label="移除e..." name="remove_allowed_avatar_btn" />
+        <button label="移除..." name="remove_allowed_avatar_btn" />
         <text name="allow_group_label">
-                获准的社团:
+                �许的社团:
         </text>
         <button label="?" name="allow_group_help" />
         <button label="添加..." name="add_allowed_group_btn" />
-        <button label="移除e..." name="remove_allowed_group_btn" />
+        <button label="移除..." name="remove_allowed_group_btn" />
         <text name="ban_resident_label">
-                ��居民:
+                ��的居民:
         </text>
         <button label="?" name="ban_resident_help" />
         <button label="添加..." name="add_banned_avatar_btn" />
-        <button label="移除e..." name="remove_banned_avatar_btn" />
-        <button label="�消�至独立产业..." name="message_estate_btn" />
-        <button label="将用户从状�…踢走" name="kick_user_from_estate_btn" />
+        <button label="移除..." name="remove_banned_avatar_btn" />
+        <button label="�地产��消�..." name="message_estate_btn" />
+        <button label="从地产将用户踢走..." name="kick_user_from_estate_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
index 0439f12..63dfe78 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -6,37 +6,43 @@
         <text name="region_text">
                 未知
         </text>
-        <check_box label="�定外形" name="block_terraform_check" />
-        <button label="?" name="terraform_help" />
+        <text
+                 name="version_channel_text_lbl">
+                版本: 
+        </text>
+        <text
+                 name="version_channel_text">
+                未知
+        </text>
+
+
+        <check_box label="�定地形" name="block_terraform_check" />
         <check_box label="�定飞翔" name="block_fly_check" />
-        <button label="?" name="fly_help" />
-        <check_box label="�许��" name="allow_damage_check" />
-        <button label="?" name="damage_help" />
+        <check_box label="�许伤害" name="allow_damage_check" />
         <check_box label="�制推动" name="restrict_pushobject" />
-        <button label="?" name="restrict_pushobject_help" />
         <check_box label="�许土地转�" name="allow_land_resell_check" />
-        <button label="?" name="land_resell_help" />
-        <check_box label="�许土地��/分割" name="allow_parcel_changes_check" />
-        <button label="?" name="parcel_changes_help" />
-        <spinner label="代��制" name="agent_limit_spin" />
-        <button label="?" name="agent_limit_help" />
-        <spinner label="奖励东东" name="object_bonus_spin" />
-        <button label="?" name="object_bonus_help" />
+        <check_box label="�许土地�并/分割" name="allow_parcel_changes_check" />
+        <check_box
+                 label="��在�索中显示土地"
+                 name="block_parcel_search_check"
+                 tool_tip="让人们在�索结果中看到这个区域和它的地�" />
+        <spinner label="化身数目�制" name="agent_limit_spin" />
+        <spinner label="�外物体因数" name="object_bonus_spin" />
         <text label="�人内容" name="access_text">
                 �人内容:
         </text>
         <combo_box label="�人" name="access_combo">
                 <combo_item name="PG">
-                        在家长指导下的未�年人
+                        ��制级
                 </combo_item>
                 <combo_item name="Mature">
-                        �人
+                        �制级
                 </combo_item>
         </combo_box>
         <button label="?" name="access_help" />
         <button label="应用" name="apply_btn" />
-        <button label="闪电传�一个用户回家..." name="kick_btn" />
-        <button label="所有用户闪电传�回家..." name="kick_all_btn" />
-        <button label="���时消�往…区域" name="im_btn" />
-        <button label="管���点..." name="manage_telehub_btn" />
+        <button label="瞬间移动用户回家..." name="kick_btn" />
+        <button label="所有用户瞬间移动回家..." name="kick_all_btn" />
+        <button label="�区域��消�" name="im_btn" />
+        <button label="管��陆点..." name="manage_telehub_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 3f6a408..73ec61a 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -10,21 +10,21 @@
         <button label="?" name="water_height_help" />
         <spinner label="地形�高�制" name="terrain_raise_spin" />
         <button label="?" name="terrain_raise_help" />
-        <spinner label="地形较低�制" name="terrain_lower_spin" />
+        <spinner label="地形�低�制" name="terrain_lower_spin" />
         <button label="?" name="terrain_lower_help" />
-        <check_box label="使用领地太阳" name="use_estate_sun_check" />
+        <check_box label="使用地产太阳" name="use_estate_sun_check" />
         <button label="?" name="use_estate_sun_help" />
         <check_box label="太阳固定" name="fixed_sun_check" />
         <button label="?" name="fixed_sun_help" />
-        <slider label="状�" name="sun_hour_slider" />
+        <slider label="相�" name="sun_hour_slider" />
         <button label="应用" name="apply_btn" />
-        <button label="下载 RAW地形..." name="download_raw_btn"
+        <button label="下载 RAW 地形..." name="download_raw_btn"
              tool_tip="�对地产所有人开放而�对��人开放。" />
         <button label="?" name="download_raw_help" />
-        <button label="上传RAW格�地形..." name="upload_raw_btn"
+        <button label="上传 RAW 地形..." name="upload_raw_btn"
              tool_tip="�对地产所有人开放而�对��人开放。" />
         <button label="?" name="upload_raw_help" />
-        <button label="硬地" name="bake_terrain_btn"
+        <button label="烘烤" name="bake_terrain_btn"
              tool_tip="设置目�地形为上�/下���的中点。" />
         <button label="?" name="bake_terrain_help" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml b/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml
index 93c86cb..4595a24 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_region_texture.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="地��料" name="Textures">
+<panel label="地��质" name="Textures">
         <text name="region_text_lbl">
                 区域:
         </text>
         <text name="region_text">
                 未知
         </text>
-        <text name="base_texture_text">
-                基本质地（需�128*128，24bit.tga字节)
+        <text name="detail_texture_text">
+                地��质（�求 512×512, 24� .tga 文件格�)。
         </text>
         <text name="height_text_lbl">
                 1 (低)
@@ -21,34 +21,20 @@
         <text name="height_text_lbl4">
                 4 (高)
         </text>
-        <text name="detail_texture_text">
-                详细质地（�求512*512（分辨率），24bit.tga文件格�。
-        </text>
+
         <text name="height_text_lbl5">
-                1 (低)
+                �质标高范围
         </text>
         <text name="height_text_lbl6">
-                2
-        </text>
-        <text name="height_text_lbl7">
-                3
-        </text>
-        <text name="height_text_lbl8">
-                4 (高)
-        </text>
-        <text name="height_text_lbl9">
-                �质范围
-        </text>
-        <text name="height_text_lbl10">
                 西�
         </text>
-        <text name="height_text_lbl11">
+        <text name="height_text_lbl7">
                 西北
         </text>
-        <text name="height_text_lbl12">
+        <text name="height_text_lbl8">
                 东�
         </text>
-        <text name="height_text_lbl13">
+        <text name="height_text_lbl9">
                 东北
         </text>
         <spinner label="低" name="height_start_spin_0" />
@@ -59,14 +45,14 @@
         <spinner label="高" name="height_range_spin_1" />
         <spinner label="高" name="height_range_spin_2" />
         <spinner label="高" name="height_range_spin_3" />
-        <text name="height_text_lbl14">
-                These values represent the blend range for the textures above.
+        <text name="height_text_lbl10">
+                这些值代表了以上�质的混�范围。
         </text>
-        <text name="height_text_lbl15">
-                测���为米，最低值是一��质的最大高度。
+        <text name="height_text_lbl11">
+                ��为米，最低值是一��质的最大高度。
         </text>
-        <text name="height_text_lbl16">
-                并且最高值是4#�质的最低高度。
+        <text name="height_text_lbl12">
+                而最高值是四��质的最�高度。
         </text>
         <button label="应用" name="apply_btn" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
new file mode 100644
index 0000000..a38236d
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="active_speakers_panel">

+        <string

+                 name="moderator_label">(管�员)</string>

+        <layout_stack>

+                <layout_panel

+                         min_height="25"

+                         name="moderation_mode_panel"

+                         top_delta="0"

+                         visible="false">

+                     <combo_box

+                                 name="moderation_mode">

+                                <combo_item

+                                         value="unmoderated">语音默认打开</combo_item>

+                                <combo_item

+                                         value="moderated">语音默认关闭</combo_item>

+                     </combo_box>

+                </layout_panel>

+

+                <layout_panel

+                         name="moderate_chat_panel">

+                        <scroll_list

+                                 name="speakers_list">

+                                <column

+                                         label="�字"

+                                         name="speaker_name" />

+                        </scroll_list>

+

+                        <panel

+                                 name="speaker_controls">

+                                <text

+                                         name="resident_name"

+                                         valign="center">Rumplstiltskin Califragilistic</text>

+                                <button

+                                         label=""

+                                         name="mute_btn"

+                                         tool_tip="将该居民的语音音�设置为�音" />

+                                <check_box

+                                         name="mute_text_btn"

+                                         label="�蔽文字�天" />

+                        </panel>

+                </layout_panel>

+                <layout_panel

+                         name="moderator_controls"

+                         top_delta="0"

+                         visible="false">

+                     <text

+                                 right="-5"

+                                 name="moderator_controls_label">管�员控制:</text>

+                     <check_box

+                                 name="moderator_allow_voice"

+                                 right="-5">�许语音�天</check_box>

+                     <check_box

+                                 name="moderator_allow_text"

+                                 right="-5">�许文字�天</check_box>

+                </layout_panel>

+

+        </layout_stack>

+</panel>

+<!--Translated for Second Life 1.19.0 (79185)-->

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
index cb5493c..66783a9 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_status_bar.xml
@@ -1,28 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="status">
-        <text type="string" length="1" name="ParcelNameText"
-             tool_tip="Name of land parcel on which you are standing. Click for About Land.">
+        <text name="ParcelNameText"
+             tool_tip="你现在所在的地�的�称。点击打开 ‘关于土地’ 窗�。">
                 土地的�称在此
         </text>
-        <text type="string" length="1" name="BalanceText" tool_tip="�户余�。">
-                L$
+        <text name="BalanceText" tool_tip="�户余�。">
+                请�候...
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="购买货�" />
-        <text type="string" length="12" name="TimeText" tool_tip="当�时间（太平洋时区）">
+        <button name="buycurrency" tool_tip="购买货�" />
+        <text name="TimeText" tool_tip="当�时间（太平洋时区）">
                 12:00 AM
         </text>
-        <button label="" label_selected="" name="scriptout" tool_tip="脚本警告�错误。" />
-        <button label="" label_selected="" name="health" tool_tip="�康" />
-        <text type="string" length="1" name="HealthText" tool_tip="�康">
+        <string name="StatBarDaysOfWeek">
+                星期日:星期一:星期二:星期三:星期四:星期五:星期六
+        </string>
+        <string name="StatBarMonthsOfYear">
+                一月:二月:三月:四月:五月:六月:七月:八月:�月:�月:�一月:�二月
+        </string>
+        <button name="scriptout" tool_tip="脚本警告�错误。" />
+        <button name="health" tool_tip="�康" />
+        <text name="HealthText" tool_tip="�康">
                 100%
         </text>
-        <button label="" label_selected="" name="fly" tool_tip="无法飞行" />
-        <button label="" label_selected="" name="build" tool_tip="无建筑" />
-        <button label="" label_selected="" name="scripts" tool_tip="无脚本" />
-        <button label="" label_selected="" name="restrictpush" tool_tip="�制 llPushObject" />
-        <button label="" label_selected="" name="buyland" tool_tip="购买这�土地" />
+        <button name="fly" tool_tip="��许飞行" />
+        <button name="build" tool_tip="��许建造" />
+        <button name="scripts" tool_tip="��许脚本" />
+        <button name="restrictpush" tool_tip="��许推动" />
+        <button name="status_no_voice" tool_tip="此处语音��用" />
+        <button name="buyland" tool_tip="购买这�土地" />
+        <line_editor label="�索" name="search_editor" tool_tip="�索 Second Life" />
+        <button name="search_btn" tool_tip="�索 Second Life" />
         <text name="packet_loss_tooltip">
-                �失打包
+                �包丢失率
         </text>
         <text name="bandwidth_tooltip">
                 带宽
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
index 8bdf2dd..e9c381d 100644
--- a/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
+++ b/linden/indra/newview/skins/default/xui/zh/panel_toolbar.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">
+        <string name="Redock Windows">
+                ����窗�
+        </string>
         <layout_stack name="toolbar_stack">
-        <button label="�时通" name="im_btn" tool_tip="用�时通�系你的朋�。" />
-        <button label="" name="chat_btn"
-             tool_tip="与附近的人交谈.点击交谈之�点击历�去查找交谈记录。" />
-        <button label="伙伴&quot;" name="friends_btn"
-             tool_tip="查找并与你的好朋�交�。" />
-        <button label="飞翔" label_selected="�止飞翔" name="fly_btn"
-             tool_tip="开始飞行。使用EC或者PgUp/PgDn�控制飞行高度。" />
-        <button label="å¿«ç…§" name="snapshot_btn"
-             tool_tip="将�幕截图�存到硬盘或清�中." />
-        <button label="�索" name="directory_btn"
-             tool_tip="�索地区，时间，任务以�更多。" />
-        <button label="建造" name="build_btn" tool_tip="创建新的东东" />
-        <button label="迷你地图" name="radar_btn"
-             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>
+                <button label="�时通" name="im_btn" tool_tip="用�时通�系你的朋�。" />
+                <button label="" name="chat_btn" tool_tip="显示�天�。(回车键)" />
+                <flyout_button label="交�" name="communicate_btn"
+                     tool_tip="查找并与你的好�和社团交�。" />
+                <button label="飞翔" label_selected="�止飞翔" name="fly_btn"
+                     tool_tip="开始飞行。使用E/C键或者PgUp/PgDn�控制飞行高度。" />
+                <button label="å¿«ç…§" name="snapshot_btn"
+                     tool_tip="将�幕截图�存到硬盘或库存中。" />
+                <button label="�索" name="directory_btn"
+                     tool_tip="�索地点，事件，人物以�更多。" />
+                <button label="建造" name="build_btn" tool_tip="创建新的物�。" />
+                <button label="迷你地图" name="radar_btn"
+                     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>
+<!-- Translated for Second Life 1.19.0 (80267) -->
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
new file mode 100644
index 0000000..4ff2f81
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_controls">

+        <button label="" name="speakers_btn"

+             tool_tip="显示你周围使用语音�天的居民" />

+        <button label="交谈" name="push_to_talk" tool_tip="按�按钮�通�" />

+        <button label="" name="ptt_lock" tool_tip="点击��切�到通�模�" />

+        <button label="" name="show_channel" tool_tip="显示当�的语音频�" />

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
new file mode 100644
index 0000000..84444e5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="content_panel">

+

+        <text_editor name="voice_intro_text1" word_wrap="true">

+                欢迎使用 Second Life 语音�天! 语音�天让你�以与其他居民进行�头交�。该�导会帮助你完�设置语音�天的�个步骤。请注�语音�天需�带麦克风的立体声耳机；点击帮助按钮了解更多信�。

+        </text_editor>

+

+        <text_editor name="voice_intro_text2" word_wrap="true">

+                您现在想��用语音�天�？

+        </text_editor>

+        <radio_group name="voice_enable">

+                <radio_item name="1">当然，�用语音�天。</radio_item>

+                <radio_item name="0">��就是��，现在��用语音�天</radio_item>

+        </radio_group>

+

+                <text_editor

+                 name="voice_intro_text3"

+                 word_wrap="true">你�以在任何时候，在�好设置的语音�天选项�中�用�用语音�天。</text_editor>

+

+                <text_editor

+                 name="voice_intro_text4"

+                 word_wrap="true">点击继续按钮�设置语音�天选项，或者点击完�继续使用 Second Life。</text_editor>

+

+        </panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
new file mode 100644
index 0000000..5115652
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="content_panel">

+        <text_editor

+                 name="voice_intro_text1"

+                 word_wrap="true">

+                使用以下的选项设置你的语音�天体验。

+        </text_editor>

+        <radio_group

+                 draw_border="false"

+                 name="ear_location" >

+                <radio_item

+                         name="0">

+                        从摄�机的�置�语音�天。

+                </radio_item>

+                <radio_item

+                         name="1" >

+                        从化身的�置�语音�天。

+                </radio_item>

+        </radio_group>

+        <check_box

+                 initial_value="false"

+                 label="�接�我的朋�列表上的人的语音呼�"

+                 name="push_to_talk_check" />

+        <check_box

+                 initial_value="false"

+                 label="在查看器�动时，使用�按�说"

+                 name="push_to_talk_check" />

+        <check_box

+                 initial_value="false"

+                 label="以切�模�使用�按�说"

+                 name="push_to_talk_toggle_check" />

+        <text

+                 name="push_to_talk_label"

+                 word_wrap="true">

+                �按�说切�键:

+        </text>

+        <line_editor

+                 name="modifier_combo" />

+        <button

+                 label="设置按键"

+                 name="set_voice_hotkey_button" />

+        <button

+                 label="使用鼠标中键"

+                 name="set_voice_middlemouse_button" />

+</panel>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml b/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
new file mode 100644
index 0000000..67695f7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<panel name="voice_remote">

+        <button label="" name="end_call_btn" tool_tip="结�通�" />

+</panel>

diff --git a/linden/indra/newview/skins/default/xui/zh/role_actions.xml b/linden/indra/newview/skins/default/xui/zh/role_actions.xml
index 9f6f957..c7b4733 100644
--- a/linden/indra/newview/skins/default/xui/zh/role_actions.xml
+++ b/linden/indra/newview/skins/default/xui/zh/role_actions.xml
@@ -1,183 +1,204 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
         <action_set
-             description="这些能力包括添加或移除社团�员的�利，并且有�利接纳没有邀请函的�员"
+             description="这些能力包括添加或移除社团�员，以��许新团员��过邀请就�以加入的�利。"
              name="Membership">
-                <action description="邀请朋�加入社团"
-                     longdescription="Invite People to this Group using the &apos;Invite New Person...&apos; button in the Members &amp; Roles tab &gt; Members sub-tab."
+                <action description="邀请加入社团"
+                     longdescription="使用 ‘会员和角色’ 标签页 &gt; ‘会员’�标签页下的 ‘邀请一个新人 ...’ 按钮邀请别人加入这个社团。"
                      name="member invite" value="1" />
-                <action description="从社团驱�会员"
-                     longdescription="Eject Members from this Group using the &apos;Eject From Group&apos; button in the Members &amp; Roles tab &gt; Members sub-tab. An Owner can eject anyone except another Owner. If you&apos;re not an Owner, a Member can be ejected from a group if, and only if, they&apos;re only in the Everyone Role, and NO other Roles. To remove Members from Roles, you need to have the &apos;Remove Members from Roles&apos; Ability."
+                <action description="从社团驱�团员"
+                     longdescription="使用 ‘会员和角色’ 标签页 &gt; ‘会员’ �标签页下的 ‘从社团中驱�’ 按钮将团员从社团关于土地 &gt; 一般踢出。一� ‘团长’ �以驱�除了�一� ‘团长’ 以外的所有人。如果您�是 ‘团长’，团员�有当且仅当他们�有 ‘普通人’ 角色，而 *没有* 其他角色的时候，��以被驱�。�将团员从角色移除，你需�有 ‘从角色移除会员’ 的能力。"
                      name="member eject" value="2" />
-                <action description="绑定 &apos;打开登记&apos;并更改&apos;登记费用&apos;"
-                     longdescription="Toggle &apos;Open Enrollment&apos; to let new Members join without an invitation, and change &apos;Signup Fee&apos; in the Group Preferences section of the General tab."
+                <action description="切� ‘公开注册’ 并更改 ‘注册费用‘ "
+                     longdescription="切� ‘公开注册’ �让新会员�需�邀请就�以加入，并且更改一般标签页下社团�好设定一�中的 ‘注册费用’。"
                      name="member options" value="3" />
         </action_set>
         <action_set
              description="这些能力包括添加，移除或改�社团角色的�利，从角色中添加或移除组员的�利，以�为角色分�能力的�利"
              name="Roles">
                 <action description="创建新角色"
-                     longdescription="Create new Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘角色’ �标签页下创建角色。"
                      name="role create" value="4" />
                 <action description="删除角色"
-                     longdescription="Delete Roles in the Members &amp; Roles tab &gt; Roles sub-tab."
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘角色’ �标签页下删除角色。"
                      name="role delete" value="5" />
                 <action description="改�角色的�字, 头衔和其他�述"
-                     longdescription="Change Role names, titles, and descriptions at the bottom of the the Members &amp; Roles tab &gt; Roles sub-tab after selecting a Role."
+                     longdescription="选择角色�，在 ‘会员和角色’ 标签页 &gt; ‘角色’ �标签页下改�角色的�字�头衔和其他�述。"
                      name="role properties" value="6" />
                 <action description="给会员分�分�者的角色"
-                     longdescription="Assign Members to Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. A member with this power can only add members to a role the assigner is already in."
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘会员’ �标签页下给团员分� ‘已分�的角色’ 一�中的角色。有这个能力的团员�能给团员添加分�者已�有的角色。"
                      name="role assign member limited" value="7" />
                 <action description="给会员分�任何角色"
-                     longdescription="Assign Members to Any Role in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--to Roles that have more powers than they currently have, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘会员’ �标签页下给团员分�任�角色。 *警告* 任何具有该角色的会员拥有这项能力�，都�以给他们自己——以�任何其他的会员��角色——分��利比他们目�所拥有的�利大得多的角色，并�能�拔他们自己到相近于团长�利的�置上。请在分�这项能力之�确定自己这么�将带�的�果。"
                      name="role assign member" value="8" />
                 <action description="�止会员继续扮演该项角色"
-                     longdescription="Remove Members from Roles in the Assigned Roles section of the Members &amp; Roles tab &gt; Members sub-tab. Owners can&apos;t be removed."
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘角色’ �标签页下从移除会员的角色。团长�能被移除。"
                      name="role remove member" value="9" />
-                <action description="分�或移除角色的能力"
-                     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
+                <action description="分�或移除角色能力"
+                     longdescription="在 ‘会员和角色’ 标签页 &gt; ‘角色’ �标签页下为角色分�或移除能力的能力。*警告* 任何具有该角色的会员拥有这项能力�，都�以给他们自己——或者其他会员——分�所有的能力，甚至�以�拔他们自己到相近于团长�利的�置上。请在分�这项能力之�确定自己这么�将带�的�果。"
                      name="role change actions" value="10" />
         </action_set>
         <action_set
-             description="这些能力包括修改社团身份的�利，例如更改公众��度，宪章和徽章"
+             description="这些能力包括修改社团标识的�利，例如更改公众��度�宪章和徽章"
              name="Group Identity">
                 <action
-                     description="改�宪章,徽章, &apos;在网络上�布&apos;,公开会员在社团中的信�"
-                     longdescription="Change Charter, Insignia, &apos;Publish on the Web&apos;, and which members are publicly visible in Group Information. This is done in the General tab."
+                     description="改�宪章�徽章� ‘在�索中显示‘"
+                     longdescription="改�宪章�徽章� ‘在�索中显示‘。这些动作在 ‘一般’ 标签页中完�。"
                      name="group change identity" value="11" />
         </action_set>
         <action_set
-             description="这些能力包括转让，修改，并出售社团所拥有的部分土地的�利。转到“关于土地“窗�，点击�键并选择“关于土地...“，或者点击在���上的土地信�。"
+             description="这些能力包括转让�修改�并出售社团所拥有的土地的�利。�转到 “关于土地� 窗�，在地�上点击�键并选择 “关于土地...�，或者点击在���上的土地信�。"
              name="Parcel Management">
                 <action description="转让土地或购买土地给社团"
-                     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
+                     longdescription="转让土地，以�为社团购买土地。这在 关于土地 &gt; 一般 标签页中完�。"
                      name="land deed" value="12" />
-                <action description="把土地放弃还给林登长官"
-                     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
+<!-- �是说过 Governor Linden �翻译�?! -->
+                <action description="把土地放弃还给 Governor Linden"
+                     longdescription="放弃土地，转移所有�给 Governor Linden。  *警告* 任何具有该角色的会员拥有这项能力�，都�以在 关于土地 &gt; 一般 选项�中放弃土地，将其返还为林登所有而�需�通过交易! 请在分�这项能力之�确定自己这么�将带�的�果。"
                      name="land release" value="13" />
-                <action description="设置待售土地的信�"
-                     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
+                <action description="设置土地待售信�"
+                     longdescription="设置土地待售信�。 *警告*  任何具有该角色的会员拥有这项能力�都�以在 关于土地 &gt; 一般 选项�中任�销售社团拥有的土地! 请在分�这项能力之�确定自己这么�将带�的�果。"
                      name="land set sale info" value="14" />
-                <action description="划分并加入土地"
-                     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+                <action description="分割��并土地"
+                     longdescription="分割��并地�。 �键点击地�，选择 ‘编辑地形’，然�拖动鼠标选择土地。�分割土地，选择想�分割的区域然�点击 ‘分割...’。 ��并，选择两个或两个以上相邻的地�，然�点击 ‘�并...’。"
                      name="land divide join" value="15" />
         </action_set>
         <action_set
              description="这些能力包括改�土地�称和�布设置，查找目的地��度，选择�陆点和闪电传�点的路线的�利。"
              name="Parcel Identity">
-                <action description="绑定&apos;在查找地点中显示&apos;并设定分类"
-                     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
+                <action description="切� ‘在查找地点中显示’ 并设定分类"
+                     longdescription="关于土地 &gt; 选项 标签页中切� ‘在查找地点中显示’，并设定地�的分类。"
                      name="land find places" value="17" />
                 <action
-                     description="改�土地�称, �述和 &apos;在网络上�布&apos;的设置"
-                     longdescription="Change parcel name, description, and &apos;Publish on the Web&apos; settings. This is done in About Land &gt; Options tab."
+                     description="改�土地�称��述和 ‘在网络上�布’ 的设置"
+                     longdescription="改�土地�称��述和 ‘在网络上�布’ 的设置。这些动作在 关于土地 &gt; 选项 标签页中完�。"
                      name="land change identity" value="18" />
-                <action description="设置�陆点，并设置闪电传�路径"
-                     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
+                <action description="设置�陆点并设置瞬间移动路径"
+                     longdescription="在社团用有的地�上，具有拥有这项能力的角色的会员�以设定�陆点，也就是瞬间移动抵达的�置，以�详细控制瞬间移动路径。这些动作在 关于土地 &gt; 选项 标签页中完�。"
                      name="land set landing point" value="19" />
         </action_set>
         <action_set
-             description="这些能力包括影�影�土地选项的�利，例如“创建东东�，“编辑地形�，音�和媒体设置等。"
+             description="这些能力包括影�影�土地选项的�利，例如 “创建物体�，“编辑地形�，音�和媒体设置等。"
              name="Parcel Settings">
                 <action description="改�音�和多媒体设置"
-                     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
+                     longdescription="在关于土地 &gt; 选项 标签页中改�音�和多媒体设置。"
                      name="land change media" value="20" />
-                <action description="绑定&apos;编辑地形&apos;"
-                     longdescription="Toggle &apos;Edit Terrain&apos;. *WARNING* About Land &gt; Options tab &gt; Edit Terrain allows anyone to terraform your land&apos;s shape, and place and move Linden plants. Be sure you know what you&apos;re doing before assigning this Ability. Editing terrain is toggled in About Land &gt; Options tab."
+                <action description="切� &apos;编辑地形&apos;"
+                     longdescription="切� &apos;编辑地形&apos;。 *警告* 关于土地 &gt; 选项 &gt; 编辑地形 �许任何人编辑土地的地形，以�放置或移动林登�被。请在分�这项能力之�确定自己这么�将带�的�果。编辑地形 在 关于土地 &gt; 选项 下。"
                      name="land edit" value="21" />
-                <action description="绑定�项步骤：关于土地&gt;选择设定"
-                     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
+                <action description="编辑�� 关于土地 &gt; 选项 下的设置"
+                     longdescription="在关于土地 &gt; 选项 标签页中切� ‘安全 (无�伤)’� ‘飞翔’, 以��许其他居民在社团所拥有的土地上: ‘创建物体’� ‘编辑地形’� ‘创造地标’� 以� ‘�行脚本‘。"
                      name="land options" value="22" />
         </action_set>
         <action_set
-             description="这些能力包括�许组员绕过社团拥有土地的�制的�利"
+             description="这些能力包括�许团员绕过社团拥有土地上的�制的��。"
              name="Parcel Powers">
                 <action description="永远�许 &apos;编辑地形&apos;"
-                     longdescription="Members in a Role with this Ability can edit terrain on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     longdescription="具有拥有这项能力的角色的会员�以在社团拥有的地�上编辑地形，�使 关于土地 &gt; 选项 中的相关设置被关闭。"
                      name="land allow edit land" value="23" />
-                <action description="永远�许 &apos;起飞&apos;"
-                     longdescription="Members in a Role with this Ability can fly on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                <action description="永远�许 &apos;飞翔&apos;"
+                     longdescription="具有拥有这项能力的角色的会员�以在社团拥有的地�上飞行，�使 关于土地 &gt; 选项 中的相关设置被关闭。"
                      name="land allow fly" value="24" />
-                <action description="永远�许&apos;创建东东&apos;"
-                     longdescription="Members in a Role with this Ability can create objects on a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                <action description="永远�许&apos;创建物体&apos;"
+                     longdescription="具有拥有这项能力的角色的会员�以在社团拥有的地�上创建物体，�使 关于土地 &gt; 选项 中的相关设置被关闭。"
                      name="land allow create" value="25" />
                 <action description="永远�许 &apos;创建地标&apos;"
-                     longdescription="Members in a Role with this Ability can landmark a group-owned parcel, even if it&apos;s turned off in About Land &gt; Options tab."
+                     longdescription="具有拥有这项能力的角色的会员�以创建社团拥有的地�的地标，�使 关于土地 &gt; 选项 中的相关设置被关闭。"
                      name="land allow landmark" value="26" />
                 <action description="�许在社团土地上&apos;把家建在这里&apos;"
-                     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a group parcel (either land set or deeded to this group)."
+                     longdescription="具有拥有这项能力的角色的会员�以在社团的土地上使用 世界�� &gt; 把家设在这里 (无论是�献的还是�有的)。"
                      name="land allow set home" value="28" />
         </action_set>
         <action_set
-             description="这些能力包括�许或�制通往社团拥有的土地的�利，包括冻结和驱�组员�利。"
+             description="这些能力包括�许或�制访问社团拥有的土地的��，包括冻结和驱�居民的��。"
              name="Parcel Access">
-                <action description="管��进入土地��"
-                     longdescription="Manage parcel Access lists in About Land &gt; Access tab."
+                <action description="管�土地�许进入��"
+                     longdescription="在 关于土地 &gt; 访问 标签页下管��许进入��。"
                      name="land manage allowed" value="29" />
-                <action description="管���进入土地��"
-                     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
+                <action description="管�土地�止进入��"
+                     longdescription="在 关于土地 &gt; 访问 标签页下管��止进入��。"
                      name="land manage banned" value="30" />
-                <action description="改�土地上 &apos;出售通行�...&apos;的设置"
-                     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
+                <action description="改�土地上 ‘出售通行�...’ 的设置"
+                     longdescription="在 关于土地 &gt; 访问 标签页下改� ‘出售通行�...’ 的设置。"
                      name="land manage passes" value="31" />
                 <action description="从土地上驱�或冻结居民"
-                     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
+                     longdescription="具有拥有这项能力的角色的会员�以对��欢迎的居民使用�键点击，选择“更多 &gt; 冻结...� 或者 “驱�...�。"
                      name="land admin" value="32" />
         </action_set>
         <action_set
-             description="这些能力包括�许组员归还东东，定�或移动林登设备的�利。这对组员清�垃圾和美化景观时很有用，当这项能力在使用时应该注�，因为一旦选择归还东东�则无法撤销。"
+             description="这些能力包括�许组员返还物体�放置或移动林登�被。这在组员清�垃圾和美化景观时很有用，但这些能力在使用时应该注�，因为一旦物体归还就无法撤销。"
              name="Parcel Content">
-                <action description="归还社团拥有的东东"
-                     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
+                <action description="归还社团拥有的物体"
+                     longdescription="在 关于土地 &gt; 物体 标签页下归还社团拥有的土地上社团所拥有的物体。"
                      name="land return group owned" value="48" />
-                <action description="归还放置在社团处的东东"
-                     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."
+                <action description="归还放置在社团处的物体"
+                     longdescription="在 关于土地 &gt; 物体 标签页下归还社团土地上设置到社团的物体。"
                      name="land return group set" value="33" />
-                <action description="归还�社团所有的东东"
-                     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
+                <action description="归还�社团所有的物体"
+                     longdescription="在 关于土地 &gt; 物体 标签页下归还社团土地上�社团的物体。"
                      name="land return non group" value="34" />
                 <action description="使用林登�物美化土地"
-                     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
+                     longdescription="放置和移动林登树木�花�。这些东西�以在你的库存的 Library &gt; Objects 文件夹下找到，也�以用 建造 按钮创建。"
                      name="land gardening" value="35" />
         </action_set>
         <action_set
-             description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
+             description="这些能力包括转让�修改和销售社团拥有的物体的��。这些更改在 编辑工具 &gt; 一般标签页中完�。�键点击物体选择 ‘编辑’ �查看设置。"
              name="Object Management">
-                <action description="转让东东给社团"
-                     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
+                <action description="转让物体给社团"
+                     longdescription="在 编辑工具 &gt; 一般 标签页下转让物体。"
                      name="object deed" value="36" />
-                <action description="处�(移动，�制，修改)社团所有的东东"
-                     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
+                <action description="处� (移动��制�修改) 社团拥有的物体"
+                     longdescription="在 编辑工具 &gt; 一般 标签页下处� (移动��制�修改) 社团拥有的物体。"
                      name="object manipulate" value="38" />
-                <action description="把社团拥有的东东�维待售"
-                     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
+                <action description="把社团拥有的物体设为待售"
+                     longdescription="在 编辑工具 &gt; 一般 标签页下设定社团拥有的物体予以出售。"
                      name="object set sale" value="39" />
         </action_set>
         <action_set
-             description="这些能力包括�求组员�还社团贷款和获得社团红利，以��制进入社团��历�纪录的�利。"
+             description="这些能力包括�求组员�还社团贷款和获得社团红利，以��制访问社团��历�纪录的�利。"
              name="Accounting">
                 <action description="�还社团债务/获得社团红利"
-                     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+                     longdescription="具有拥有这项能力的角色的会员将会自动社团债务��得社团红利。这�味�他们将�天收到社团土地销售�的一部分，以�为例如地�刊登费等的东西�腰包。"
                      name="accounting accountable" value="40" />
         </action_set>
         <action_set
              description="这些能力包括�许组员��，接�和�览社团通知的�利"
              name="Notices">
                 <action description="��通知"
-                     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
+                     longdescription="具有拥有这项能力的角色的会员�以在 社团信� &gt; 通知 标签页中��通知。"
                      name="notices send" value="42" />
                 <action description="接�通知/回顾原�的通知"
-                     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
+                     longdescription="具有拥有这项能力的角色的会员�以在 社团信� &gt; 通知 标签页中接�和查看以�的通知。"
                      name="notices receive" value="43" />
         </action_set>
         <action_set
              description="这些能力包括�许组员�出议案，为议案投票，和�览投票历�纪录的�利"
              name="Proposals">
-                <action description="创建�议本"
-                     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."
+                <action description="创建议案"
+                     longdescription="具有拥有这项能力的角色的会员�以在 社团信� &gt; 议案 标签页中创建议案以供投票。"
                      name="proposal start" value="44" />
                 <action description="为议案投票"
-                     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
+                     longdescription="具有拥有这项能力的角色的会员�以在 社团信� &gt; 议案 标签页中对议案投票。"
                      name="proposal vote" value="45" />
         </action_set>
+        <action_set
+                 description="这些能力包括�许或�制社团�天会��社团语音会�的��。"
+                 name="Chat">
+                <action
+                         description="加入社团�天"
+                         longdescription="具有拥有这项能力的角色的会员�以加入社团文字或语音�天。"
+                         name="join group chat"
+                         value="16" />
+                <action
+                         description="加入社团语音�天"
+                         longdescription="具有拥有这项能力的角色的会员�以加入社团语音�天会�。注�: 需�加入社团�天能力 �能访问语音�天会�。"
+                         name="join voice chat"
+                         value="27" />  
+                <action
+                         description="管�社团�天"
+                         longdescription="具有拥有这项能力的角色的会员�以控制社团文字和语音�天的访问，并且�以管�社团和语音�天。"
+                         name="moderate group chat"
+                         value="37" />
+        </action_set>
+
 </role_actions>
diff --git a/linden/indra/newview/skins/default/xui/zh/strings.xml b/linden/indra/newview/skins/default/xui/zh/strings.xml
index 27ecfdb..9d3dc2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/strings.xml
+++ b/linden/indra/newview/skins/default/xui/zh/strings.xml
@@ -1,2 +1,171 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<strings />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- 该文件包括从�写死在代�中的字符串。
+     仅用于�属于浮动框的那些。
+     例如在化身�天气泡中的字符串，
+     以�从一个部件返回而在许多地方�能会出现的那些。-->
+<strings>
+        <!--登录-->
+                <string name="LoginInProgress">正在登录。 [APP_NAME] �能会看上去没有�应。 请�候。</string>
+        <string name="LoginAuthenticating">认�中</string>
+        <string name="LoginMaintenance">正在进行�户维护...</string>
+        <string name="LoginAttempt">上次登录�试失败。正在登录，第 [NUMBER] 次�试</string>
+        <string name="LoginPrecaching">世界加载中...</string>
+        <string name="LoginInitializingBrowser">正在�始化内置�览器...</string>
+        <string name="LoginInitializingMultimedia">正在�始化多媒体...</string>
+        <string name="LoginVerifyingCache">正在验�缓存文件 (�能需� 60-90 秒)...</string>
+        <string name="LoginProcessingResponse">处�回�...</string>
+        <string name="LoginInitializingWorld">正在�始化世界...</string>
+        <string name="LoginDecodingImages">正在解�图�...</string>
+        <string name="LoginInitializingQuicktime">正在�始化 QuickTime...</string>
+        <string name="LoginQuicktimeNotFound">没有找到 QuickTime - �能�始化。</string>
+        <string name="LoginQuicktimeOK">QuickTime �始化�功。</string>
+        <string name="LoginWaitingForRegionHandshake">等待区域�手信�……...</string>
+        <string name="LoginConnectingToRegion">正在连接到区域...</string>
+        <string name="LoginDownloadingClothing">下载装�中...</string>
+        <string name="LoginFailedNoNetwork">网络错误： 无法建立连接，请检查您的网络连接。</string>
+
+        <!-- 断开连接 -->
+        <string name="AgentLostConnection">
+        该区域�能存在问题。请检查您到互�网的连接。
+        </string>
+        <!-- 工具�示, llhoverview.cpp.  -->
+        <string name="TooltipNoName">(没有�字)</string> <!-- 物体没有�字 -->
+        <string name="TooltipOwner">主人:</string> <!-- 接�是拥有者的�字 -->
+        <string name="TooltipPublic">公共</string> <!-- 对象的公共�� -->
+        <string name="TooltipIsGroup">(社团)</string> <!-- 该文字�是社团�称 -->
+        <string name="TooltipFlagScript">脚本</string>
+        <string name="TooltipFlagPhysics">物�</string>
+        <string name="TooltipFlagTouch">触摸</string>
+        <string name="TooltipFlagL$">L$</string>
+        <string name="TooltipFlagDropInventory">放置物体</string>
+        <string name="TooltipFlagPhantom">幻影</string>
+        <string name="TooltipFlagTemporary">æš‚æ—¶</string>
+        <string name="TooltipFlagRightClickMenu">(点击�键, 打开��)</string>
+        <string name="TooltipFreeToCopy">�任��制</string>
+        <string name="TooltipForSaleL$">å¾…å”®: L$[AMOUNT]</string> <!-- L$ version -->
+        <string name="TooltipForSaleMsg">å¾…å”®: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+        <string name="TooltipFlagGroupBuild">社团�建造</string>
+        <string name="TooltipFlagNoBuild">��建造</string>
+        <string name="TooltipFlagNoEdit">社团�建造</string>
+        <string name="TooltipFlagNotSafe">�安全</string><!-- damage area -->
+        <string name="TooltipFlagNoFly">��飞行</string>
+        <string name="TooltipFlagGroupScripts">仅社团脚本</string>
+        <string name="TooltipFlagNoScripts">无脚本</string>
+        <string name="TooltipMustSingleDrop">仅�以拖动�个物�到这里</string>
+        <string name="TooltipLand">土地: </string>
+
+        <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+        <string name="RetrievingData">获�中...</string>
+        <string name="ReleaseNotes">更新注释</string>
+        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+        <string name="LoadingData">加载中...</string>
+        
+        
+        <!-- namecache -->
+        <!-- 化身�称: 为 LLUUID::null 显示的字符串 -->
+        <string name="AvatarNameNobody">(没有人)</string>
+        
+        <!-- 化身�称: �得�称时显示的文字-->
+        <string name="AvatarNameWaiting">(等待中)</string>
+
+        <!-- 化身�称:  替代 AvatarNameFetching 显示的文字, 彩蛋。 -->
+        <string name="AvatarNameHippos">(是河马)</string>
+        
+        <!-- 社团�称:  为 LLUUID::null 显示的字符串 -->
+        <string name="GroupNameNone">(无社团)</string>
+
+        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+        <string name="AssetErrorNone">没有错误</string>
+        <string name="AssetErrorRequestFailed">资产请求: 失败</string>
+        <string name="AssetErrorNonexistentFile">资产请求: �存在的文件</string>
+        <string name="AssetErrorNotInDatabase">资产请求: 数�库中未找到资产</string>
+        <string name="AssetErrorEOF">文件末端</string>
+        <string name="AssetErrorCannotOpenFile">无法打开文件</string>
+        <string name="AssetErrorFileNotFound">文件未找到</string>
+        <string name="AssetErrorTCPTimeout">文件传输超时</string>
+        <string name="AssetErrorCircuitGone">通路没有了</string>
+        <string name="AssetErrorUnknownStatus">未知状�</string>
+
+        <!-- llvoavatar. 显示在化身的�天气�中 -->
+        <string name="AvatarEditingApparance">(正在编辑外观)</string>
+        <string name="AvatarAway">离开</string>
+        <string name="AvatarBusy">忙碌</string>
+        <string name="AvatarMuted">已�蔽</string>
+
+        <!-- animations -->
+        <string name="anim_express_afraid">害怕</string>
+        <string name="anim_express_anger">生气</string>
+        <string name="anim_away">离开</string>
+        <string name="anim_backflip">�空翻</string>
+        <string name="anim_express_laugh">Belly Laugh</string>
+        <string name="anim_express_toothsmile">BigSmile</string>
+        <string name="anim_blowkiss">飞�</string>
+        <string name="anim_express_bored">无�</string>
+        <string name="anim_bow">鞠躬</string>
+        <string name="anim_clap">鼓掌</string>
+        <string name="anim_courtbow">宫廷�鞠躬</string>
+        <string name="anim_express_cry">å“­æ³£</string>
+        <string name="anim_dance1">舞蹈 1</string>
+        <string name="anim_dance2">舞蹈 2</string>
+        <string name="anim_dance3">舞蹈 3</string>
+        <string name="anim_dance4">舞蹈 4</string>
+        <string name="anim_dance5">舞蹈 5</string>
+        <string name="anim_dance6">舞蹈 6</string>
+        <string name="anim_dance7">舞蹈 7</string>
+        <string name="anim_dance8">舞蹈 8</string>
+        <string name="anim_express_disdain">Disdain</string>
+        <string name="anim_drink">å–�</string>
+        <string name="anim_express_embarrased">害羞</string>
+        <string name="anim_angry_fingerwag">摇手指</string>
+        <string name="anim_fist_pump">Fist Pump</string>
+        <string name="anim_yoga_float">浮空瑜伽</string>
+        <string name="anim_express_frown">皱眉</string>
+        <string name="anim_impatient">��烦</string>
+        <string name="anim_jumpforjoy">高兴得跳起�</string>
+        <string name="anim_kissmybutt">亲我的�股�</string>
+        <string name="anim_express_kiss">亲�</string>
+        <string name="anim_laugh_short">大笑</string>
+        <string name="anim_musclebeach">肌肉海滩</string>
+        <string name="anim_no_unhappy">�� (�高兴地)</string>
+        <string name="anim_no_head">��</string>
+        <string name="anim_nyanya">å–µ~å–µ~å–µ~</string>
+        <string name="anim_punch_onetwo">One-Two Punch</string>
+        <string name="anim_express_open_mouth">张开嘴</string>
+        <string name="anim_peace">和平</string>
+        <string name="anim_point_you">指别人</string>
+        <string name="anim_point_me">指自己</string>
+        <string name="anim_punch_l">左拳</string>
+        <string name="anim_punch_r">�拳</string>
+        <string name="anim_rps_countdown">RPS 计数</string>
+        <string name="anim_rps_paper">RPS 布</string>
+        <string name="anim_rps_rock">RPS 石头</string>
+        <string name="anim_rps_scissors">RPS 剪刀</string>
+        <string name="anim_express_repulsed">Repulsed</string>
+        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
+        <string name="anim_express_sad">伤心</string>
+        <string name="anim_salute">敬礼</string>
+        <string name="anim_shout">喊�</string>
+        <string name="anim_express_shrug">耸肩</string>
+        <string name="anim_express_smile">微笑</string>
+        <string name="anim_smoke_idle">�烟 空闲</string>
+        <string name="anim_smoke_inhale">�烟 �气</string>
+        <string name="anim_smoke_throw_down">�烟 扔下去</string>
+        <string name="anim_express_surprise">�惊</string>
+        <string name="anim_sword_strike_r">剑刺</string>
+        <string name="anim_angry_tantrum">Tantrum</string>
+        <string name="anim_express_tongue_out">伸舌头</string>
+        <string name="anim_hello">招手</string>
+        <string name="anim_whisper">悄悄�</string>
+        <string name="anim_whistle">��哨</string>
+        <string name="anim_express_wink">眨眼</string>
+        <string name="anim_wink_hollywood">眨眼 (好莱��)</string>
+        <string name="anim_express_worry">担心</string>
+        <string name="anim_yes_happy">是的 (高兴地)</string>
+        <string name="anim_yes_head">是的</string>
+        <string name="texture_loading">加载中...</string>
+        <string name="worldmap_offline">脱机</string>
+
+        <!-- Chat -->
+        <string name="whisper">�声说:</string>
+        <string name="shout">大喊:</string>
+</strings>
diff --git a/linden/indra/newview/skins/default/xui/zh/teleport_strings.xml b/linden/indra/newview/skins/default/xui/zh/teleport_strings.xml
new file mode 100644
index 0000000..95a0b54
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/zh/teleport_strings.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages>
+        <message_set
+                 name="errors">
+                <message
+                         name="invalid_tport">
+                        处�您的瞬间移动请求时�生错误。您�能需��新登入以��能
+瞬间移动。如果您�继续�到这�消�，请到以下地��考技术支�
+常�问题:
+www.secondlife.com/support
+                </message>
+                <message
+                         name="invalid_region_handoff">
+                        处�您的区域��时�生错误。您�能需��新登入以��能
+瞬间移动。如果您�继续�到这�消�，请到以下地��考技术支�
+常�问题:
+www.secondlife.com/support
+                </message>
+                <message
+                         name="blocked_tport">
+                        抱歉，当���许瞬间移动。请�候�试。
+如果您�然�能瞬间移动，请登出��新登录解决问题。
+                </message>
+                <message
+                         name="nolandmark_tport">
+                        抱歉，系统无法找到地标目的地。
+                </message>
+                <message
+                         name="timeout_tport">
+                        抱歉，系统无法完�瞬间移动连接。
+请�候�试。
+                </message>
+                <message
+                         name="noaccess_tport">
+                        抱歉，您�能访问瞬间移动目标。
+                </message>
+                <message
+                         name="missing_attach_tport">
+                        您的装备还没有到�。请�等几秒钟，或者登出��新登录以�
+�试�瞬间移动。
+                </message>
+                <message
+                         name="too_many_uploads_tport">
+                        该区域内的资产队列当�堵塞，所以您的瞬间移动请求将�能按时完�。
+请�候�试，或�往较空闲的区域�试。
+                </message>
+                <message
+                         name="expired_tport">
+                        抱歉，系统无法按时地完�您的瞬间移动请求。请�候�试。
+                </message>
+                <message
+                         name="expired_region_handoff">
+                        抱歉，系统无法按时地完�您的区域��请求。请�候�试。
+                </message>
+                <message
+                         name="no_host">
+                        无法找到瞬间移动目标。目标�能暂时��用，或者已�存在。请���试。
+                </message>
+                <message
+                         name="no_inventory_host">
+                        库存系统当���用。
+                </message>
+        </message_set>
+        <message_set
+                 name="progress">
+                <message
+                         name="sending_dest">
+                        正在��到目标地点。
+                </message>
+                <message
+                         name="redirecting">
+                        正在�定�到新的地点。
+                </message>
+                <message
+                         name="relaying">
+                        正在转达到目标地点。
+                </message>
+                <message
+                         name="sending_home">
+                        ��家�置请求。
+                </message>
+                <message
+                         name="sending_landmark">
+                        正在��地标�置请求。
+                </message>
+                <message
+                         name="completing">
+                        正在完�瞬间移动。
+                </message>
+                <message
+                         name="resolving">
+                        正在解�目标。
+                </message>
+                <message
+                         name="contacting">
+                        正在�系新的区域。
+                </message>
+                <message
+                         name="arriving">
+                        正在抵达……
+                </message>
+                <message
+                         name="requesting">
+                        正在请求瞬间移动……
+                </message>
+        </message_set>
+</teleport_messages>
+
+
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
index ce25d2b..bbabfaa 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
@@ -481,13 +481,17 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-40" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Edit Terrain" left="14"
-                             mouse_opaque="true" name="edit land check" radio_style="false" width="268" />
+                             mouse_opaque="true" name="edit land check" radio_style="false"
+                             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
+                             width="268" />
                         <check_box bottom="-60" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Create Landmarks" left="14"
                              mouse_opaque="true" name="check landmark" radio_style="false" width="268" />
                         <check_box bottom="-80" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Fly" left="14" mouse_opaque="true"
-                             name="check fly" radio_style="false" width="268" />
+                             name="check fly" radio_style="false"
+                             tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
+                             width="268" />
                         <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="178"
@@ -538,11 +542,13 @@ Go to World menu > About Land or select another parcel to show its details.
                         </text>
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false" label="Safe (no damage)" left="14"
-                             mouse_opaque="true" name="check safe" radio_style="false" width="268" />
+                             mouse_opaque="true" name="check safe" radio_style="false"
+                             tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
+                             width="268" />
                         <check_box bottom="-120" enabled="true" follows="left|top" font="SansSerifSmall"
-                             height="16" initial_value="false" label="Restrict Pushing" left="178"
+                             height="16" initial_value="false" label="No Pushing" left="178"
                              mouse_opaque="true" name="PushRestrictCheck" radio_style="false"
-                             tool_tip="llPushObject will only work through parcel owner scripts or on scripts where the pushee is the script owner."
+                             tool_tip="Prevents scripts from pushing. Checking this option may be useful for preventing disruptive behavior on your land."
                              width="119" />
                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false"
@@ -622,7 +628,7 @@ Go to World menu > About Land or select another parcel to show its details.
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Set" label_selected="Set" left="236"
                              mouse_opaque="true" name="Set" scale_image="true"
-                             tool_tip="Set the landing point to your avatar&apos;s location. It must be inside this land parcel."
+                             tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
                              width="50" />
                         <button bottom="-303" enabled="true" follows="left|top" font="SansSerifSmall"
                              halign="center" height="16" label="Clear" label_selected="Clear" left="291"
@@ -650,10 +656,10 @@ Go to World menu > About Land or select another parcel to show its details.
                                 </combo_item>
                         </combo_box>
                         <string name="push_restrict_text">
-                                Restrict Pushing
+                                No Pushing
                         </string>
                         <string name="push_restrict_region_text">
-                                Restrict Pushing (Region Override)
+                                No Pushing (Region Override)
                         </string>
                 </panel>
                 <panel border="true" bottom="-349" enabled="true" follows="left|top|right|bottom"
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
index 1def3fb..cef04fd 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
@@ -75,7 +75,7 @@
              halign="center" height="18" image_selected="status_no_push.tga"
              image_unselected="status_no_push.tga" label="" label_selected="" left="521"
              mouse_opaque="true" name="restrictpush" scale_image="false"
-             tool_tip="llPushObject restricted" visible="false" width="24" />
+             tool_tip="No Pushing" visible="false" width="24" />
         <button bottom="-22" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="18" image_selected="status_no_voice.tga"
              image_unselected="status_no_voice.tga" label="" label_selected=""
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 9aeb31e..5ab311a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -6,7 +6,7 @@
 #
 # $LicenseInfo:firstyear=2006&license=viewergpl$
 # 
-# Copyright (c) 2006-2008, Linden Research, Inc.
+# Copyright (c) 2006-2009, Linden Research, Inc.
 # 
 # Second Life Viewer Source Code
 # The source code in this file ("Source Code") is provided by Linden Lab
@@ -51,7 +51,6 @@ class ViewerManifest(LLManifest):
             self.path("*.pem")
             self.path("*.ini")
             self.path("*.xml")
-            self.path("*.vp")
             self.path("*.db2")
 
             # include the entire shaders directory recursively
@@ -66,7 +65,6 @@ class ViewerManifest(LLManifest):
             self.path("*.tga")
             self.end_prefix("character")
 
-
         # Include our fonts
         if self.prefix(src="fonts"):
             self.path("LiberationSans-Bold.ttf")
@@ -100,7 +98,6 @@ class ViewerManifest(LLManifest):
                 
             self.end_prefix("skins")
             
-        self.path("lsl_guide.html")
         self.path("gpu_table.txt")
 
 
@@ -137,6 +134,8 @@ class ViewerManifest(LLManifest):
         # whether or not this is present
         return self.args.get('login_channel')
 
+    def grid(self):
+        return self.args['grid']
     def channel(self):
         return self.args['channel']
     def channel_unique(self):
@@ -149,22 +148,33 @@ class ViewerManifest(LLManifest):
     def flags_list(self):
         """ Convenience function that returns the command-line flags
         for the grid"""
-        channel_flags = ''
+
+        # Set command line flags relating to the target grid
         grid_flags = ''
         if not self.default_grid():
-            if self.default_channel():
-                # beta grid viewer
-                channel_flags = '--settings settings_beta.xml'
-            grid_flags = "--grid %(grid)s --helperuri http://preview-%(grid)s.secondlife.com/helpers/" % {'grid':self.args['grid']}
+            grid_flags = "--grid %(grid)s "\
+                         "--helperuri http://preview-%(grid)s.secondlife.com/helpers/" %\
+                           {'grid':self.grid()}
 
-        if not self.default_channel():
-            # some channel on some grid
-            channel_flags = '--settings settings_%s.xml --channel "%s"' % (self.channel_lowerword(), self.channel())
-        elif self.login_channel():
+        # set command line flags for channel
+        channel_flags = ''
+        if self.login_channel() and self.login_channel() != self.channel():
             # Report a special channel during login, but use default
             channel_flags = '--channel "%s"' % (self.login_channel())
-                        
-        return " ".join((channel_flags, grid_flags)).strip()
+        elif not self.default_channel():
+            channel_flags = '--channel "%s"' % self.channel()
+
+        # Deal with settings 
+        setting_flags = ''
+        if not self.default_channel() or not self.default_grid():
+            if self.default_grid():
+                setting_flags = '--settings settings_%s.xml'\
+                                % self.channel_lowerword()
+            else:
+                setting_flags = '--settings settings_%s_%s.xml'\
+                                % (self.grid(), self.channel_lowerword())
+                                                
+        return " ".join((channel_flags, grid_flags, setting_flags)).strip()
 
 
 class WindowsManifest(ViewerManifest):
@@ -210,9 +220,19 @@ class WindowsManifest(ViewerManifest):
             self.path("alut.dll")
             self.end_prefix()           
 
-        # Mozilla appears to force a dependency on these files so we need to ship it (CP)
-        self.path("msvcr71.dll")
-        self.path("msvcp71.dll")
+        # Mozilla appears to force a dependency on these files so we need to ship it (CP) - updated to vc8 versions (nyx)
+        # These need to be installed as a SxS assembly, currently a 'private' assembly.
+        # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
+        if self.prefix(src=self.args['configuration'], dst=""):
+            if self.args['configuration'] == 'Debug':
+                self.path("msvcr80d.dll")
+                self.path("msvcp80d.dll")
+                self.path("Microsoft.VC80.DebugCRT.manifest")
+            else:
+                self.path("msvcr80.dll")
+                self.path("msvcp80.dll")
+                self.path("Microsoft.VC80.CRT.manifest")
+            self.end_prefix()
 
         # Mozilla runtime DLLs (CP)
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -241,6 +261,11 @@ class WindowsManifest(ViewerManifest):
             self.path("res/*/*")
             self.end_prefix()
 
+        # Mozilla hack to get it to accept newer versions of msvc*80.dll than are listed in manifest
+        # necessary as llmozlib2-vc80.lib refers to an old version of msvc*80.dll - can be removed when new version of llmozlib is built - Nyx
+        # The config file name needs to match the exe's name.
+        self.path("SecondLife.exe.config", dst=self.final_exe() + ".config")
+
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
         #    self.path("alut.dll")
@@ -386,7 +411,7 @@ class WindowsManifest(ViewerManifest):
                 "%%INSTALL_FILES%%":self.nsi_file_commands(True),
                 "%%DELETE_FILES%%":self.nsi_file_commands(False)})
 
-        NSIS_path = 'C:\\Program Files\\NSIS\\makensis.exe'
+        NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         self.created_path(self.dst_path_of(installer_file))
@@ -632,9 +657,6 @@ class DarwinManifest(ViewerManifest):
         if not os.path.exists (self.src_path_of(dmg_template)):
             dmg_template = os.path.join ('installers', 'darwin', 'release-dmg')
 
-        # To reinstate the linden scripting guide, add this to the list below:
-        #            "lsl_guide.html":"Linden Scripting Language Guide.html",
-
         for s,d in {self.get_dst_prefix():app_name + ".app",
                     os.path.join(dmg_template, "_VolumeIcon.icns"): ".VolumeIcon.icns",
                     os.path.join(dmg_template, "background.jpg"): "background.jpg",
@@ -690,13 +712,6 @@ class LinuxManifest(ViewerManifest):
 
 
     def package_finish(self):
-        # 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)
-            if re.search("app_settings/mozilla-runtime-.*/lib.+\.so.*", d):
-                self.run_command('strip %s' % d)
-
         if 'installer_name' in self.args:
             installer_name = self.args['installer_name']
         else: